smil:additive odf type implemented

OdfFile/DataTypes/smil_additive.cpp

@@ -0,0 +1,64 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2023
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "smil_additive.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore {
+	namespace odf_types {
+
+		std::wostream& operator << (std::wostream& _Wostream, const smil_additive& _Val)
+		{
+			switch (_Val.get_type())
+			{
+				case smil_additive::replace:	_Wostream << L"replace"; break;
+				case smil_additive::sum:		_Wostream << L"sum"; break;
+			}
+			return _Wostream;
+		}
+
+		smil_additive smil_additive::parse(const std::wstring& Str)
+		{
+			std::wstring tmp = Str;
+			boost::algorithm::to_lower(tmp);
+
+			if (tmp == L"replace")		return smil_additive(replace);
+			else if (tmp == L"sum")		return smil_additive(sum);
+			else
+			{
+				return smil_additive(replace);
+			}
+		}
+	}
+}

OdfFile/DataTypes/smil_additive.h

@@ -0,0 +1,71 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2023
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <string>
+#include "odfattributes.h"
+
+namespace cpdoccore { namespace odf_types {
+
+class smil_additive
+{
+public:
+	enum type
+	{
+		replace,
+		sum
+	};
+
+	smil_additive() {}
+
+	smil_additive(type _Type) : type_(_Type)
+	{}
+
+	type get_type() const
+	{
+		return type_;
+	};
+
+	static smil_additive parse(const std::wstring& Str);
+
+private:
+	type type_;
+
+};
+std::wostream& operator << (std::wostream& _Wostream, const smil_additive& _Val);
+
+
+}
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::smil_additive);
+
+}

OdfFile/Reader/Converter/pptx_animation_context.cpp

@@ -184,6 +184,10 @@ namespace oox {
 			_CP_OPT(std::wstring)							AttributeName;
 			_CP_OPT(std::wstring)							From;
 			_CP_OPT(std::wstring)							To;
+			_CP_OPT(std::wstring)							By;
+			_CP_OPT(std::wstring)							Additive;
+			_CP_OPT(bool)									AutoReverse;
+			_CP_OPT(std::wstring)							Delay;
 			_CP_OPT(std::vector<_keypoint>)					KeypointArray;
 
 			void serialize(std::wostream& strm) override;
@@ -615,6 +619,26 @@ namespace oox {
 		impl_->anim_description_->To = value;
 	}
 
+	void pptx_animation_context::set_animate_by(const std::wstring& value)
+	{
+		impl_->anim_description_->By = value;
+	}
+
+	void pptx_animation_context::set_animate_additive(const std::wstring& value)
+	{
+		impl_->anim_description_->Additive = value;
+	}
+
+	void pptx_animation_context::set_animate_auto_reverse(bool value)
+	{
+		impl_->anim_description_->AutoReverse = value;
+	}
+
+	void pptx_animation_context::set_animate_delay(const std::wstring& value)
+	{
+		impl_->anim_description_->Delay = value;
+	}
+
 	void pptx_animation_context::add_animate_keypoint(int time, const std::wstring& value)
 	{
 		impl_->anim_description_->KeypointArray->push_back(Impl::_anim::_keypoint(time, value));
@@ -917,15 +941,31 @@ namespace oox {
 				if (ValueType)		CP_XML_ATTR(L"valueType", ValueType.value());
 				if(From)			CP_XML_ATTR(L"from", From.value());
 				if (To)				CP_XML_ATTR(L"to", To.value());
+				if (By)				CP_XML_ATTR(L"by", By.value());
 
 				CP_XML_NODE(L"p:cBhvr")
 				{
-					CP_XML_ATTR(L"additive", L"repl");
+					if (Additive)	CP_XML_ATTR(L"additive", Additive.value());
 					
 					CP_XML_NODE(L"p:cTn")
 					{
 						int duration = Duration ? Duration.value() : 1;
 						CP_XML_ATTR(L"dur", duration);
+
+						if (AutoReverse)
+						{
+							int autoRev = AutoReverse.value() ? 1 : 0;
+							CP_XML_ATTR(L"autoRev", autoRev);
+						}
+
+						CP_XML_NODE(L"p:stCondLst")
+						{
+							std::wstring delay = Delay ? Delay.value() : L"0";
+							CP_XML_NODE(L"p:cond")
+							{
+								CP_XML_ATTR(L"delay", delay);
+							}
+						}
 					}
 					CP_XML_NODE(L"p:tgtEl")
 					{

OdfFile/Reader/Converter/pptx_animation_context.h

@@ -101,6 +101,10 @@ namespace oox {
 			void set_animate_attribute_name(const std::wstring& value);
 			void set_animate_from(const std::wstring& value);
 			void set_animate_to(const std::wstring& value);
+			void set_animate_by(const std::wstring& value);
+			void set_animate_additive(const std::wstring& value);
+			void set_animate_auto_reverse(bool value);
+			void set_animate_delay(const std::wstring& value);
 			void add_animate_keypoint(int time, const std::wstring& value);
 		void end_animate();
 		

OdfFile/Reader/Format/anim_elements.cpp

@@ -307,6 +307,18 @@ static std::wstring pptx_convert_animation_function(std::wstring animation_funct
 	return animation_function;
 }
 
+static std::wstring pptx_convert_smil_begin(const std::wstring& smil_begin)
+{
+	std::wstring delay;
+	clockvalue delayClockvalue = clockvalue::parse(smil_begin);
+	if (delayClockvalue.get_value() != -1)
+		delay = boost::lexical_cast<std::wstring>(delayClockvalue.get_value());
+	else
+		delay = L"indefinite";
+
+	return delay;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t* anim_par::ns = L"anim";
 const wchar_t* anim_par::name = L"par";
@@ -374,11 +386,7 @@ void anim_par::pptx_convert(oox::pptx_conversion_context & Context)
 
 	if (common_attlist_.smil_begin_)
 	{
-		clockvalue delayClockvalue = clockvalue::parse(common_attlist_.smil_begin_.get());
-		if (delayClockvalue.get_value() != -1)
-			delay = boost::lexical_cast<std::wstring>(delayClockvalue.get_value());
-		else if (common_attlist_.smil_begin_.get() == L"next")
-			delay = L"indefinite";
+		delay = pptx_convert_smil_begin(common_attlist_.smil_begin_.value());
 	}
 
 	// TODO: Figure out correct value
@@ -988,11 +996,7 @@ void anim_set::pptx_convert(oox::pptx_conversion_context& Context)
 
 	if (common_attlist_.smil_begin_)
 	{
-		clockvalue delayClockvalue = clockvalue::parse(common_attlist_.smil_begin_.get());
-		if (delayClockvalue.get_value() != -1)
-			delay = boost::lexical_cast<std::wstring>(delayClockvalue.get_value());
-		else
-			delay = boost::none;
+		delay = pptx_convert_smil_begin(common_attlist_.smil_begin_.value());
 	}
 
 	if (common_attlist_.smil_end_)
@@ -1119,11 +1123,7 @@ void anim_animate_color::pptx_convert(oox::pptx_conversion_context& Context)
 
 	if (common_attlist_.smil_begin_)
 	{
-		clockvalue delayClockvalue = clockvalue::parse(common_attlist_.smil_begin_.get());
-		if (delayClockvalue.get_value() != -1)
-			delay = boost::lexical_cast<std::wstring>(delayClockvalue.get_value());
-		else
-			delay = L"0";
+		delay = pptx_convert_smil_begin(common_attlist_.smil_begin_.value());
 	}
 
 	if (animate_color_attlist_.smil_attribute_name_)
@@ -1160,7 +1160,6 @@ void anim_animate_color::add_attributes(const xml::attributes_wc_ptr& Attributes
 
 void anim_animate_attlist::add_attributes(const xml::attributes_wc_ptr& Attributes)
 {
-	CP_APPLY_ATTR(L"smil:dur",					smil_dur_);
 	CP_APPLY_ATTR(L"smil:targetElement",		smil_target_element_);
 	CP_APPLY_ATTR(L"smil:attributeName",		smil_attribute_name_);
 	CP_APPLY_ATTR(L"smil:values",				smil_values_);
@@ -1168,6 +1167,8 @@ void anim_animate_attlist::add_attributes(const xml::attributes_wc_ptr& Attribut
 	CP_APPLY_ATTR(L"smil:calcMode",				smil_calc_mode_);
 	CP_APPLY_ATTR(L"smil:from",					smil_from_);
 	CP_APPLY_ATTR(L"smil:to",					smil_to_);
+	CP_APPLY_ATTR(L"smil:by",					smil_by_);
+	CP_APPLY_ATTR(L"smil:autoReverse",			smil_auto_reverse_);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1185,6 +1186,10 @@ void anim_animate::pptx_convert(oox::pptx_conversion_context& Context)
 	size_t										shapeID = 0;
 	_CP_OPT(std::wstring)						from;
 	_CP_OPT(std::wstring)						to;
+	_CP_OPT(std::wstring)						by;
+	_CP_OPT(std::wstring)						additive;
+	_CP_OPT(bool)								autoRev;
+	_CP_OPT(std::wstring)						delay;
 
 	if (animate_attlist_.smil_calc_mode_)
 	{
@@ -1195,7 +1200,7 @@ void anim_animate::pptx_convert(oox::pptx_conversion_context& Context)
 		calcmode = L"lin";
 
 	valueType = L"num";
-	duration = animate_attlist_.smil_dur_ ? animate_attlist_.smil_dur_->get_value() : 1;
+	duration = common_attlist_.smil_dur_ ? common_attlist_.smil_dur_->get_value() : 1;
 
 	if (animate_attlist_.smil_attribute_name_)
 	{
@@ -1245,6 +1250,33 @@ void anim_animate::pptx_convert(oox::pptx_conversion_context& Context)
 		to = pptx_convert_animation_function(animate_attlist_.smil_to_.value());
 	}
 
+	if (animate_attlist_.smil_by_)
+	{
+		by = pptx_convert_animation_function(animate_attlist_.smil_by_.value());
+	}
+
+	if (animate_attlist_.smil_additive_)
+	{
+		switch (animate_attlist_.smil_additive_.value().get_type())
+		{
+		case odf_types::smil_additive::replace: additive = L"repl";
+		case odf_types::smil_additive::sum: additive = L"sum";
+		default: additive = L"repl";
+		}
+	}
+	else
+		additive = L"repl";
+
+	if (animate_attlist_.smil_auto_reverse_)
+	{
+		autoRev = animate_attlist_.smil_auto_reverse_.value().get();
+	}
+
+	if (common_attlist_.smil_begin_)
+	{
+		delay = pptx_convert_smil_begin(common_attlist_.smil_begin_.value());
+	}
+
 	oox::pptx_animation_context& animationContext = Context.get_slide_context().get_animation_context();
 	animationContext.start_animate();
 	if (calcmode)			animationContext.set_animate_calc_mode(calcmode.value());
@@ -1253,6 +1285,10 @@ void anim_animate::pptx_convert(oox::pptx_conversion_context& Context)
 	if (attributeName)		animationContext.set_animate_attribute_name(attributeName.value());
 	if (from)				animationContext.set_animate_from(from.value());
 	if (to)					animationContext.set_animate_to(to.value());
+	if (by)					animationContext.set_animate_by(by.value());
+	if (additive)			animationContext.set_animate_additive(additive.value());
+	if (autoRev)			animationContext.set_animate_auto_reverse(autoRev.value());
+	if (delay)				animationContext.set_animate_delay(delay.value());
 	animationContext.set_animate_shape_id(shapeID);
 
 	if (timesPptx.size() == valuesPptx.size())
@@ -1270,6 +1306,7 @@ void anim_animate::pptx_convert(oox::pptx_conversion_context& Context)
 
 void anim_animate::add_attributes(const xml::attributes_wc_ptr& Attributes)
 {
+	common_attlist_.add_attributes(Attributes);
 	animate_attlist_.add_attributes(Attributes);
 }
 

OdfFile/Reader/Format/anim_elements.h

@@ -37,6 +37,7 @@
 #include "../../DataTypes/common_attlists.h"
 #include "../../DataTypes/smil_transitiontype.h"
 #include "../../DataTypes/smil_attributename.h"
+#include "../../DataTypes//smil_additive.h"
 #include "../../DataTypes/presetclass.h"
 #include "../../DataTypes/presetid.h"
 
@@ -278,7 +279,6 @@ class anim_animate_attlist
 public:
 	void add_attributes(const xml::attributes_wc_ptr& Attributes);
 
-	_CP_OPT(odf_types::clockvalue)				smil_dur_;
 	_CP_OPT(std::wstring)						smil_target_element_;
 	_CP_OPT(odf_types::smil_attribute_name)		smil_attribute_name_;
 	_CP_OPT(std::wstring)						smil_values_;
@@ -286,6 +286,9 @@ public:
 	_CP_OPT(std::wstring)						smil_calc_mode_;
 	_CP_OPT(std::wstring)						smil_from_;
 	_CP_OPT(std::wstring)						smil_to_;
+	_CP_OPT(std::wstring)						smil_by_;
+	_CP_OPT(odf_types::smil_additive)			smil_additive_;
+	_CP_OPT(odf_types::Bool)					smil_auto_reverse_;
 
 };
 class anim_animate : public office_element_impl<anim_animate>
@@ -299,7 +302,8 @@ public:
 
 	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 
-	anim_animate_attlist				animate_attlist_;
+	odf_types::common_anim_smil_attlist			common_attlist_;
+	anim_animate_attlist						animate_attlist_;
 
 private:
 	virtual void add_child_element(xml::sax* Reader, const std::wstring& Ns, const std::wstring& Name) {}

X2tConverter/test/win32Test/Res/ce93cb9f-3b6d-4dbf-94af-064a748781f5/odf_unpacked/META-INF/manifest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.3" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+ <manifest:file-entry manifest:full-path="/" manifest:version="1.3" manifest:media-type="application/vnd.oasis.opendocument.presentation"/>
+ <manifest:file-entry manifest:full-path="Object 1/meta.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/styles.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/content.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/" manifest:media-type="application/vnd.oasis.opendocument.chart"/>
+ <manifest:file-entry manifest:full-path="Configurations2/" manifest:media-type="application/vnd.sun.xml.ui.configuration"/>
+ <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Pictures/10000000000002000000020008D6A01043175452.jpg" manifest:media-type="image/jpeg"/>
+ <manifest:file-entry manifest:full-path="Pictures/1000000000000230000002A9E9107FD975B07EE0.jpg" manifest:media-type="image/jpeg"/>
+ <manifest:file-entry manifest:full-path="Pictures/TablePreview1.svm" manifest:media-type=""/>
+ <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Thumbnails/thumbnail.png" manifest:media-type="image/png"/>
+ <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
+</manifest:manifest>

X2tConverter/test/win32Test/Res/ce93cb9f-3b6d-4dbf-94af-064a748781f5/odf_unpacked/Object 1/meta.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3"><office:meta><meta:generator>LibreOffice/7.4.7.2$Windows_X86_64 LibreOffice_project/723314e595e8007d3cf785c16538505a1c878ca5</meta:generator></office:meta></office:document-meta>

X2tConverter/test/win32Test/Res/ce93cb9f-3b6d-4dbf-94af-064a748781f5/odf_unpacked/Object 1/styles.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3"><office:styles/></office:document-styles>

X2tConverter/test/win32Test/Res/ce93cb9f-3b6d-4dbf-94af-064a748781f5/odf_unpacked/meta.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3"><office:meta><dc:date>2023-07-19T23:03:37.726000000</dc:date><meta:editing-duration>PT28M37S</meta:editing-duration><meta:editing-cycles>6</meta:editing-cycles><meta:generator>LibreOffice/7.4.7.2$Windows_X86_64 LibreOffice_project/723314e595e8007d3cf785c16538505a1c878ca5</meta:generator><meta:document-statistic meta:object-count="38"/></office:meta></office:document-meta>

X2tConverter/test/win32Test/Res/ce93cb9f-3b6d-4dbf-94af-064a748781f5/odf_unpacked/mimetype

@@ -0,0 +1 @@
+application/vnd.oasis.opendocument.presentation

X2tConverter/test/win32Test/Res/df0caedc-c332-4a47-8734-6a741560b980/odf_unpacked/META-INF/manifest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.3" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+ <manifest:file-entry manifest:full-path="/" manifest:version="1.3" manifest:media-type="application/vnd.oasis.opendocument.presentation"/>
+ <manifest:file-entry manifest:full-path="Object 1/meta.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/styles.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/content.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Object 1/" manifest:media-type="application/vnd.oasis.opendocument.chart"/>
+ <manifest:file-entry manifest:full-path="Configurations2/" manifest:media-type="application/vnd.sun.xml.ui.configuration"/>
+ <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Pictures/10000000000002000000020008D6A01043175452.jpg" manifest:media-type="image/jpeg"/>
+ <manifest:file-entry manifest:full-path="Pictures/1000000000000230000002A9E9107FD975B07EE0.jpg" manifest:media-type="image/jpeg"/>
+ <manifest:file-entry manifest:full-path="Pictures/TablePreview1.svm" manifest:media-type=""/>
+ <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="Thumbnails/thumbnail.png" manifest:media-type="image/png"/>
+ <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
+ <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
+</manifest:manifest>

X2tConverter/test/win32Test/Res/df0caedc-c332-4a47-8734-6a741560b980/odf_unpacked/Object 1/meta.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3"><office:meta><meta:generator>LibreOffice/7.4.7.2$Windows_X86_64 LibreOffice_project/723314e595e8007d3cf785c16538505a1c878ca5</meta:generator></office:meta></office:document-meta>

X2tConverter/test/win32Test/Res/df0caedc-c332-4a47-8734-6a741560b980/odf_unpacked/Object 1/styles.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3"><office:styles/></office:document-styles>

X2tConverter/test/win32Test/Res/df0caedc-c332-4a47-8734-6a741560b980/odf_unpacked/meta.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3"><office:meta><dc:date>2023-07-19T23:03:37.726000000</dc:date><meta:editing-duration>PT28M37S</meta:editing-duration><meta:editing-cycles>6</meta:editing-cycles><meta:generator>LibreOffice/7.4.7.2$Windows_X86_64 LibreOffice_project/723314e595e8007d3cf785c16538505a1c878ca5</meta:generator><meta:document-statistic meta:object-count="38"/></office:meta></office:document-meta>

X2tConverter/test/win32Test/Res/df0caedc-c332-4a47-8734-6a741560b980/odf_unpacked/mimetype

@@ -0,0 +1 @@
+application/vnd.oasis.opendocument.presentation