.

ASCOfficeDocxFile2/BinReader/ChartWriter.h

@@ -47,9 +47,11 @@ namespace Writers
 		std::vector<_chartElem> m_aCharts;
 	public:
         std::wstring m_sDir;
+		int nEmbeddedCount;
 
 		ChartWriter(std::wstring sDir) : m_sDir(sDir)
 		{
+			nEmbeddedCount = 1000;
 		}
 		~ChartWriter()
 		{

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -6824,8 +6824,7 @@ public:
 				std::wstring strDstEmbeddedTemp = strDstEmbedded + FILE_SEPARATOR_STR + L"Temp";
 				NSDirectory::CreateDirectory(strDstEmbeddedTemp);
 
-				int id = m_oFileWriter.m_oChartWriter.getChartCount();
-				m_oFileWriter.m_oChartWriter.setChartCount(id + 1);
+				int id = m_oFileWriter.m_oChartWriter.nEmbeddedCount++;
 
 				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring( id + 1) + L".xlsx";
 				BinXlsxRW::SaveParams oSaveParams(m_oFileWriter.m_sThemePath, m_oFileWriter.m_pDrawingConverter->GetContentTypes());//???

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -371,16 +371,21 @@ void PptxConverter::convert_slides()
 		//nullable_bool		showMasterSp;
 		
 		convert_slide	(slide->cSld.GetPointer(), true);
-		convert			(slide->transition.GetPointer());
-		
 		convert			(slide->comments.operator->());
+		convert			(slide->Note.operator->());
+		
+		convert			(slide->transition.GetPointer());
+		convert			(slide->timing.GetPointer());
 
-		//nullable<Logic::Timing>		timing;
-		//smart_ptr<NotesSlide>			Note;
 
 		odp_context->end_slide();
 	}
 }
+void PptxConverter::convert(PPTX::NotesSlide *oox_note)
+{
+	if (!oox_note) return;
+}
+
 void PptxConverter::convert(OOX::WritingElement  *oox_unknown)
 {
 	if (oox_unknown == NULL)return;
@@ -433,6 +438,16 @@ void PptxConverter::convert(PPTX::Logic::Transition *oox_transition)
 	if (!oox_transition) return;
 	
 
+}
+void PptxConverter::convert(PPTX::Logic::Timing *oox_timing)
+{
+	if (!oox_timing) return;
+	if (!oox_timing->tnLst.IsInit()) return;
+	
+	for (size_t i = 0; i < oox_timing->tnLst->list.size(); i++)
+	{
+		//oox_timing->tnLst[0]
+	}
 }
 void PptxConverter::convert(PPTX::Logic::TableProperties *oox_table_pr)
 {

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.h

@@ -47,6 +47,7 @@ namespace OOX
 namespace PPTX
 {
 	class TableStyles;
+	class NotesSlide;
 	class Presentation;
 	class Comments;
 	class Folder;
@@ -107,9 +108,11 @@ namespace Oox2Odf
 		void convert_slide	(PPTX::Logic::CSld			*oox_slide, bool bPlaceholders = true);
 		void convert_layout	(PPTX::Logic::CSld			*oox_slide);
 		void convert		(PPTX::Comments				*oox_comments);
+		void convert		(PPTX::NotesSlide			*oox_note);
 
 		void convert(PPTX::Logic::Bg					*oox_background);
 		void convert(PPTX::Logic::Transition			*oox_transition);
+		void convert(PPTX::Logic::Timing				*oox_timing);
 		
 		void convert(PPTX::Logic::Table					*oox_table);
 		void convert(PPTX::Logic::TableRow				*oox_table_row);

ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TimeNodeBase.h

@@ -47,7 +47,6 @@ namespace PPTX
 			explicit TimeNodeBase(XmlUtils::CXmlNode& node);
 			const TimeNodeBase& operator =(XmlUtils::CXmlNode& node);
 
-		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual void GetTimeNodeFrom(XmlUtils::CXmlNode& element);
 			virtual bool is_init()const{return (m_node.IsInit());};
@@ -61,7 +60,6 @@ namespace PPTX
 			template<class T> AVSINLINE const T&	as() const 	{ return m_node.as<T>(); }
 
 			virtual std::wstring toXML() const;
-		//public:
 		private:
 			smart_ptr<WrapperWritingElement> m_node;
 		protected:

ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Timing.h

@@ -46,7 +46,6 @@ namespace PPTX
 		public:
 			PPTX_LOGIC_BASE(Timing)
 
-		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				tnLst	= node.ReadNode(_T("p:tnLst"));
@@ -76,7 +75,6 @@ namespace PPTX
 				pWriter->EndNode(_T("p:timing"));
 			}
 
-		public:
 			nullable<TnLst>		tnLst;
 			nullable<BldLst>	bldLst;
 		protected:

ASCOfficePPTXFile/PPTXFormat/Logic/Timing/TnLst.h

@@ -55,8 +55,6 @@ namespace PPTX
 
 				return *this;
 			}
-
-		public:
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				name = XmlUtils::GetNameNoNS(node.GetName());
@@ -72,7 +70,6 @@ namespace PPTX
 
 				return XmlUtils::CreateNode(_T("p:") + name, oValue);
 			}
-		public:
 			std::vector<TimeNodeBase>		list;
 			std::wstring					name;
 		protected: