Merge pull request #39 from ONLYOFFICE/release/v5.0.0

xhtml bug

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -157,7 +157,6 @@ namespace OpenXmlRelationshipTypes
     static const wchar_t* OleObject				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
     static const wchar_t* GlossaryDocument		=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";
     static const wchar_t* Package				=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
-    static const wchar_t* VbaProject			=	L"http://schemas.microsoft.com/office/2006/relationships/vbaProject";
 }
 
 namespace MicrosoftWordRelationshipTypes

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -65,7 +65,7 @@ namespace DocFileFormat
 	{
 		ConversionContext context( doc, docx );
 
-	//Write styles.xml
+		//Write styles.xml
 		if (doc->Styles)
 		{
 			StyleSheetMapping styleSheetMapping( &context );
@@ -88,7 +88,9 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-	//Write numbering.xml
+
+
+		//Write numbering.xml
 		if (doc->listTable)
 		{
 			NumberingMapping numberingMapping( &context );
@@ -108,7 +110,7 @@ namespace DocFileFormat
 			}
 		}
 
-	//Write fontTable.xml
+		//Write fontTable.xml
 		if (doc->FontTable)
 		{
 			FontTableMapping fontTableMapping( &context );
@@ -128,7 +130,7 @@ namespace DocFileFormat
 			}
 		}
 
-	//write the footnotes
+		//write the footnotes
 		FootnotesMapping footnotesMapping( &context );
 		doc->Convert( &footnotesMapping );
 
@@ -145,7 +147,7 @@ namespace DocFileFormat
 			}
 		}
 
-	//write the endnotes
+		//write the endnotes
 		EndnotesMapping endnotesMapping( &context );
 		doc->Convert( &endnotesMapping );
 
@@ -162,7 +164,7 @@ namespace DocFileFormat
 			}
 		}
 
-	//write the comments
+		//write the comments
 		CommentsMapping commentsMapping( &context );
 		doc->Convert( &commentsMapping );
 
@@ -179,13 +181,13 @@ namespace DocFileFormat
 			}
 		}
 
-	//write settings.xml at last because of the rsid list
+		//write settings.xml at last because of the rsid list
 		if (doc->DocProperties)
 		{
 			SettingsMapping settingsMapping( &context );
 			doc->DocProperties->Convert( &settingsMapping );
 		}
-		
+
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 975000 );
@@ -202,7 +204,7 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress)
 	{
         long result = S_FALSE;
 
@@ -217,7 +219,7 @@ namespace DocFileFormat
 
             if (result == S_OK)
 			{
-				docx.SaveDocument(bMacros);
+				docx.SaveDocument();
 
                 if (progress)progress->OnProgress(progress->caller, DOC_ONPROGRESSEVENT_ID, 1000000);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -48,7 +48,7 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress);
 	
 	private:
 		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -902,7 +902,7 @@ namespace DocFileFormat
 					{
 						int shape_type = oPicture.shapeContainer->getShapeType();
 
-						if (shape_type != msosptPictureFrame) picture = false;//шаблон 1.doc картинка в колонтитуле
+						if (shape_type != msosptPictureFrame) picture = false;
 					}
 					
 					if (picture)

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -50,7 +50,8 @@ namespace DocFileFormat
 	void MainDocumentMapping::Apply(IVisitable* visited)
 	{
 		m_document = static_cast<WordDocument*>(visited);
-		
+		m_context->_docx->RegisterDocument();
+
 		// Header
 		m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
 		m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -149,14 +149,7 @@ namespace DocFileFormat
 							point.y = guides[index].param3;
 						}
 					}
-					if ((size_t)point.y > 0xffff)
-					{
-						point.y &= 0xffff;
-					}
-					if ((size_t)point.x > 0xffff)
-					{
-						point.x &= 0xffff;
-					}
+
 					m_arPoints.push_back(point);
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -63,25 +63,8 @@ namespace DocFileFormat
 				Shape* sh = dynamic_cast<Shape*>( *iter );
 				if (sh)
 				{
-					if (sh->shapeType) 
-					{
-						return sh->shapeType->GetTypeCode();
-					}
-					else 
-					{
-						for ( std::vector<Record*>::const_iterator iter1 = this->Children.begin(); iter1 != this->Children.end(); iter1++ )
-						{
-							ShapeOptions* sh_options = dynamic_cast<ShapeOptions*>( *iter1 );
-							if (sh_options)
-							{
-								if (sh_options->OptionsByID.end() != sh_options->OptionsByID.find(Pib))
-								{
-									return msosptPictureFrame;
-								}
-							}
-						}
-						return 0;
-					}
+					if (sh->shapeType) return sh->shapeType->GetTypeCode();
+					else return 0;
 				}
 			}
 			return 0;

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -73,6 +73,7 @@ namespace DocFileFormat
 
         NSDirectory::CreateDirectory( m_strOutputPath + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR + L"_rels" );
 
+
 		WriteRelsFile( DocumentRelationshipsFile );
 
 		WriteRelsFile( FootnotesRelationshipsFile );
@@ -198,14 +199,7 @@ namespace DocFileFormat
 	{
         return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
 	}
-	int OpenXmlPackage::RegisterDocumentMacros()
-	{
-        return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocumentMacro, L"");
-	}
-	int OpenXmlPackage::RegisterVbaProject()
-	{
-		return AddPart( L"word", L"vbaProject.bin", MicrosoftWordContentTypes::VbaProject, OpenXmlRelationshipTypes::VbaProject );
-	}
+
 	int OpenXmlPackage::RegisterFontTable()
 	{
         return AddPart( L"word", L"fontTable.xml", WordprocessingMLContentTypes::FontTable, OpenXmlRelationshipTypes::FontTable );

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -118,8 +118,6 @@ namespace DocFileFormat
 
 	class OpenXmlPackage
 	{
-	public:
-		const WordDocument* docFile;
 	private: 
 		ContentTypesFile DocumentContentTypesFile;
 		RelationshipsFile MainRelationshipsFile;
@@ -139,6 +137,8 @@ namespace DocFileFormat
 		int _footerCounter;
 		int _oleCounter;
 
+		const WordDocument* docFile;
+
         int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
         int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
         int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
@@ -166,7 +166,6 @@ namespace DocFileFormat
 		HRESULT SaveEmbeddedObject	( const std::wstring& fileName, const std::string& data );
 
 		int RegisterDocument();
-		int RegisterDocumentMacros();
 		int RegisterFontTable();
 		int RegisterNumbering();
 		int RegisterSettings();
@@ -180,6 +179,5 @@ namespace DocFileFormat
 		int RegisterOLEObject		( const IMapping* mapping, const std::wstring& objectType );
 		int RegisterPackage			( const IMapping* mapping, const std::wstring& objectType);
 		int RegisterExternalOLEObject( const IMapping* mapping, const std::wstring& objectType, const std::wstring& uri );
-		int RegisterVbaProject();
 	};
 }

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -42,6 +42,7 @@ namespace DocFileFormat
 		{
 
 		}
+
 		~StructuredStorageReader()
 		{
 			if(m_pStorage)
@@ -61,12 +62,6 @@ namespace DocFileFormat
 			}
 			return false;
 		}
-		bool isDirectory( const std::string& name )
-		{
-			if (!m_pStorage) return false;
-			
-			return m_pStorage->isDirectory(name);
-		}
 
 		bool GetStream (const char *path, POLE::Stream** ppStream)
 		{
@@ -84,78 +79,8 @@ namespace DocFileFormat
 		{
 			return m_pStorage;
 		}
-	
-		void copy( int indent, std::string path, POLE::Storage * storageOut, bool withRoot = true)
-		{
-			std::list<std::string> entries, entries_sort;
-			entries = m_pStorage->entries( path );
-			
-			for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
-			{
-				std::string name = *it;
-				std::string fullname = path + name;
-		       
-				if( m_pStorage->isDirectory( fullname ) )
-				{
-					entries_sort.push_back(name);
-				}
-				else
-				{
-					entries_sort.push_front(name);
-				}
-			}
-			//for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
-			for( std::list<std::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); it++ )
-			{
-				std::string name = *it;
-				std::string fullname = path + name;
-		       
-				if( m_pStorage->isDirectory( fullname ) )
-				{
-					copy( indent + 1, fullname + "/", storageOut, withRoot );
-				}
-				else
-				{
-					copy_stream(fullname, storageOut, withRoot);
-				}
-			}
-		}
 
 	private:
-		void copy_stream(std::string streamName, POLE::Storage * storageOut, bool withRoot = true)
-		{
-			POLE::Stream *stream = new POLE::Stream(m_pStorage, streamName);
-			if (!stream) return;
-
-			stream->seek(0);
-			int size_stream = stream->size();
-
-			if (withRoot == false)
-			{
-				int pos = streamName.find("/");
-				if (pos >= 0)
-					streamName = streamName.substr(pos + 1);
-			}
-			
-			POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
-			if (!streamNew) return;
-
-			unsigned char* data_stream = new unsigned char[size_stream];
-			if (data_stream)
-			{
-				stream->read(data_stream, size_stream);
-
-				streamNew->write(data_stream, size_stream);
-
-				delete []data_stream;
-				data_stream = NULL;
-			}
-
-			streamNew->flush();
-					
-			delete streamNew;
-			delete stream;
-		}
 
 		POLE::Storage* m_pStorage;
 	};

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1905,13 +1905,13 @@ namespace DocFileFormat
 			switch (pSpa->wr)
 			{
 				case 0:
-				case 2:	wrapType = L"square";		break;
-				case 1:	wrapType = L"topAndBottom";	break;
-				case 3:	wrapType = L"through";		break;
+				case 2:	wrapType = L"square";
+				case 1:	wrapType = L"topAndBottom";
+				case 3:	wrapType = L"through";
 				case 4:
-				case 5:	wrapType = L"tight";		break;
+				case 5:	wrapType = L"tight";
 				default:
-						wrapType = L"none";			break;
+						wrapType = L"none";
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -528,24 +528,11 @@ namespace DocFileFormat
 	}
 	void WordDocument::DecryptStream( int level, std::string path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
 	{
-		std::list<std::string> entries, entries_sort;
+		std::list<std::string> entries;
 		entries = storageIn->entries( path );
-		
-		for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
-		{
-			std::string name = *it;
-			std::string fullname = path + name;
-	       
-			if( storageIn->isDirectory( fullname ) )
-			{
-				entries_sort.push_back(name);
-			}
-			else
-			{
-				entries_sort.push_front(name);
-			}
-		}	    
-		for( std::list<std::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); ++it )
+	    
+		std::list<std::string>::iterator it;
+		for( it = entries.begin(); it != entries.end(); ++it )
 		{
 			std::string name = *it;
 			std::string fullname = path + name;

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -99,17 +99,18 @@ namespace DocFileFormat
 
 		bool	bOlderVersion;
 		int		document_code_page;
-		
-		inline StructuredStorageReader* GetStorage() const
-		{
-			return m_pStorage;
-		}
+
 	private:
 		bool DecryptOfficeFile	(CRYPT::Decryptor* Decryptor);
 		
 		bool DecryptStream		(std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
 		void DecryptStream		(int level, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
 		
+		inline StructuredStorageReader* GetStorage() const
+		{
+			return m_pStorage;
+		}
+
 		inline OfficeArtContent* GetOfficeArt ()
 		{
 			return officeArtContent;

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -180,37 +180,10 @@ namespace DocFileFormat
 	{
 	}
 
-	void WordprocessingDocument::SaveDocument(bool &bMacros)
+	void WordprocessingDocument::SaveDocument()
 	{
-		std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
-		NSDirectory::CreateDirectory( pathWord );
-
-		if (bMacros && docFile->GetStorage()->isDirectory("Macros"))
-		{
-			std::wstring sVbaProjectFile = pathWord + FILE_SEPARATOR_STR + L"vbaProject.bin";
-
-			POLE::Storage *storageVbaProject = new POLE::Storage(sVbaProjectFile.c_str());
-
-			if ((storageVbaProject) && (storageVbaProject->open(true, true)))
-			{			
-				docFile->GetStorage()->copy(0, "Macros/", storageVbaProject, false);
-
-				storageVbaProject->close();
-				delete storageVbaProject;
-
-				RegisterDocumentMacros();
-				RegisterVbaProject();	
-				//output_document->get_xl_files().add_vba_project();
-			}
-			else bMacros = false;
-		}
-		else 
-			bMacros = false;
-
-		if (!bMacros)
-		{
-			RegisterDocument();
-		}
+        std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
+         NSDirectory::CreateDirectory( pathWord );
 
 		WritePackage();
 

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -76,7 +76,6 @@ namespace DocFileFormat
 	public:
 		WordprocessingDocument(const std::wstring & _docxDirectory, const WordDocument* _docFile);
 		virtual ~WordprocessingDocument();
-		
-		void SaveDocument(bool &bMacros);
+		void SaveDocument();
 	};
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,14 +34,14 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
+HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, ProgressCallback *ffCallBack )
 {
 	HRESULT hr = S_FALSE;
 
 	DocFileFormat::Converter docToDocx;
 	docToDocx.m_sTempFolder = m_sTempFolder;
 
-    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, ffCallBack, bMacros);
+    hr= docToDocx.LoadAndConvert(docFile, docxDirectory, password, ffCallBack);
 
 	return hr;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -53,7 +53,7 @@ public:
 
 	std::wstring m_sTempFolder;
 
-    HRESULT LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
+    HRESULT LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, ProgressCallback *ffCallBack = NULL);
     HRESULT SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, ProgressCallback *ffCallBack = NULL);
 
 };

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -54,27 +54,17 @@ int _tmain(int argc, _TCHAR* argv[])
 	if (argc < 2) return 1;
 
 	std::wstring sSrcDoc	= argv[1];
-	std::wstring sDstDocx;
+	std::wstring sDstDocx	= argc > 2 ? argv[2] : sSrcDoc + L"-my.docx";
 
-	std::wstring outputDir		= NSDirectory::GetFolderPath(sSrcDoc);
+	std::wstring outputDir		= NSDirectory::GetFolderPath(sDstDocx);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
 	COfficeDocFile docFile;
 
 	docFile.m_sTempFolder = outputDir;
 	
-	bool bMacros = true;
-	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, L"password", bMacros, NULL);
+	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, L"password", NULL);
 	
-	if (bMacros)
-	{
-		sDstDocx = sSrcDoc + L"-my.docm";
-	}
-	else
-	{
-		sDstDocx = sSrcDoc + L"-my.docx";
-
-	}
 	if (hRes == S_OK)
 	{
 		COfficeUtils oCOfficeUtils(NULL);

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -36,7 +36,7 @@ namespace BinDocxRW {
 
 int Binary_VbaProjectTableReader::Read()
 {
-    m_oFileWriter.m_pVbaProject = new OOX::VbaProject();
+		m_oFileWriter.m_pVbaProject = new OOX::VbaProject();
     m_oFileWriter.m_pVbaProject->fromPPTY(&m_oBufferedStream);
 
     return c_oSerConstants::ReadOk;
@@ -118,4 +118,4 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItemContent(BYTE type, long length, void
 	return pBinary_DocumentTableReader->ReadDocumentContent(type, length, NULL);
 }
 
-}
+}

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -285,7 +285,7 @@ public:
 	}
 
     int Read ();
- };
+};
 
 class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
 {

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -95,7 +95,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 	oDrawingConverter.SetMainDocument(this);
 
     oDrawingConverter.SetDstPath(pathMain.GetDirectory() + FILE_SEPARATOR_STR + L"word");
-    oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
+	oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
 	
 	m_pParamsWriter = new ParamsWriter(&oBufferedStream, &fp, &oDrawingConverter, pEmbeddedFontsManager);
 
@@ -265,10 +265,10 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 			
 			if (NULL != pData)
 			{
-				oDrawingConverter.SetMainDocument(this);                
+				oDrawingConverter.SetMainDocument(this);
                 oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
 
-                oDrawingConverter.SetMediaDstPath(sMediaPath);
+				oDrawingConverter.SetMediaDstPath(sMediaPath);
 				oDrawingConverter.SetEmbedDstPath(sEmbedPath);
 				
 				m_pCurFileWriter = new Writers::FileWriter(sDstPath, m_sFontDir, false, nVersion, m_bSaveChartAsImg, &oDrawingConverter, sThemePath);

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -88,12 +88,12 @@ namespace BinXlsxRW{
 	{
         std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
 
-        NSBinPptxRW::CDrawingConverter oDrawingConverter;
+		NSBinPptxRW::CDrawingConverter oDrawingConverter;
 		
         oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
         oDrawingConverter.SetSrcPath(strFileInDir, 2);
 
-        oDrawingConverter.SetMediaDstPath(sMediaDir);
+		oDrawingConverter.SetMediaDstPath(sMediaDir);
 		oDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -314,7 +314,7 @@
 		17E17ED41AC453F800BEA2EA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Ascensio System SIA";
 			};
 			buildConfigurationList = 17E17ED71AC453F800BEA2EA /* Build configuration list for PBXProject "ASCOfficeDocxFile2Lib" */;
@@ -446,8 +446,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -455,6 +457,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -488,8 +491,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -497,6 +502,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

@@ -34,11 +34,9 @@
 #include <stdio.h>
 #include <tchar.h>
 
-#include "../../Common/OfficeFileFormatChecker.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../src/ConvertOO2OOX.h"
-#include "../include/logging.h"
 
 
 #if defined(_WIN64)
@@ -47,55 +45,30 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
-HRESULT convert_single(std::wstring srcFileName)
+
+
+int _tmain(int argc, _TCHAR* argv[])
 {
+	if (argc < 2) return 1;
+	
 	HRESULT hr = S_OK;
-
-	COfficeFileFormatChecker fileChecker(srcFileName);
-
-	std::wstring dstPath = srcFileName;// + ; //xlsx pptx docx
-	switch(fileChecker.nFileType)
-	{
-	case AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT:
-	case AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT_FLAT:		dstPath += L"-my.docx"; break;
-	
-	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS:
-	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT:	dstPath += L"-my.xlsx"; break;
-	
-	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP:
-	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT:	dstPath += L"-my.pptx"; break;
-
-	default:
-		return S_FALSE;
-	}
-//---------------------------------------------------------------------------------------------------
-	COfficeUtils oCOfficeUtils(NULL);
+//////////////////////////////////////////////////////////////////////////
+	std::wstring srcFileName	= argv[1];
+	std::wstring dstPath		= argc > 2 ? argv[2] : srcFileName + L"-my.docx"; //xlsx pptx docx
 	
 	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
-	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
-	std::wstring srcTempPath;
-
-	if (fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT		||
-		fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS	||
-		fileChecker.nFileType == AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)
-	{		
-		srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
-
-		if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
-			return S_FALSE;
-	}
-	else // flat
-	{
-		srcTempPath = srcFileName;
-	}
-    _CP_LOG << L"[info] " << srcFileName << std::endl;
 	
+	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+
+    // распаковываем исходник во временную директорию
+	COfficeUtils oCOfficeUtils(NULL);
+    if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
+		return S_FALSE;
+
 	hr = ConvertOO2OOX(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
 
-	if (srcTempPath != srcFileName)
-	{
-		NSDirectory::DeleteDirectory(srcTempPath);
-	}
+	NSDirectory::DeleteDirectory(srcTempPath);
 
 	if (hr != S_OK)  return hr;
    
@@ -104,35 +77,6 @@ HRESULT convert_single(std::wstring srcFileName)
 	
 	NSDirectory::DeleteDirectory(dstTempPath);
 
-	return hr;
+////////////////////////////////////////////////////////////////////////
+	return 0;
 }
-
-HRESULT convert_directory(std::wstring pathName)
-{
-	HRESULT hr = S_OK;
-
-	std::vector<std::wstring> arFiles = NSDirectory::GetFiles(pathName, false);
-
-	for (size_t i = 0; i < arFiles.size(); i++)
-	{
-		convert_single(arFiles[i]);
-	}
-	return S_OK;
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	if (argc < 2) return 1;
-
-	HRESULT hr = -1;
-	if (NSFile::CFileBinary::Exists(argv[1]))
-	{	
-		hr = convert_single(argv[1]);
-	}
-	else if (NSDirectory::Exists(argv[1]))
-	{
-		hr = convert_directory(argv[1]);
-	}
-
-	return hr;
-}

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -336,14 +336,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\..\Common\OfficeFileFormatChecker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
 				>

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -389,37 +389,29 @@ namespace formulasconvert {
 	}
 
 
-	//std::wstring forbidden_formulas[] =
-	//{
-	//	L"NULLFORMULA"	
-	//	//L"BETADIST",
-	//	//L"CEILING",
-	//	//L"FLOOR",
-	//	//L"RANK",
-	//	//L"ROUND",
-	//	//L"ROUNDDOWN",
-	//	//L"ROUNDUP",
-	//	//L"SUBTOTAL",
-	//	//L"FORMULA",
-	//	//L"ISREF"
-	//};
-
-	std::wstring is_forbidden(const std::wstring & formula)
+	std::wstring forbidden_formulas[] =
 	{
-		std::wstring result = formula;
-		std::map<std::wstring, std::wstring> forbidden_formulas;
+		L"NULLFORMULA"		
+		//L"BETADIST",
+		//L"CEILING",
+		//L"FLOOR",
+		//L"RANK",
+		//L"ROUND",
+		//L"ROUNDDOWN",
+		//L"ROUNDUP",
+		//L"SUBTOTAL",
+		//L"FORMULA",
+		//L"ISREF"
+	};
 
-		forbidden_formulas.insert(std::make_pair(L"FORMULA", L"_xlfn.FORMULATEXT"));
-		
-		for (std::map<std::wstring, std::wstring>::iterator it = forbidden_formulas.begin(); it != forbidden_formulas.end(); it++)
+	bool is_forbidden(const std::wstring & formula)
+	{
+		for (size_t i = 0; i < 1/*forbidden_formulas.size()*/; i++)
 		{
-			if (boost::algorithm::contains(formula, it->first))
-			{
-
-				XmlUtils::replace_all(result, it->first, it->second);
-			}
+			if (boost::algorithm::contains(formula, forbidden_formulas[i]))
+				return true;
 		}
-		return result;
+		return false;
 	}
 
 	// заменить вертикальную черту во всех вхождениях в фигурных скобках, но не внутри строк
@@ -445,7 +437,10 @@ namespace formulasconvert {
 
 	std::wstring odf2oox_converter::Impl::convert(const std::wstring& expr)
 	{
-		std::wstring workstr = is_forbidden(expr);
+		if (is_forbidden(expr))
+			return L"NULLFORMULA()";
+		
+		std::wstring workstr = expr;
 		//boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// Better_Donut.ods- cell(c27)
 		//std::wstring workstr = boost::regex_replace(
 		//	expr,
@@ -522,8 +517,10 @@ namespace formulasconvert {
 
 	std::wstring odf2oox_converter::Impl::convert_chart_distance(const std::wstring& expr)
 	{
-		std::wstring workstr = is_forbidden(expr);
+		if (is_forbidden(expr))
+			return L"NULLFORMULA()";
 
+		std::wstring workstr = expr;
 		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
 
 		workstr = boost::regex_replace(

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

@@ -35,15 +35,11 @@
 #include "../CPSharedPtr.h"
 #include "../CPScopedPtr.h"
 
+
 struct ProgressCallback;
 
 namespace cpdoccore { 
 
-namespace xml
-{
-    class sax;
-}
-
 namespace oox {
 	class docx_conversion_context;
 	class xlsx_conversion_context;
@@ -58,10 +54,9 @@ class odf_document
 {
 public:
     odf_document(const std::wstring & Folder, const ProgressCallback* CallBack);
-	odf_document(xml::sax * Reader);
-	
-	~odf_document();
+    ~odf_document();
 
+public:
     odf_read_context & odf_context();
     
 	bool docx_convert(oox::docx_conversion_context & Context);
@@ -82,7 +77,6 @@ private:
     _CP_SCOPED_PTR(Impl) impl_;
             
 };
-typedef shared_ptr<odf_document>::Type odf_document_ptr;
 
 }
 }

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -217,7 +217,6 @@ SOURCES += \
     ../src/odf/datatypes/tableorientation.cpp \
     ../src/odf/datatypes/tablefunction.cpp \
     ../src/odf/datatypes/tableorder.cpp \
-    ../src/odf/datatypes/dategroup.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -126,4 +126,3 @@
 #include "../src/odf/datatypes/tableorientation.cpp"
 #include "../src/odf/datatypes/tablefunction.cpp"
 #include "../src/odf/datatypes/tableorder.cpp"
-#include "../src/odf/datatypes/dategroup.cpp"

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -97,6 +97,14 @@ HRESULT ConvertOO2OOX(const std::wstring & srcPath, const std::wstring & dstPath
 
 		if (encrypted) return AVS_ERROR_DRM;
 
+		//if (type<1)
+		//{
+		//	if (ext == L".odt")type = 1;
+		//	if (ext == L".ods")type = 2;
+		//	if (ext == L".odp")type = 3;
+
+		//}
+
 		if (bOnlyPresentation && type != 3)return AVS_ERROR_UNEXPECTED;
 
 		switch (type)

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -96,7 +96,7 @@ void text_tracked_context::start_change (std::wstring id)
 {
 	current_state_.clear();
 
-	current_state_.id = id;
+	current_state_.id	= id;
 }
 void text_tracked_context::end_change ()
 {
@@ -378,8 +378,7 @@ void docx_conversion_context::start_document()
 	output_stream() << L"xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" "; 
 	output_stream() << L"xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" "; 
 	output_stream() << L"xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" "; 
-	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" ";
-	output_stream() << L"xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" ";
+	output_stream() << L"xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" "; 
 	output_stream() << L"mc:Ignorable=\"w14 wp14\">";
 
 
@@ -407,12 +406,14 @@ void docx_conversion_context::end_document()
    
 	output_document_->get_word_files().set_notes(notes_context_);
 ////////////////////////	
-	for (size_t i = 0; i < charts_.size(); i++)
+	int count = 0;
+    BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
     {
+		count++;
 		package::chart_content_ptr content = package::chart_content::create();
 
-		charts_[i]->serialize(content->content());
-		charts_[i]->dump_rels(content->get_rel_file()->get_rels());
+		chart->serialize(content->content());
+		chart->dump_rels(content->get_rel_file()->get_rels());
 
 		output_document_->get_word_files().add_charts(content);
 	
@@ -579,10 +580,10 @@ mc:Ignorable=\"w14 wp14\">";
         strm << L"</w:abstractNum>";
     }
 
-	for (size_t i = 0; i < numIds.size(); i++)
+    BOOST_FOREACH(int numId, numIds)
     {
-        strm << L"<w:num w:numId=\"" << numIds[i] << L"\" >";
-        strm << L"<w:abstractNumId w:val=\"" << numIds[i] << "\" />";
+        strm << L"<w:num w:numId=\"" << numId << L"\" >";
+        strm << L"<w:abstractNumId w:val=\"" << numId << "\" />";
         strm << L"</w:num>";    
     }
 
@@ -1285,8 +1286,7 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 										L" w:author=\""	+ state.author	+ L"\"" ;
 
 		finish_run();
-		state.active		= true;
-		state.in_drawing	= get_drawing_state_content();
+		state.active = true;
 		
 		if (state.type	== 1)
 		{
@@ -1420,9 +1420,6 @@ void docx_conversion_context::end_changes()
 		if (state.type	== 0)	continue; //unknown change ... libra format change skip
 		if (state.type	== 3)	continue;
 		if (!state.active)		continue;
-		
-		if (state.in_drawing != get_drawing_state_content())
-			continue;
 
 		if (state.type	== 1)	output_stream() << L"</w:ins>";
 		if (state.type	== 2)	output_stream() << L"</w:del>";

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -492,11 +492,10 @@ public:
 		std::wstring				id;
 		std::wstring				author;
 		std::wstring				date;
-		int							type = 0;
+		int							type;
 		std::wstring				style_name;
 		std::vector<std::wstring>	content;	//delete elements		
-		bool						active = false;
-		bool						in_drawing = false;
+		bool						active;
 	
 		void clear()
 		{
@@ -506,7 +505,6 @@ public:
 			date.clear();
 			content.clear();
 			active = false;
-			in_drawing = false;
 		}
 	};
 	std::wstring dumpPPr_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -392,11 +392,8 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 				{
 					CP_XML_NODE(L"wp:extent")
 					{
-						if (val.cx > 0 || val.cy > 0)
-						{
-							CP_XML_ATTR(L"cx", val.cx);
-							CP_XML_ATTR(L"cy", val.cy);
-						}
+						CP_XML_ATTR(L"cx", val.cx);
+						CP_XML_ATTR(L"cy", val.cy);
 
 						serialize_null_extent(CP_XML_STREAM());
 					}
@@ -466,13 +463,10 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 							}
 						}
 					}
-					if (val.cx > 0 || val.cy > 0)
+					CP_XML_NODE(L"wp:extent")
 					{
-						CP_XML_NODE(L"wp:extent")
-						{
-							CP_XML_ATTR(L"cx", val.cx); 
-							CP_XML_ATTR(L"cy", val.cy);
-						}
+						CP_XML_ATTR(L"cx", val.cx); 
+						CP_XML_ATTR(L"cy", val.cy);
 					}
 
 					serialize_wrap(CP_XML_STREAM(), val);

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -319,7 +319,6 @@ namespace
 								xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
 								xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
 								xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
-								xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
 								xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" >";
 
 							//mc:Ignorable=\"w14 wp14\" 

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -181,11 +181,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 		sub_path = L"embeddings/";
 	}
 	else 
-	{
 		isMediaInternal = is_internal(href, odf_packet_);
-		if (href.empty() && type == typeImage)
-			return L"";
-	}
 	
 	int number=0;
 	
@@ -209,9 +205,9 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	if ( type == typeChart) outputPath = outputPath + L".xml";
 
 	std::wstring id;
-    for (size_t i = 0 ; i < items_.size(); i++)
+    for (int i = 0 ; i < items_.size(); i++)
     {
-		if ((items_[i].href == inputPath && !inputPath.empty()) || (items_[i].type == type && inputPath.empty()))
+		if (items_[i].href == inputPath)
 		{
 			id			= items_[i].Id;
 			outputPath  = items_[i].outputName;

ASCOfficeOdfFile/src/docx/mediaitems.h

@@ -127,7 +127,6 @@ public:
 		if (sExt == L"m4v") return typeVideo;
 		if (sExt == L"mp4") return typeVideo;
 		if (sExt == L"mov") return typeVideo;
-		if (sExt == L"mkv") return typeVideo;
 
 		return typeMedia;
 	}

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -118,23 +118,6 @@ void oox_chart_context::serialize(std::wostream & strm)
 			{
 				CP_XML_ATTR(L"val",L"en-US");
 			}
-
-			if (pivot_source_.empty() == false)
-			{
-				set_cache_only(true);
-
-				CP_XML_NODE(L"c:pivotSource")
-				{
-				  CP_XML_NODE(L"c:name")
-				  {
-					  CP_XML_STREAM() << pivot_source_;
-				  }
-				  CP_XML_NODE(L"c:fmtId")
-				  {
-					  CP_XML_ATTR(L"val", 0);
-				  }
-				}
-			}
 			CP_XML_NODE(L"c:chart")
 			{
 				if (plot_area_.current_chart_->is3D_)
@@ -165,42 +148,10 @@ void oox_chart_context::serialize(std::wostream & strm)
 			shape.set(graphic_properties_, fill_);
 			shape.oox_serialize(CP_XML_STREAM());
 	
-			if (pivot_source_.empty() == false)
-			{
-				CP_XML_NODE(L"c:extLst")
-				{
-					CP_XML_NODE(L"c:ext")
-					{
-						CP_XML_ATTR(L"uri", L"{781A3756-C4B2-4CAC-9D66-4F8BD8637D16}");
-						CP_XML_ATTR(L"xmlns:c14", L"http://schemas.microsoft.com/office/drawing/2007/8/2/chart");
-						CP_XML_NODE(L"c14:pivotOptions")
-						{
-							CP_XML_NODE(L"c14:dropZoneFilter")
-							{
-								CP_XML_ATTR(L"val", 1);
-							}		
-							CP_XML_NODE(L"c14:dropZoneCategories")
-							{
-								CP_XML_ATTR(L"val", 1);
-							}
-							CP_XML_NODE(L"c14:dropZoneData")
-							{
-								CP_XML_ATTR(L"val", 1);
-							}
-							CP_XML_NODE(L"c14:dropZoneSeries")
-							{
-								CP_XML_ATTR(L"val", 1);
-							}
-							CP_XML_NODE(L"c14:dropZonesVisible")
-							{
-								CP_XML_ATTR(L"val", 1);
-							}
-						}
-					}
-				}
-			}
+
 		}
 	}
+
 }
 
 oox_chart_context::~oox_chart_context()
@@ -209,7 +160,7 @@ oox_chart_context::~oox_chart_context()
 
 void oox_chart_context::set_cache_only	(bool val)
 {
-	for (size_t i = 0 ; i < plot_area_.charts_.size(); i++)
+	for (int i = 0 ; i < plot_area_.charts_.size(); i++)
 	{
 		plot_area_.charts_[i]->set_cache_only(val);
 	}

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -63,10 +63,6 @@ public:
 	void serialize(std::wostream & strm);
 	void dump_rels(rels & Rels);
 	
-	void set_pivot_chart(const std::wstring &source)
-	{
-		pivot_source_ = source;
-	}
 	void set_title(odf_reader::chart::title & t)
 	{
 		title_.set_content(t);
@@ -134,8 +130,6 @@ private:
 	cpdoccore::oox::oox_plot_area		plot_area_;
 	cpdoccore::oox::oox_chart_legend	legend_;
 
-	std::wstring						pivot_source_;
-
 	std::vector<odf_reader::_property>	graphic_properties_;
 	_oox_fill							fill_;
 };

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -37,8 +37,6 @@
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 
-#include "xlsx_utils.h"
-
 #include "oox_chart_series.h"
 #include "../formulasconvert/formulasconvert.h"
 
@@ -57,7 +55,6 @@ oox_chart_series::oox_chart_series()
 
 	iSymbolMarkerType_	= 0;
 	bLocalTable_		= false;
-	labelPosEnabled_	= true;
 }
 void oox_chart_series::setName(std::wstring &value)
 {
@@ -70,7 +67,8 @@ void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & f
 
 	if (ind == 0)
 	{
-		if (std::wstring::npos != value.find(L"local-table")) return;
+		long res = value.find(L"local-table");
+		if (res >=0) return;
 		
 		values_[ind].strRef_.formula	= converter.convert_chart_distance(value);
 		values_[ind].strRef_.present	= true;
@@ -78,8 +76,8 @@ void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & f
 	}
 	else
 	{
-		if (std::wstring::npos != value.find(L"local-table") && !bLocalTable_ ) return; 
-			//в xlsx низя .... нужно сделать тогда отдельную  table.xml
+		long res = value.find(L"local-table");
+		if (res >=0 && !bLocalTable_ ) return; //в xlsx низя .... нужно сделать тогда отдельную  table.xml
 
 		values_[ind].numRef_.formula		= converter.convert_chart_distance(value);
 		values_[ind].numRef_.present		= true;
@@ -135,7 +133,7 @@ void oox_chart_series::parse_properties()
 		if (*intVal == 2)	data_labels_->set_showPercent(true); 		
 	}
 	odf_reader::GetProperty(content_.properties_, L"label-position", intVal);
-	if (intVal && labelPosEnabled_)
+	if (intVal)
 	{
 		if (!data_labels_)	data_labels_ = oox_data_labels();
 		
@@ -220,24 +218,12 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		shape.set(content_.graphic_properties_, content_.fill_);
 		shape.oox_serialize(_Wostream);
 
-		for (int i = 0; i < 5; i++)
+		for (int i=0; i < 5; i++)
 		{
 			if (values_[i].present)
 			{
-				if (bLocalTable_)
-				{
-					if (values_[i].numRef_.present && values_[i].numRef_.num_cache_count == 0)
-					{
-						continue;
-					}
-					if (values_[i].strRef_.present && values_[i].strRef_.str_cache_count == 0 )
-					{
-						continue;
-					}
-				}			
 				CP_XML_NODE(values_[i].type)
 				{
-
 					if (values_[i].numRef_.present && !bLocalTable_)
 					{
 						CP_XML_NODE(L"c:numRef")
@@ -272,11 +258,8 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 											CP_XML_ATTR(L"idx", j);
 											double val = 0;
 
-											if (oox::IsNumber(v))
-											{		
-												try { val = boost::lexical_cast<double>(v);}
-												catch(...){}	
-											}
+											try { val = boost::lexical_cast<double>(v);}
+											catch(...){}			
 											CP_XML_NODE(L"c:v")
 											{
 												CP_XML_CONTENT(val);
@@ -310,11 +293,8 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 									CP_XML_ATTR(L"idx", j);
 									double val = 0;
 
-									if (oox::IsNumber(v))
-									{			
-										try { val = boost::lexical_cast<double>(v);}
-										catch(...){}
-									}
+									try { val = boost::lexical_cast<double>(v);}
+									catch(...){}			
 									CP_XML_NODE(L"c:v")
 									{
 										CP_XML_CONTENT(val);

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -55,7 +55,6 @@ public:
 	
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
-	bool						labelPosEnabled_;
 	_oox_chart_values			values_[5]; //cat(labels), common, x, y, bubble, 
 	int							id_;
 	std::wstring				name_;	//tx (Series Text) §21.2.2.215

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -117,15 +117,15 @@ void oox_data_labels::oox_serialize(std::wostream & _Wostream)
 					case 1: CP_XML_ATTR(L"val", L"b");		break;
 					case 2: CP_XML_ATTR(L"val", L"b");		break;
 					case 3: CP_XML_ATTR(L"val", L"b");		break;
+					case 4: CP_XML_ATTR(L"val", L"ctr");	break;
+					case 5: CP_XML_ATTR(L"val", L"inEnd");	break;
 					case 6: CP_XML_ATTR(L"val", L"l");		break;
 					case 7: CP_XML_ATTR(L"val", L"inBase");	break;
+					case 8: CP_XML_ATTR(L"val", L"outEnd");	break;
 					case 9: CP_XML_ATTR(L"val", L"r");		break;
 					case 10: CP_XML_ATTR(L"val", L"t");		break;
 					case 11: CP_XML_ATTR(L"val", L"t");		break;
 					case 12: CP_XML_ATTR(L"val", L"t");		break;
-					case 5: //CP_XML_ATTR(L"val", L"inEnd");	break;
-					case 8: //CP_XML_ATTR(L"val", L"outEnd");	break;
-					case 4: CP_XML_ATTR(L"val", L"ctr");	break;
 
 					}
 				}

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -171,7 +171,7 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 					if ( color.empty() )
 					{
 						if (always_draw)	color = L"000000";
-						else				color = L"FFFFFF";
+						else				color = L"ffffff";
 					}
 					
 					CP_XML_NODE(L"a:srgbClr")
@@ -210,15 +210,16 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 		}
     }
 }
-void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop, const std::wstring & shapeGeomPreset)
+void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
 {
 	CP_XML_WRITER(strm)
     {
 		CP_XML_NODE(L"a:avLst")
 		{
+			_CP_OPT(bool) bModifiers;
 			_CP_OPT(std::wstring) strModifiers;
+			odf_reader::GetProperty(prop, L"bModifiers",		bModifiers);
 			odf_reader::GetProperty(prop, L"oox-draw-modifiers", strModifiers);
-			
 			if (strModifiers)
 			{
 				std::vector< std::wstring > values;
@@ -226,61 +227,17 @@ void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_pro
 
 				if (!values.empty() && values.back().empty()) values.pop_back();
 
-				std::vector<std::wstring> names;
-			
-				if (std::wstring::npos != shapeGeomPreset.find(L"math") ||
-					std::wstring::npos != shapeGeomPreset.find(L"bentConnector") || 
-					std::wstring::npos != shapeGeomPreset.find(L"curvedConnector")|| 
-					std::wstring::npos != shapeGeomPreset.find(L"frame"))
-				{
-					names.push_back(L"adj1");
-				}
-				else if (std::wstring::npos != shapeGeomPreset.find(L"decagon"))
-				{
-					names.push_back(L"vf");
-				}
-				else if (std::wstring::npos != shapeGeomPreset.find(L"heptagon") ||
-						 std::wstring::npos != shapeGeomPreset.find(L"pentagon"))
-				{
-					names.push_back(L"hf");
-					names.push_back(L"vf");
-				}
-				else if (std::wstring::npos != shapeGeomPreset.find(L"hexagon"))
-				{
-					names.push_back(L"adj");
-					names.push_back(L"vf");
-				}
-				else if (std::wstring::npos != shapeGeomPreset.find(L"star5")|| 
-						 std::wstring::npos != shapeGeomPreset.find(L"star7"))
-				{
-					names.push_back(L"adj");
-					names.push_back(L"hf");
-					names.push_back(L"vf");
-				}
-				else if (std::wstring::npos != shapeGeomPreset.find(L"star6") ||
-						 std::wstring::npos != shapeGeomPreset.find(L"star10"))
-				{
-					names.push_back(L"adj");
-					names.push_back(L"hf");
-				}
-
 				for (size_t i = 0; i < values.size(); i++)
 				{
 					if (values[i].empty()) continue;
-					
 					CP_XML_NODE(L"a:gd")
 					{
-						if (names.size() > i)
-						{
-							CP_XML_ATTR(L"name", names[i]);
-						}
+						if (values.size() > 1 || bModifiers)
+							//весьма странное .. для некоторых модификаторов (напр math...) нужно указывать множественность их
+							CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i+1));
 						else
-						{
-							if (values.size() > 1)
-								CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i + 1));
-							else
-								CP_XML_ATTR(L"name", L"adj");
-						}						
+							CP_XML_ATTR(L"name", L"adj");
+						
 						CP_XML_ATTR(L"fmla", L"val " + values[i]);
 					}
 				}
@@ -306,8 +263,8 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 			odf_reader::GetProperty(prop,L"text-padding-bottom"	, dPaddingBottom);
 			
 			if (dPaddingLeft)	CP_XML_ATTR(L"lIns", (int)(*dPaddingLeft));
-			if (dPaddingTop)	CP_XML_ATTR(L"tIns", (int)(*dPaddingTop));
 			if (dPaddingRight)	CP_XML_ATTR(L"rIns", (int)(*dPaddingRight));
+			if (dPaddingTop)	CP_XML_ATTR(L"tIns", (int)(*dPaddingTop));
 			if (dPaddingBottom)	CP_XML_ATTR(L"bIns", (int)(*dPaddingBottom));
 
 			if (inGroup == false)
@@ -364,8 +321,7 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 					CP_XML_NODE(L"a:prstTxWarp")
 					{
 						CP_XML_ATTR(L"prst", shapeType);
-						
-						oox_serialize_aLst(CP_XML_STREAM(), prop, shapeType);
+						oox_serialize_aLst(CP_XML_STREAM(), prop);
 					}
 				}
 			}
@@ -414,8 +370,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 		{
 			CP_XML_NODE(L"a:custGeom")
 			{        
-				std::vector<std::wstring> names;
-				oox_serialize_aLst(CP_XML_STREAM(), additional, L"");
+				oox_serialize_aLst(CP_XML_STREAM(), additional);
 				
 				CP_XML_NODE(L"a:ahLst");
 				CP_XML_NODE(L"a:gdLst");
@@ -436,14 +391,8 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 				{ 	
 					CP_XML_NODE(L"a:path")
 					{
-						int path_w = w ? *w : cx;
-						int path_h = h ? *h : cy;
-
-						if (path_w < 1) path_w = 1024;  
-						if (path_h < 1) path_h = 1024; 
-
-						CP_XML_ATTR(L"w", path_w);
-						CP_XML_ATTR(L"h", path_h);
+						CP_XML_ATTR(L"w", w ? *w : cx);
+						CP_XML_ATTR(L"h", h ? *h : cy);
 						
 						if (sCustomPath)
 						{	
@@ -465,7 +414,11 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 				CP_XML_ATTR(L"prst", shapeGeomPreset);
 				if (!bWordArt) 
 				{
-					oox_serialize_aLst(CP_XML_STREAM(), additional, shapeGeomPreset);
+					if (std::wstring::npos != shapeGeomPreset.find(L"mathPlus"))
+					{
+						additional.push_back(odf_reader::_property(L"bModifiers", true));
+					}
+					oox_serialize_aLst(CP_XML_STREAM(), additional);
 				}
 			}					
 		}
@@ -555,13 +508,10 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam
 					CP_XML_ATTR(L"x", 0);
 					CP_XML_ATTR(L"y", 0);
 				}
-				if (cx > 0 || cy > 0)
+				CP_XML_NODE(L"a:chExt")
 				{
-					CP_XML_NODE(L"a:chExt")
-					{
-						CP_XML_ATTR(L"cx", cx);
-						CP_XML_ATTR(L"cy", cy);
-					}
+					CP_XML_ATTR(L"cx", cx);
+					CP_XML_ATTR(L"cy", cy);
 				}
 			}
 		}
@@ -575,6 +525,9 @@ void oox_serialize_action(std::wostream & strm, _action_desc const & val)
     {
 		CP_XML_NODE(L"a:hlinkClick")
 		{
+			//CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+			//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
+
 			if (!val.action.empty())
 				CP_XML_ATTR(L"action", val.action);
 			
@@ -591,8 +544,6 @@ void oox_serialize_action(std::wostream & strm, _action_desc const & val)
 					CP_XML_ATTR(L"name", L"sound");
 				}
 			}
-			//CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-			//CP_XML_ATTR(L"xmlns:a", L"http://schemas.openxmlformats.org/drawingml/2006/main");
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -83,7 +83,7 @@ namespace oox {
 	class _oox_drawing
     {
 	public:
-        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), inGroup(false), name(L"object"), extExternal(false)
+        _oox_drawing() : type(typeUnknown), id(0), x(0), y(0), cx(0), cy(0), sub_type(0), inGroup(false), name(L"object")
         {
         }
         RelsType		type;
@@ -103,7 +103,6 @@ namespace oox {
 		std::wstring	objectProgId; 
 
 		std::wstring	extId;
-		bool			extExternal;
 
 		_action_desc				action;
 		std::vector<_hlink_desc>	hlinks;
@@ -119,7 +118,7 @@ namespace oox {
 	typedef _CP_PTR(_oox_drawing) oox_drawing_ptr;
 
 	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false);
-	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val, const std::wstring & shapeGeomPreset);
+	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val);
     void oox_serialize_action	(std::wostream & strm, const _action_desc & val);
     
 }

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -37,7 +37,7 @@
 namespace cpdoccore {
 namespace oox {
 
-	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false), bTile(false), isInternal(true)
+	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false),bTile(false),isInternal(true)
 	{
 		memset(cropRect,0,sizeof(double)*4);
 	}
@@ -186,10 +186,10 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 			{
 				CP_XML_NODE(L"a:srcRect")
 				{
-					CP_XML_ATTR(L"l", static_cast<int>(val.bitmap->cropRect[0]*1000));
-					CP_XML_ATTR(L"t", static_cast<int>(val.bitmap->cropRect[1]*1000));
-					CP_XML_ATTR(L"r", static_cast<int>(val.bitmap->cropRect[2]*1000));
-					CP_XML_ATTR(L"b", static_cast<int>(val.bitmap->cropRect[3]*1000));
+					CP_XML_ATTR(L"l", static_cast<size_t>(val.bitmap->cropRect[0]*1000));
+					CP_XML_ATTR(L"t", static_cast<size_t>(val.bitmap->cropRect[1]*1000));
+					CP_XML_ATTR(L"r", static_cast<size_t>(val.bitmap->cropRect[2]*1000));
+					CP_XML_ATTR(L"b", static_cast<size_t>(val.bitmap->cropRect[3]*1000));
 				}
 			}
 			if (val.bitmap->bTile)

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -147,6 +147,6 @@ namespace oox {
     void oox_serialize_fill			(std::wostream & strm, const _oox_fill & val);
     void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(double)  opacity);
     void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(odf_types::percent)  opacity);
-	void oox_serialize_bitmap_fill	(std::wostream & strm, const _oox_fill & val);
+
 }
 }

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -70,19 +70,17 @@ static std::wstring get_mime_type(const std::wstring & extension)
    	else if (L"tif" == extension)	return  L"image/x-tiff";
  	else if (L"tiff" == extension)	return  L"image/x-tiff";
 	else if (L"pdf" == extension)	return  L"application/pdf";
-	else if (L"bmp" == extension)	return  L"image/bmp";
 
 	else if (L"wav" == extension)	return  L"audio/wav";
 	else if (L"mp3" == extension)	return  L"audio/mpeg";
 	else if (L"wma" == extension)	return  L"audio/x-ms-wma";
 	else if (L"m4a" == extension)	return  L"audio/unknown";
 
-	else if (L"avi" == extension)	return  L"video/x-msvideo";
+	else if (L"avi" == extension)	return  L"video/avi";
 	else if (L"wmv" == extension)	return  L"video/x-ms-wmv";
 	else if (L"mov" == extension)	return  L"video/unknown";
 	else if (L"mp4" == extension)	return  L"video/unknown";
 	else if (L"m4v" == extension)	return  L"video/unknown";
-	else if (L"mkv" == extension)	return  L"video/unknown";
 
 	else if (L"bin" == extension)	return  L"application/vnd.openxmlformats-officedocument.oleObject";
 	else if (L"xlsx" == extension)	return  L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -102,10 +102,6 @@ void oox_chart::oox_serialize_common(std::wostream & _Wostream)
 		}
 		for (size_t i = 0; i < series_.size(); i++)
 		{
-			if (is3D_ || type_ == CHART_TYPE_AREA || type_ == CHART_TYPE_DOUGHNUT || type_ == CHART_TYPE_RADAR)
-			{
-				series_[i]->labelPosEnabled_ = false;
-			}
 			series_[i]->oox_serialize(_Wostream);
 		}
 		for (size_t i = 0; i < axisId_.size(); i++)
@@ -473,7 +469,7 @@ void oox_stock_chart::oox_serialize(std::wostream & _Wostream)
 			//{
 			//	//shape.oox_serialize(CP_XML_STREAM());
 			//}
-			CP_XML_NODE(L"c:upDownBars")
+			CP_XML_NODE(L"upDownBars")
 			{
 				CP_XML_NODE(L"c:gapWidth")
 				{

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -150,30 +150,15 @@ void pptx_serialize_media(std::wostream & strm, _pptx_drawing & val)
 							CP_XML_NODE(L"p14:media")
 							{	
 								CP_XML_ATTR(L"xmlns:p14", L"http://schemas.microsoft.com/office/powerpoint/2010/main");
-								if (val.extExternal)
-								{
-									CP_XML_ATTR(L"r:link",	val.extId);
-								}
-								else
-								{
-									CP_XML_ATTR(L"r:embed",	val.extId);
-								}
+								CP_XML_ATTR(L"r:embed",	val.extId);
 							}
 						}
 					}
 				}
             } 
 			if (val.fill.bitmap)
-			{
 				val.fill.bitmap->name_space = L"p";
-				oox_serialize_bitmap_fill(strm, val.fill);
-				
-				val.fill.bitmap.reset();
-			}
-			else
-			{
-				 CP_XML_NODE(L"p:blipFill");
-			}
+			oox_serialize_fill(CP_XML_STREAM(), val.fill);
 
             CP_XML_NODE(L"p:spPr")
             {
@@ -184,8 +169,7 @@ void pptx_serialize_media(std::wostream & strm, _pptx_drawing & val)
                     CP_XML_ATTR(L"prst", L"rect");
                     CP_XML_NODE(L"a:avLst");
                 }
-				oox_serialize_fill	(CP_XML_STREAM(), val.fill);
-				oox_serialize_ln	(CP_XML_STREAM(), val.additional);
+				oox_serialize_ln(CP_XML_STREAM(), val.additional);
             } 			
 			//_CP_OPT(std::wstring) strTextContent;
 			//odf::GetProperty(properties,L"text-content",strTextContent);

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -472,13 +472,6 @@ void pptx_slide_context::set_media_param(std::wstring name, std::wstring value)
 
 void pptx_slide_context::set_image(const std::wstring & path)
 {
-	int pos_replaicement = path.find(L"ObjectReplacements"); 
-	if (pos_replaicement >= 0)
-	{
-		if (path.length() - (pos_replaicement + 18) < 2)
-			return; //object without image
-	}
-
 	if (impl_->object_description_.type_ == typeUnknown)
 	{
 		impl_->object_description_.type_		= typeImage;	
@@ -554,9 +547,8 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	std::wstring ref;/// это ссылка на выходной внешний объект
 	bool isMediaInternal = false;
 	
-	drawing.fill.bitmap->rId		= get_mediaitems().add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
-	drawing.fill.bitmap->isInternal	= isMediaInternal;
-
+	drawing.fill.bitmap->rId = get_mediaitems().add_or_find(obj.xlink_href_, typeImage, isMediaInternal, ref);
+	
 	if (drawing.type == typeShape)
 	{
 		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
@@ -648,12 +640,11 @@ void pptx_slide_context::Impl::process_media(drawing_object_description& obj, _p
 
 	drawing.type = mediaitems::detectMediaType(obj.xlink_href_); //reset from Media to Audio, Video, ... QuickTime? AudioCD? ...   
 	
-	drawing.objectId	= get_mediaitems().add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
-	drawing.extId		= L"ext" + drawing.objectId;
-	drawing.extExternal	= !isMediaInternal;
+	drawing.objectId = get_mediaitems().add_or_find(obj.xlink_href_, drawing.type, isMediaInternal, ref);    
+	drawing.extId	 = L"ext" + drawing.objectId;
 	
 	add_drawing(drawing, false, drawing.objectId, L"NULL", drawing.type);
-	add_additional_rels( isMediaInternal, drawing.extId, ref, typeMedia);
+	add_additional_rels( true, drawing.extId, ref, typeMedia);
 
 	if (drawing.fill.bitmap)
 	{

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -332,34 +332,21 @@ void oox_serialize_tcPr(std::wostream & strm, std::vector<const odf_reader::styl
 				}
 				if (style_cell_attlist.common_padding_attlist_.fo_padding_)
 				{
-					double padding = style_cell_attlist.common_padding_attlist_.fo_padding_->get_value_unit(odf_types::length::emu);
-					CP_XML_ATTR(L"marT", (long)padding);
-					CP_XML_ATTR(L"marB", (long)padding);
-					CP_XML_ATTR(L"marL", (long)padding);
-					CP_XML_ATTR(L"marR", (long)padding);
+					CP_XML_ATTR(L"marT", *style_cell_attlist.common_padding_attlist_.fo_padding_);
+					CP_XML_ATTR(L"marB", *style_cell_attlist.common_padding_attlist_.fo_padding_);
+					CP_XML_ATTR(L"marL", *style_cell_attlist.common_padding_attlist_.fo_padding_);
+					CP_XML_ATTR(L"marR", *style_cell_attlist.common_padding_attlist_.fo_padding_);
 				}
 				else
 				{
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_top_)
-					{
-						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_top_->get_value_unit(odf_types::length::emu);
-						CP_XML_ATTR(L"marT", (long)padding);            
-					}
+						CP_XML_ATTR(L"marT", *style_cell_attlist.common_padding_attlist_.fo_padding_top_);            
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_bottom_)
-					{
-						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_bottom_->get_value_unit(odf_types::length::emu);
-						CP_XML_ATTR(L"marB", (long)padding);                        
-					}
+						CP_XML_ATTR(L"marB", *style_cell_attlist.common_padding_attlist_.fo_padding_bottom_);                        
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_left_)
-					{
-						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_left_->get_value_unit(odf_types::length::emu);
-						CP_XML_ATTR(L"marL", (long)padding);
-					}
+						CP_XML_ATTR(L"marL", *style_cell_attlist.common_padding_attlist_.fo_padding_left_);
 					if (style_cell_attlist.common_padding_attlist_.fo_padding_right_)
-					{
-						double padding = style_cell_attlist.common_padding_attlist_.fo_padding_right_->get_value_unit(odf_types::length::emu);
-						CP_XML_ATTR(L"marR", (long)padding);            
-					}
+						CP_XML_ATTR(L"marR", *style_cell_attlist.common_padding_attlist_.fo_padding_right_);            
 				}			
 				//vert //
 				//style_cell_attlist.pptx_serialize(Context, CP_XML_STREAM());    //nodes        

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -299,13 +299,6 @@ void xlsx_drawing_context::set_ms_object(const std::wstring & path, const std::w
 }
 void xlsx_drawing_context::set_image(const std::wstring & path)
 {
-	int pos_replaicement = path.find(L"ObjectReplacements"); 
-	if (pos_replaicement >= 0)
-	{
-		if (path.length() - (pos_replaicement + 18) < 2)
-			return; //object without image
-	}
-
 	if (impl_->object_description_.type_ == typeUnknown)
 	{
 		impl_->object_description_.type_		= typeImage;	

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.h

@@ -49,36 +49,21 @@ public:
 	void start_table();
 	int end_table();
 
-	void start_field ();
-		void set_field_name (std::wstring name);
-		void set_field_type (int type, int hierarchy);
-		void set_field_function (int type);
-		void set_field_user_function (std::wstring f);
-		void add_field_subtotal (int function_type);
-		void add_field_cache (int index, std::wstring value);
-		void set_field_show_empty (bool val);
-		void set_field_data_layout (bool val);		
-		void set_field_sort (int type);
-		void set_field_groups (int type);
-		void set_repeat_item_labels(bool val);
+	void start_field();
+		void set_field_name(std::wstring name);
+		void set_field_type(int type);
+		void set_field_function(int type);
+		void set_field_user_function(std::wstring f);
+		void add_field_subtotal(int function_type);
+		void add_field_cache(int index, std::wstring value);
 	void end_field();
 
 	int get_count();
 
 	void set_view_name(std::wstring name);
 	void set_view_target_range(std::wstring ref);
-	void set_view_target_table_name(std::wstring name);
-
-	void add_button_header(std::wstring ref);
-
-	void set_identify_categories(bool val);
-	void set_drill(bool val);
 
 	void set_source_range(std::wstring table_name, std::wstring ref);
-	
-	void set_source_database(std::wstring database, std::wstring table_name);
-	void set_source_database_query(std::wstring database, std::wstring query);
-	void set_source_database_sql(std::wstring database, std::wstring sql);
 
 	void write_cache_definitions_to	(int index, std::wostream & strm);
 	void write_cache_records_to		(int index, std::wostream & strm);
@@ -89,8 +74,6 @@ public:
 	void dump_rels_cache(int index, rels & Rels);
 	void dump_rels_view	(int index, rels & Rels);
 
-	std::wstring get_chart_source(std::wstring name);
-
 	void add_connections(std::wstring connections);
 	bool is_connections();
 

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -394,7 +394,6 @@ void xlsx_table_state::serialize_table_format (std::wostream & strm)
 		{
 			CP_XML_NODE(L"dimension")
 			{
-				if (current_table_column_ < 0) current_table_column_ = columns_count_;
 				std::wstring ref2 = getCellAddress( current_table_column_, current_table_row_);
 				CP_XML_ATTR(L"ref", L"A1:" + ref2);
 			}
@@ -434,10 +433,10 @@ void xlsx_table_state::serialize_table_format (std::wostream & strm)
 					{
 						CP_XML_NODE(L"selection")
 						{	
-							CP_XML_ATTR(L"activeCell",		getCellAddress(col, row));			
-							CP_XML_ATTR(L"activeCellId",	0);			
-							CP_XML_ATTR(L"pane",			L"topLeft");			
 							CP_XML_ATTR(L"sqref",			getCellAddress(col, row));			
+							CP_XML_ATTR(L"activeCellId",	0);			
+							CP_XML_ATTR(L"activeCell",		getCellAddress(col, row));			
+							CP_XML_ATTR(L"pane",			L"topLeft");			
 						}
 						
 					}

ASCOfficeOdfFile/src/docx/xlsx_utils.cpp

@@ -30,6 +30,7 @@
  *
  */
 
+
 #include "xlsx_utils.h"
 
 #include <boost/lexical_cast.hpp>
@@ -45,14 +46,6 @@ namespace cpdoccore {
 
 namespace oox {
 
-bool IsNumber(const std::wstring &value)
-{
-	boost::wregex rule(L"\\-?^[0-9]*[.,]?[0-9]*$");
-	boost::match_results<std::wstring::const_iterator> results;
-
-	return boost::regex_search(value/*.begin(), value.end(), results*/, rule);
-}
-
 std::wstring getColAddress(size_t col)
 {
     static const size_t r = (L'Z' - L'A' + 1);
@@ -69,6 +62,8 @@ std::wstring getColAddress(size_t col)
         return std::wstring(1, (wchar_t)(L'A' + col));
 }
 
+
+
 std::wstring getRowAddress(size_t row)
 {
     return std::to_wstring(row + 1);

ASCOfficeOdfFile/src/docx/xlsx_utils.h

@@ -40,8 +40,6 @@ namespace cpdoccore {
 
 namespace oox {
 
-bool IsNumber(const std::wstring &value);
-
 std::wstring getColAddress(size_t col);
 std::wstring getRowAddress(size_t row);
 

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -447,18 +447,6 @@ void xlsx_conversion_context::end_table()
 	get_table_context().dump_rels_hyperlinks			(current_sheet().sheet_rels());
 	get_table_context().dump_rels_ole_objects			(current_sheet().sheet_rels());
 
-	typedef std::multimap<std::wstring, int> _mapPivotsTableView;
-	std::pair<_mapPivotsTableView::iterator, _mapPivotsTableView::iterator> range;
-
-	range = mapPivotsTableView_.equal_range(current_sheet().name());
-
-	for (_mapPivotsTableView::iterator it = range.first; it != range.second; ++it)
-	{
-		current_sheet().sheet_rels().add(oox::relationship(L"pvId" + std::to_wstring(it->second),
-			L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable",
-			L"../pivotTables/pivotTable" + std::to_wstring(it->second) + L".xml"));
-	}
-
 	if (!get_drawing_context().empty())
     {
         std::wstringstream strm;
@@ -714,10 +702,6 @@ void xlsx_conversion_context::end_hyperlink(std::wstring const & href)
 		xlsx_text_context_.end_span2();
 	}
 }
-void xlsx_conversion_context::add_pivot_sheet_source (const std::wstring & sheet_name, int index_table_view)
-{//ващето в либре жесткая привязка что на одном листе тока одна сводная может быть ..
-	mapPivotsTableView_.insert(std::make_pair(sheet_name, index_table_view));
-}
 
 void xlsx_conversion_context::start_conditional_format(std::wstring ref)
 {

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -137,8 +137,6 @@ public:
     void end_hyperlink		(std::wstring const & href);
 
 //------------------------------------------------------------------------------------
-	void add_pivot_sheet_source				(const std::wstring & sheet_name, int index_table_view);
-
 	void start_conditional_format			(std::wstring ref);
 	void end_conditional_format				(){}
 
@@ -202,7 +200,6 @@ private:
     num_format_context                  num_format_context_;
     size_t                              default_style_;
     mediaitems                          mediaitems_;
-	std::multimap<std::wstring, int>	mapPivotsTableView_;
   
     xlsx_style_manager              xlsx_style_;
     xlsx_defined_names              xlsx_defined_names_;

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -77,15 +77,6 @@ typedef shared_ptr<const office_element>::Type office_element_ptr_const;
 
 // Класс для конструирования чартов
 using namespace chart;
-	
-void object_odf_context::set_pivot_source(std::wstring const & val)
-{
-	pivot_source_ = val;
-	if (pivot_source_.empty() == false)
-	{
-		bPivotChart_ = true;
-	}
-}
 
 void object_odf_context::set_width(double valPt)
 {
@@ -176,11 +167,6 @@ void object_odf_context::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
 	if (object_type_ == 1) 
 	{
-		if (pivot_source_.empty() == false)
-		{
-			pivot_source_ = Context.get_pivots_context().get_chart_source(pivot_source_);
-
-		}
 		Context.start_chart(L"");
 		oox::oox_chart_context & chart = Context.current_chart();
 		
@@ -280,60 +266,23 @@ void object_odf_context::calc_cache_series(std::wstring adress, std::vector<std:
 {
 	if (adress.empty()) return;
 
-	if (bPivotChart_)
+    formulasconvert::odf2oox_converter converter;
+
+	std::wstring ref_1, ref_2, table;
+	size_t col_1=0, row_1=0, col_2=0, row_2=0;
+   
+	if (!converter.find_first_last_ref(adress, table, ref_1, ref_2))return;
+	//if ((res = table.find(L"local-table"))<0)return;
+
+	oox::getCellAddressInv(ref_1, col_1,row_1);
+	oox::getCellAddressInv(ref_2, col_2,row_2);
+
+ 	for (size_t i = 0; i < cash_values.size(); i++)
 	{
-		std::map<std::wstring, _cell>::iterator pFind = cash_pivot.find(adress);
-		if (pFind != cash_pivot.end())
+		if (cash_values[i].col >= col_1 && cash_values[i].col <= col_2 &&
+			cash_values[i].row >= row_1 && cash_values[i].row <= row_2)
 		{
-			int col = pFind->second.col;
-			int row = pFind->second.row;
- 			
-			if (col == 0 || row == 0)
-			{
-				for (size_t i = 0; i < cash_values.size(); i++)
-				{
-					if (col == 0)
-					{
-						if (cash_values[i].col == col)
-						{
-							cash.push_back(cash_values[i].val);
-						}
-					}
-					if (row == 0)
-					{
-						if (cash_values[i].row == row)
-						{
-							cash.push_back(cash_values[i].val);
-						}
-					}
-				}		
-			}
-			else
-			{
-				cash.push_back(pFind->second.val);
-			}
-		}
-	}
-	else
-	{
-		formulasconvert::odf2oox_converter converter;
-
-		std::wstring ref_1, ref_2, table;
-		size_t col_1 = 0, row_1 = 0, col_2 = 0, row_2 = 0;
-	   
-		if (!converter.find_first_last_ref(adress, table, ref_1, ref_2))return;
-		//if ((res = table.find(L"local-table"))<0)return;
-
-		oox::getCellAddressInv(ref_1, col_1, row_1);
-		oox::getCellAddressInv(ref_2, col_2, row_2);
-
- 		for (size_t i = 0; i < cash_values.size(); i++)
-		{
-			if (cash_values[i].col >= col_1 && cash_values[i].col <= col_2 &&
-				cash_values[i].row >= row_1 && cash_values[i].row <= row_2)
-			{
-				cash.push_back(cash_values[i].val);
-			}
+			cash.push_back(cash_values[i].val);
 		}
 	}
 }
@@ -348,8 +297,6 @@ struct axises_sort
 
 void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 {
-	chart_context.set_pivot_chart	(pivot_source_);
-
 	chart_context.set_title		(title_);
 	chart_context.set_wall		(wall_);
 	chart_context.set_floor		(floor_);
@@ -423,36 +370,30 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		{
 			if (last_set_type == chart_bubble)
 			{	//bubble(x)
-				if (!bPivotChart_)
-					current->set_formula_series(4, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
+				current->set_formula_series(4, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
 				current->set_values_series (4, domain_cash);
 				//y	
-				if (!bPivotChart_)
-					current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));			
+				current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));			
 				current->set_values_series (3, cell_cash);
 			}
 			else
 			{	//x
-				if (!bPivotChart_)
-					current->set_formula_series(2, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
+				current->set_formula_series(2, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
 				current->set_values_series (2, domain_cash);						
 				//y
-				if (!bPivotChart_)
-					current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));				
+				current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));				
 				current->set_values_series (3, cell_cash);								
 			}
 		}
 		else
 		{	//common
-			if (!bPivotChart_)
-				current->set_formula_series(1, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));	
+			current->set_formula_series(1, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));	
 			current->set_values_series(1, cell_cash);
 		}
 
 		if (categories_.empty() == false)//названия
 		{			
-			if (!bPivotChart_)
-				current->set_formula_series(0, categories_[0], L"General", true);
+			current->set_formula_series(0, categories_[0], L"General", true);
 			current->set_values_series(0, cat_cash);
 		}
 		current->set_name(series_[i].name_);
@@ -619,13 +560,7 @@ void process_build_object::on_not_impl(std::string const & message)
     _CP_LOG << L"[process_object visitor] : not impliment for \"" << utf8_to_utf16(message) << L"\"" << std::endl;
 }
 
-//-----------------------------------------------------------------------------------
-void process_build_object::visit(office_document & val)
-{
-   if (val.office_body_)
-        val.office_body_->accept(*this);
-}
-
+//////////////////////////////////////////////////
 void process_build_object::visit(const office_document_content& val)
 {
     if (val.office_body_)
@@ -664,21 +599,18 @@ void process_build_object::visit(const chart_chart& val)
 {
 	object_odf_context_.object_type_ = 1;
 	
-	if (val.attlist_.common_draw_size_attlist_.svg_width_)
+	if (val.chart_chart_attlist_.common_draw_size_attlist_.svg_width_)
     {
-        object_odf_context_.set_width(val.attlist_.common_draw_size_attlist_.svg_width_->get_value_unit(length::pt));
+        object_odf_context_.set_width(val.chart_chart_attlist_.common_draw_size_attlist_.svg_width_->get_value_unit(length::pt));
     }
            
-    if (val.attlist_.common_draw_size_attlist_.svg_height_)
+    if (val.chart_chart_attlist_.common_draw_size_attlist_.svg_height_)
     {
-        object_odf_context_.set_height(val.attlist_.common_draw_size_attlist_.svg_height_->get_value_unit(length::pt));
+        object_odf_context_.set_height(val.chart_chart_attlist_.common_draw_size_attlist_.svg_height_->get_value_unit(length::pt));
     }
-	ApplyGraphicProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.chart_graphic_properties_, object_odf_context_.chart_fill_);
+	ApplyGraphicProperties	(val.chart_chart_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.chart_graphic_properties_, object_odf_context_.chart_fill_);
 
-	object_odf_context_.set_class(val.attlist_.chart_class_);
-
-	if (val.attlist_.loext_data_pilot_source_)
-		object_odf_context_.set_pivot_source(*val.attlist_.loext_data_pilot_source_);
+	object_odf_context_.set_class(val.chart_chart_attlist_.chart_class_);
 
 	ACCEPT_ALL_CONTENT_CONST(val.content_);
 
@@ -694,13 +626,13 @@ void process_build_object::visit(const chart_title& val)
 		val.text_p_->text_to_stream(v);
 		t.content_ = v.str();
 	}
-	ApplyTextProperties(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""), t.text_properties_);
+	ApplyTextProperties(val.chart_title_attlist_.common_attlist_.chart_style_name_.get_value_or(L""), t.text_properties_);
 
 ///////////////////////////////////////////////////////////////////////////////////////
-	if (val.attlist_.common_draw_position_attlist_.svg_x_)
+	if (val.chart_title_attlist_.common_draw_position_attlist_.svg_x_)
     {
-        t.pos_x = val.attlist_.common_draw_position_attlist_.svg_x_->get_value_unit(length::pt);
-		t.pos_y = val.attlist_.common_draw_position_attlist_.svg_y_->get_value_unit(length::pt);
+        t.pos_x = val.chart_title_attlist_.common_draw_position_attlist_.svg_x_->get_value_unit(length::pt);
+		t.pos_y = val.chart_title_attlist_.common_draw_position_attlist_.svg_y_->get_value_unit(length::pt);
 	}
 	t.bEnabled = true;
 	
@@ -718,10 +650,10 @@ void process_build_object::visit(const chart_subtitle & val)
 	val.text_p_->text_to_stream(v);
 	t.content_ = v.str();
 
-	if (val.attlist_.common_draw_position_attlist_.svg_x_)
+	if (val.chart_title_attlist_.common_draw_position_attlist_.svg_x_)
     {
-        t.pos_x = val.attlist_.common_draw_position_attlist_.svg_x_->get_value_unit(length::pt);
-		t.pos_y = val.attlist_.common_draw_position_attlist_.svg_y_->get_value_unit(length::pt);
+        t.pos_x = val.chart_title_attlist_.common_draw_position_attlist_.svg_x_->get_value_unit(length::pt);
+		t.pos_y = val.chart_title_attlist_.common_draw_position_attlist_.svg_y_->get_value_unit(length::pt);
 	}
 	t.bEnabled = true;
 	object_odf_context_.sub_title_ = t;
@@ -740,32 +672,32 @@ void process_build_object::visit(const chart_legend& val)
 {
 	object_odf_context_.legend_.bEnabled = true;
 	
-	ApplyChartProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.properties_);
-	ApplyGraphicProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.graphic_properties_,object_odf_context_.legend_.fill_);
-	ApplyTextProperties		(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.text_properties_);
+	ApplyChartProperties	(val.chart_legend_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.properties_);
+	ApplyGraphicProperties	(val.chart_legend_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.graphic_properties_,object_odf_context_.legend_.fill_);
+	ApplyTextProperties		(val.chart_legend_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.legend_.text_properties_);
 }
 
 void process_build_object::visit(const chart_plot_area& val)
 {
 	ACCEPT_ALL_CONTENT_CONST(val.content_);
 
-	object_odf_context_.plot_area_.cell_range_address_ = val.attlist_.table_cell_range_address_.get_value_or(L"");
+	object_odf_context_.plot_area_.cell_range_address_ = val.chart_plot_area_attlist_.table_cell_range_address_.get_value_or(L"");
 
-	ApplyChartProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.properties_);
-	ApplyGraphicProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.graphic_properties_, object_odf_context_.plot_area_.fill_);
-	ApplyTextProperties		(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.text_properties_);
+	ApplyChartProperties	(val.chart_plot_area_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.properties_);
+	ApplyGraphicProperties	(val.chart_plot_area_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.graphic_properties_, object_odf_context_.plot_area_.fill_);
+	ApplyTextProperties		(val.chart_plot_area_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),object_odf_context_.plot_area_.text_properties_);
 }
 
 
 void process_build_object::visit(const chart_axis& val)
 {
-    object_odf_context_.start_axis(val.attlist_.chart_dimension_.get_value_or(L""),
-							val.attlist_.chart_name_.get_value_or(L""),
-							val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""));
+    object_odf_context_.start_axis(val.chart_axis_attlist_.chart_dimension_.get_value_or(L""),
+							val.chart_axis_attlist_.chart_name_.get_value_or(L""),
+							val.chart_axis_attlist_.common_attlist_.chart_style_name_.get_value_or(L""));
 
     ACCEPT_ALL_CONTENT_CONST(val.content_);
 
-	std::wstring style_name	= val.attlist_.common_attlist_.chart_style_name_.get_value_or(L"");
+	std::wstring style_name	= val.chart_axis_attlist_.common_attlist_.chart_style_name_.get_value_or(L"");
 
 	ApplyChartProperties	(style_name, object_odf_context_.axises_.back().properties_);
 	ApplyGraphicProperties	(style_name, object_odf_context_.axises_.back().graphic_properties_, object_odf_context_.axises_.back().fill_);
@@ -776,7 +708,7 @@ void process_build_object::visit(const chart_axis& val)
 
 void process_build_object::visit(const chart_series& val)
 {
-    const chart_series_attlist & att = val.attlist_;
+    const chart_series_attlist & att = val.chart_series_attlist_;
    
 	chart::class_type chartClass = get_series_class_type(att.chart_class_.get_value_or(object_odf_context_.str_class_));
 
@@ -805,21 +737,21 @@ void process_build_object::visit(const chart_domain& val)
 }
 void process_build_object::visit(const chart_grid& val)
 {
-    object_odf_context_.add_grid(val.attlist_.chart_class_.get_value_or(L""),
-        val.attlist_.common_attlist_.chart_style_name_.get_value_or(L"") );
+    object_odf_context_.add_grid(val.chart_grid_attlist_.chart_class_.get_value_or(L""),
+        val.chart_grid_attlist_.common_attlist_.chart_style_name_.get_value_or(L"") );
 	
 	oox::_oox_fill fill;
 	
-	ApplyGraphicProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	(object_odf_context_.axises_.back()).grids_.back().graphic_properties_, fill);
+	ApplyGraphicProperties	(val.chart_grid_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	(object_odf_context_.axises_.back()).grids_.back().graphic_properties_, fill);
 
  }
 void process_build_object::visit(const chart_wall& val)
 {      
 	object_odf_context_.wall_.bEnabled = true;
 
-	ApplyChartProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.properties_);
-	ApplyGraphicProperties	(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.graphic_properties_,object_odf_context_.wall_.fill_);
-	ApplyTextProperties		(val.attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.text_properties_);
+	ApplyChartProperties	(val.chart_wall_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.properties_);
+	ApplyGraphicProperties	(val.chart_wall_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.graphic_properties_,object_odf_context_.wall_.fill_);
+	ApplyTextProperties		(val.chart_wall_attlist_.common_attlist_.chart_style_name_.get_value_or(L""),	object_odf_context_.wall_.text_properties_);
 } 
 
 void process_build_object::visit(const chart_floor& val)
@@ -833,12 +765,12 @@ void process_build_object::visit(const chart_floor& val)
 
 void process_build_object::visit(const chart_data_point & val)
 {
-	object_odf_context_.add_point(	val.attlist_.chart_repeated_.get_value_or(1));
+	object_odf_context_.add_point(	val.chart_data_point_attlist_.chart_repeated_.get_value_or(1));
 
-	if (val.attlist_.common_attlist_.chart_style_name_)
+	if (val.chart_data_point_attlist_.common_attlist_.chart_style_name_)
 	{
 		object_odf_context_.series_.back().points_.back().bEnabled = true;
-		std::wstring style_name = val.attlist_.common_attlist_.chart_style_name_.get_value_or(L"");
+		std::wstring style_name = val.chart_data_point_attlist_.common_attlist_.chart_style_name_.get_value_or(L"");
 		
 		ApplyGraphicProperties	(style_name,	object_odf_context_.series_.back().points_.back().graphic_properties_, 
 												object_odf_context_.series_.back().points_.back().fill_);
@@ -963,21 +895,12 @@ void process_build_object::visit(const table_table_cell& val)
 
     unsigned int repeated = val.attlist_.table_number_columns_repeated_;
   
-	std::wstring cell_val, cell_cash, cell_desc;
-	
-	for (size_t i = 0 ; i < val.content_.elements_.size(); i++)
-	{
-		std::wstringstream  wstream_temp;	
-		val.content_.elements_[i]->text_to_stream(wstream_temp);
-		if (val.content_.elements_[i]->get_type() == typeTextP)
-		{
-			cell_cash += wstream_temp.str();
-		}
-		else if (val.content_.elements_[i]->get_type() == typeDrawG)
-		{
-			cell_desc += wstream_temp.str();
-		}
-	}   
+	std::wstringstream  wstream_temp;	
+   
+	val.content_.text_to_stream(wstream_temp);
+	std::wstring cell_cash = wstream_temp.str();
+
+	std::wstring cell_val;
 
 	if (attlist.common_value_and_type_attlist_.office_value_) 				cell_val = *attlist.common_value_and_type_attlist_.office_value_;
 	else if (attlist.common_value_and_type_attlist_.office_currency_)		cell_val = *attlist.common_value_and_type_attlist_.office_currency_;
@@ -989,16 +912,11 @@ void process_build_object::visit(const table_table_cell& val)
 	if (cell_cash.empty())
 		cell_cash = cell_val;
 
-	object_odf_context::_cell cell_= {object_odf_context_.current_table_column_, object_odf_context_.current_table_row_, cell_cash};
+	object_odf_context::_cell cell_={object_odf_context_.current_table_column_, object_odf_context_.current_table_row_, cell_cash};
 
 	object_odf_context_.cash_values.push_back(cell_);
 	
 	object_odf_context_.current_table_column_+=repeated;
-
-	if (object_odf_context_.bPivotChart_)
-	{
-		object_odf_context_.cash_pivot.insert(std::make_pair(cell_desc, cell_));
-	}
 }
 void process_build_object::visit(const table_covered_table_cell& val)
 {

ASCOfficeOdfFile/src/odf/chart_build_oox.h

@@ -111,7 +111,6 @@ public:
 		width_pt_				(0), 
 		height_pt_				(0), 
 		in_axis_				(false),
-		bPivotChart_			(false),
         current_table_column_	(0),
         current_table_row_		(0),
         columns_spanned_num_	(0),
@@ -125,8 +124,6 @@ public:
     {
 	}
 	
-	void set_pivot_source(std::wstring const & val);
-
 	void set_width(double valPt);
 
     void set_height(double valPt);
@@ -173,9 +170,6 @@ public:
 	std::wstring				style_name_;
  	std::wstring				name_;
   
-	std::wstring				pivot_source_;
-	bool						bPivotChart_;
-
 	bool in_axis_;
     std::vector<chart::axis>	axises_;
     std::vector<chart::series>	series_;
@@ -201,7 +195,6 @@ public:
 	oox::_oox_fill				chart_fill_;
 
 	std::vector<_cell>			cash_values;
-	std::map<std::wstring, _cell>cash_pivot;
 
 //---------------------------------------
 	std::wstring				target_table_;
@@ -223,8 +216,6 @@ public:
 
 class process_build_object 
 	:	public base_visitor,
-		public visitor<office_document>,
-
 		public const_visitor<office_document_content>,
  		public visitor<office_document_content>,
 	   
@@ -292,8 +283,7 @@ private:
 	virtual void on_not_impl(std::string const & message);
 
 public:
-	virtual void visit(office_document				& val);
-	
+
 	virtual void visit(const office_document_content& val);
 	virtual void visit(office_document_content		& val);
 	

ASCOfficeOdfFile/src/odf/datatypes/color.cpp

@@ -86,8 +86,7 @@ const std::wstring color::get_hex_value() const
     {
         boost::algorithm::trim(tmp);
         boost::algorithm::trim_left_if(tmp, boost::algorithm::is_any_of("#"));     
-
-        return XmlUtils::GetUpper(tmp);
+        return tmp;
     }
     else if (tmp.size() == 6)
     {
@@ -97,7 +96,7 @@ const std::wstring color::get_hex_value() const
             unsigned int t = 0;
             if ((s << tmp) && (s >> std::hex >> t) && (s >> std::ws).eof())
             {
-                return XmlUtils::GetUpper(tmp);
+                return tmp;
             }
         }
         catch(...)

ASCOfficeOdfFile/src/odf/datatypes/dategroup.cpp

@@ -1,94 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * 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 Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * 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 "dategroup.h"
-#include <boost/algorithm/string.hpp>
-#include <ostream>
-
-namespace cpdoccore { namespace odf_types { 
-
-std::wostream & operator << (std::wostream & _Wostream, const date_group & _Val)
-{
-    switch(_Val.get_type())
-    {
-    case date_group::seconds:
-        _Wostream << L"seconds";
-        break;
-    case date_group::minutes:
-        _Wostream << L"minutes";
-        break;
-    case date_group::hours:
-        _Wostream << L"hours";
-        break;
-    case date_group::days:
-        _Wostream << L"days";
-        break;
-    case date_group::months:
-        _Wostream << L"months";
-        break;
-    case date_group::quarters:
-        _Wostream << L"quarters";
-        break;
-    case date_group::years:
-        _Wostream << L"years";
-        break;
-    default:
-        break;
-    }
-    return _Wostream;    
-}
-date_group date_group::parse(const std::wstring & Str)
-{
-    std::wstring tmp = Str;
-    boost::algorithm::to_lower(tmp);
-
-    if (tmp == L"seconds")
-        return date_group( seconds );
-    else if (tmp == L"minutes")
-        return date_group( minutes );
-	else if (tmp == L"hours")
-        return date_group( hours );
-	else if (tmp == L"days")
-        return date_group( days );
-	else if (tmp == L"months")
-        return date_group( months );
-	else if (tmp == L"quarters")
-        return date_group( quarters );
-	else if (tmp == L"years")
-        return date_group( years );
-	else
-    {
-        return date_group( months );
-    }
-}
-
-} }

ASCOfficeOdfFile/src/odf/datatypes/dategroup.h

@@ -1,78 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * 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 Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * 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 <iosfwd>
-#include <string>
-#include "odfattributes.h"
-
-
-namespace cpdoccore { namespace odf_types { 
-
-class date_group
-{
-public:
-    enum type
-    {
-        seconds, 
-		minutes, 
-		hours, 
-		days, 
-		months, 
-		quarters,
-		years
-    };
-
-    date_group() {}
-
-    date_group(type _Type) : type_(_Type)
-    {}
-
-    type get_type() const
-    {
-        return type_;
-    };
-    
-    static date_group parse(const std::wstring & Str);
-
-private:
-    type type_;
-
-};
-
-std::wostream & operator << (std::wostream & _Wostream, const date_group & _Val);
-
-} 
-
-APPLY_PARSE_XML_ATTRIBUTES(odf_types::date_group);
-
-}

ASCOfficeOdfFile/src/odf/datatypes/fontweight.cpp

@@ -108,6 +108,7 @@ font_weight font_weight::parse(const std::wstring & Str)
         return font_weight( W900 );
     else
     {
+        BOOST_THROW_EXCEPTION( errors::invalid_attribute() );
         return WNormal;
     }
 }

ASCOfficeOdfFile/src/odf/datatypes/smil_transitiontype.cpp

@@ -91,47 +91,47 @@ smil_transition_type smil_transition_type::parse(const std::wstring & Str)
     std::wstring tmp = Str;
     boost::algorithm::to_lower(tmp);
 
-		 if(tmp == L"barwipe")			return smil_transition_type( barWipe );
-	else if(tmp == L"boxwipe")			return smil_transition_type( boxWipe );
-	else if(tmp == L"fourboxwipe")		return smil_transition_type( fourBoxWipe );
-	else if(tmp == L"barndoorwipe")		return smil_transition_type( barnDoorWipe );
-	else if(tmp == L"diagonalwipe")		return smil_transition_type( diagonalWipe );
-	else if(tmp == L"bowtiewipe")		return smil_transition_type( bowTieWipe );
-	else if(tmp == L"miscdiagonalwipe")	return smil_transition_type( miscDiagonalWipe );
-	else if(tmp == L"veewipe")			return smil_transition_type( veeWipe );
-	else if(tmp == L"barnveewipe")		return smil_transition_type( barnVeeWipe );
-	else if(tmp == L"zigzagwipe")		return smil_transition_type( zigZagWipe );
-	else if(tmp == L"barnzigzagwipe")	return smil_transition_type( barnZigZagWipe );
-	else if(tmp == L"iriswipe")			return smil_transition_type( irisWipe);
-	else if(tmp == L"trianglewipe")		return smil_transition_type( triangleWipe);
-	else if(tmp == L"arrowheadwipe")	return smil_transition_type( arrowHeadWipe );
-	else if(tmp == L"pentagonwipe")		return smil_transition_type( pentagonWipe );
-	else if(tmp == L"hexagonwipe")		return smil_transition_type( hexagonWipe );
-	else if(tmp == L"ellipsewipe")		return smil_transition_type( ellipseWipe );
-	else if(tmp == L"eyewipe")			return smil_transition_type( eyeWipe );
-	else if(tmp == L"roundrectwipe")	return smil_transition_type( roundRectWipe );
-	else if(tmp == L"starwipe")			return smil_transition_type( starWipe );
-	else if(tmp == L"miscshapewipe")	return smil_transition_type( miscShapeWipe );
-	else if(tmp == L"clockwipe")		return smil_transition_type( clockWipe );
-	else if(tmp == L"pinwheelwipe")		return smil_transition_type( pinWheelWipe );
-	else if(tmp == L"singlesweepwipe")	return smil_transition_type( singleSweepWipe);
-	else if(tmp == L"fanwipe")			return smil_transition_type( fanWipe );
-	else if(tmp == L"doublefanwipe")	return smil_transition_type( doubleFanWipe );
-	else if(tmp == L"doublesweepwipe")	return smil_transition_type( doubleSweepWipe );
-	else if(tmp == L"saloondoorwipe")	return smil_transition_type( saloonDoorWipe );
-	else if(tmp == L"windshieldwipe")	return smil_transition_type( windshieldWipe );
-	else if(tmp == L"snakewipe")		return smil_transition_type( snakeWipe );
-	else if(tmp == L"spiralwipe")		return smil_transition_type( spiralWipe );
-	else if(tmp == L"parallelsnakeswipe")return smil_transition_type( parallelSnakesWipe );
-	else if(tmp == L"boxsnakeswipe")	return smil_transition_type( boxSnakesWipe );
-	else if(tmp == L"waterfallwipe")	return smil_transition_type( waterfallWipe );
-	else if(tmp == L"pushwipe")			return smil_transition_type( pushWipe );
-	else if(tmp == L"slidewipe")		return smil_transition_type( slideWipe );
+		 if(tmp == L"barWipe")			return smil_transition_type( barWipe );
+	else if(tmp == L"boxWipe")			return smil_transition_type( boxWipe );
+	else if(tmp == L"fourboxWipe")		return smil_transition_type( fourBoxWipe );
+	else if(tmp == L"barndoorWipe")		return smil_transition_type( barnDoorWipe );
+	else if(tmp == L"diagonalWipe")		return smil_transition_type( diagonalWipe );
+	else if(tmp == L"bowtieWipe")		return smil_transition_type( bowTieWipe );
+	else if(tmp == L"miscdiagonalWipe")	return smil_transition_type( miscDiagonalWipe );
+	else if(tmp == L"veeWipe")			return smil_transition_type( veeWipe );
+	else if(tmp == L"barnveeWipe")		return smil_transition_type( barnVeeWipe );
+	else if(tmp == L"zigzagWipe")		return smil_transition_type( zigZagWipe );
+	else if(tmp == L"barnzigzagWipe")	return smil_transition_type( barnZigZagWipe );
+	else if(tmp == L"irisWipe")			return smil_transition_type( irisWipe);
+	else if(tmp == L"triangleWipe")		return smil_transition_type( triangleWipe);
+	else if(tmp == L"arrowheadWipe")	return smil_transition_type( arrowHeadWipe );
+	else if(tmp == L"pentagonWipe")		return smil_transition_type( pentagonWipe );
+	else if(tmp == L"hexagonWipe")		return smil_transition_type( hexagonWipe );
+	else if(tmp == L"ellipseWipe")		return smil_transition_type( ellipseWipe );
+	else if(tmp == L"eyeWipe")			return smil_transition_type( eyeWipe );
+	else if(tmp == L"roundrectWipe")	return smil_transition_type( roundRectWipe );
+	else if(tmp == L"starWipe")			return smil_transition_type( starWipe );
+	else if(tmp == L"miscshapeWipe")	return smil_transition_type( miscShapeWipe );
+	else if(tmp == L"clockWipe")		return smil_transition_type( clockWipe );
+	else if(tmp == L"pinwheelWipe")		return smil_transition_type( pinWheelWipe );
+	else if(tmp == L"singlesweepWipe")	return smil_transition_type( singleSweepWipe);
+	else if(tmp == L"fanWipe")			return smil_transition_type( fanWipe );
+	else if(tmp == L"doublefanWipe")	return smil_transition_type( doubleFanWipe );
+	else if(tmp == L"doublesweepWipe")	return smil_transition_type( doubleSweepWipe );
+	else if(tmp == L"saloondoorWipe")	return smil_transition_type( saloonDoorWipe );
+	else if(tmp == L"windshieldWipe")	return smil_transition_type( windshieldWipe );
+	else if(tmp == L"snakeWipe")		return smil_transition_type( snakeWipe );
+	else if(tmp == L"spiralWipe")		return smil_transition_type( spiralWipe );
+	else if(tmp == L"parallelsnakesWipe")return smil_transition_type( parallelSnakesWipe );
+	else if(tmp == L"boxsnakesWipe")	return smil_transition_type( boxSnakesWipe );
+	else if(tmp == L"waterfallWipe")	return smil_transition_type( waterfallWipe );
+	else if(tmp == L"pushWipe")			return smil_transition_type( pushWipe );
+	else if(tmp == L"slideWipe")		return smil_transition_type( slideWipe );
 	else if(tmp == L"fade")				return smil_transition_type( fade );
-	else if(tmp == L"checkerboardwipe")	return smil_transition_type( checkerBoardWipe);
-	else if(tmp == L"blindswipe")		return smil_transition_type( blindsWipe);
+	else if(tmp == L"checkerboardWipe")	return smil_transition_type( checkerBoardWipe);
+	else if(tmp == L"blindsWipe")		return smil_transition_type( blindsWipe);
 	else if(tmp == L"dissolve")			return smil_transition_type( dissolve);
-	else if(tmp == L"randombarwipe")	return smil_transition_type( randomBarWipe);
+	else if(tmp == L"randombarWipe")	return smil_transition_type( randomBarWipe);
 	else
     {
         return smil_transition_type( barWipe );

ASCOfficeOdfFile/src/odf/datatypes/verticalalign.cpp

@@ -84,6 +84,7 @@ vertical_align vertical_align::parse(const std::wstring & Str)
         return vertical_align( Justify );
     else
     {
+        BOOST_THROW_EXCEPTION( errors::invalid_attribute() );        
         return vertical_align( Baseline );
     }
 }

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -105,10 +105,7 @@ void draw_image::add_child_element( xml::sax * Reader, const std::wstring & Ns,
         //CP_NOT_APPLICABLE_ELM();
     }
 }
-std::wostream & draw_image::text_to_stream(std::wostream & _Wostream) const
-{
-    return _Wostream;
-}
+
 // draw:chart
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * draw_chart::ns = L"draw";
@@ -154,13 +151,6 @@ void draw_g::add_child_element( xml::sax * Reader, const std::wstring & Ns, cons
 {
 	CP_CREATE_ELEMENT(content_);
 }
-
-std::wostream & draw_g::text_to_stream(std::wostream & _Wostream) const
-{
-    CP_SERIALIZE_TEXT(content_);
-    return _Wostream;
-}
-
 // draw:frame
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * draw_frame::ns = L"draw";
@@ -271,11 +261,7 @@ void draw_object::add_attributes( const xml::attributes_wc_ptr & Attributes )
 
 void draw_object::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-    if CP_CHECK_NAME(L"office", L"document")
-    {
-		//embedded
-		odf_document_ = odf_document_ptr( new odf_document(Reader));
-    }
+    CP_NOT_APPLICABLE_ELM(); // TODO
 }
 
 // draw:object
@@ -342,10 +328,8 @@ std::wstring draw_object_ole::detectObject(const std::wstring &fileName)
 }
 
 
-std::wstring draw_object::office_convert(odf_document_ptr odfDocument, int type)
+std::wstring draw_object::office_convert(odf_document * odfDocument, int type)
 {
-	if (!odfDocument) return L"";
-
 	std::wstring href_result;
 	std::wstring folderPath		= odfDocument->get_folder();	
     std::wstring objectOutPath	= NSDirectory::CreateDirectoryWithUniqueName(folderPath);
@@ -353,7 +337,7 @@ std::wstring draw_object::office_convert(odf_document_ptr odfDocument, int type)
 	if (type == 1)
 	{
 		oox::package::docx_document	outputDocx;
-		oox::docx_conversion_context conversionDocxContext ( odfDocument.get());
+		oox::docx_conversion_context conversionDocxContext ( odfDocument);
 	   
 		conversionDocxContext.set_output_document (&outputDocx);
 		//conversionContext.set_font_directory	(fontsPath);
@@ -372,7 +356,7 @@ std::wstring draw_object::office_convert(odf_document_ptr odfDocument, int type)
 	if (type == 2)
 	{
 		oox::package::xlsx_document	outputXlsx;
-		oox::xlsx_conversion_context conversionXlsxContext ( odfDocument.get());
+		oox::xlsx_conversion_context conversionXlsxContext ( odfDocument);
 	   
 		conversionXlsxContext.set_output_document (&outputXlsx);
 		//conversionContext.set_font_directory	(fontsPath);

ASCOfficeOdfFile/src/odf/draw_frame.h

@@ -49,14 +49,13 @@ namespace cpdoccore {
 
 namespace odf_reader {
 
-class odf_document;
-typedef shared_ptr<odf_document>::Type odf_document_ptr;
-
+/// draw-image-attlist
 class draw_image_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
+public:
     _CP_OPT(std::wstring) draw_filter_name_;
 
 };
@@ -70,9 +69,7 @@ public:
     static const ElementType type = typeDrawImage;
     CPDOCCORE_DEFINE_VISITABLE();
 
-    virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
-
-	virtual void docx_convert(oox::docx_conversion_context & Context);
+    virtual void docx_convert(oox::docx_conversion_context & Context);
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
     virtual void pptx_convert(oox::pptx_conversion_context & Context);
 
@@ -82,15 +79,14 @@ private:
 
     draw_image_attlist				draw_image_attlist_;
 	odf_types::common_xlink_attlist common_xlink_attlist_;
-    
-	office_element_ptr				office_binary_data_;
-
+    office_element_ptr				office_binary_data_;
     office_element_ptr_array		content_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_image);
 
-//------------------------------------------------------------------------------------------------------
+//////////////////////////////////////////////////////////////////////////////////////////////////////////
+ //draw-chart-attlist
 class draw_chart_attlist
 {
 public:
@@ -138,6 +134,7 @@ class draw_frame_attlist
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
+public:
     _CP_OPT(std::wstring)					draw_copy_of_;
     _CP_OPT(odf_types::length_or_percent)	fo_min_width_;
     _CP_OPT(odf_types::length_or_percent)	fo_min_height_;
@@ -194,12 +191,15 @@ private:
 CP_REGISTER_OFFICE_ELEMENT2(draw_frame);
 
 //-------------------------------------------------------------------------------------------------------------
+//draw-frame-attlist
 class draw_g_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
+
 };
 
+
 class draw_g : public office_element_impl<draw_g>
 {
 public:
@@ -209,9 +209,7 @@ public:
     static const ElementType type		= typeDrawG;
     CPDOCCORE_DEFINE_VISITABLE();
 
-    virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
-
-	virtual void docx_convert(oox::docx_conversion_context & Context);
+    virtual void docx_convert(oox::docx_conversion_context & Context);
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
     virtual void pptx_convert(oox::pptx_conversion_context & Context);
 
@@ -228,6 +226,7 @@ private:
 CP_REGISTER_OFFICE_ELEMENT2(draw_g);
 
 //-------------------------------------------------------------------------------------------------------------
+// draw-text-box-attlist
 class draw_text_box_attlist
 {
 public:
@@ -269,6 +268,7 @@ private:
 CP_REGISTER_OFFICE_ELEMENT2(draw_text_box);
 
 //-------------------------------------------------------------------------------------------------------------
+/// draw-object-attlist
 class draw_object_attlist
 {
 public:
@@ -280,6 +280,7 @@ public:
     
 };
 
+// draw:object
 class draw_object : public office_element_impl<draw_object>
 {
 public:
@@ -296,17 +297,16 @@ public:
     draw_object_attlist					draw_object_attlist_;
     odf_types::common_xlink_attlist		common_xlink_attlist_;
 
-	odf_document_ptr					odf_document_;
-
 private:
     virtual void add_attributes		( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element	( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
-	std::wstring office_convert(odf_document_ptr odfDocument, int type);
+	std::wstring office_convert(odf_document * odfDocument, int type);
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_object);
 
+// draw:object-ole
 class draw_object_ole : public office_element_impl<draw_object>
 {
 public:
@@ -332,6 +332,7 @@ private:
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_object_ole);
 
+// draw:param
 class draw_param : public office_element_impl<draw_param>
 {
 public:
@@ -355,6 +356,7 @@ private:
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_param);
 
+// draw:plugin
 class draw_plugin : public office_element_impl<draw_plugin>
 {
 public:

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -754,7 +754,7 @@ int ComputeMarginY(const style_page_layout_properties_attlist		& pageProperties,
 
 }
 
-void common_draw_docx_convert(oox::docx_conversion_context & Context, union_common_draw_attlists & attlists_, oox::_docx_drawing *drawing) 
+void common_draw_docx_convert(oox::docx_conversion_context & Context, const union_common_draw_attlists & attlists_, oox::_docx_drawing *drawing) 
 {
 	const std::wstring styleName = attlists_.shape_with_text_and_styles_.
 					common_shape_draw_attlist_.draw_style_name_.get_value_or(L"");
@@ -899,16 +899,7 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
 		}
 	}
 ///////////////////////////
-	if (attlists_.rel_size_.common_draw_size_attlist_.svg_width_)
-	{
-		double w_shape = attlists_.rel_size_.common_draw_size_attlist_.svg_width_->get_value_unit(length::pt);
-		if (w_shape < 1) attlists_.rel_size_.common_draw_size_attlist_.svg_width_ = length(1, length::pt);
-	}
-	if (attlists_.rel_size_.common_draw_size_attlist_.svg_height_)
-	{
-		double h_shape = attlists_.rel_size_.common_draw_size_attlist_.svg_height_->get_value_unit(length::pt);
-		if (h_shape < 1) attlists_.rel_size_.common_draw_size_attlist_.svg_height_ = length(1, length::pt);
-	}
+
 	drawing->x = get_value_emu(attlists_.position_.svg_x_);
     drawing->y = get_value_emu(attlists_.position_.svg_y_);
 
@@ -1049,44 +1040,23 @@ void draw_shape::docx_convert(oox::docx_conversion_context & Context)
 
     std::wostream & strm = Context.output_stream();
 
-	bool runState	= Context.get_run_state();
-	bool paraState	= Context.get_paragraph_state();
-	bool keepState	= Context.get_paragraph_keep();
-
-	//Context.set_run_state		(false);	
-	Context.set_paragraph_state	(false);	
-
-	bool new_run = false;
+	bool pState = Context.get_paragraph_state();
+	Context.set_paragraph_state(false);		
 	
-	if ((paraState == false && Context.get_drawing_context().get_current_level() == 1) || (Context.get_drawing_context().in_group()))
+	bool new_run = true;
+	
+	if ((pState == false && Context.get_drawing_context().get_current_level() == 1) || (Context.get_drawing_context().in_group()))
 	{
+		new_run = false;
 	}
 	else
-	{
-		if (!Context.get_drawing_context().in_group() && !runState)
-		{
-			if (!paraState)
-			{
-				Context.start_paragraph();
-			}
-			Context.add_new_run(L"");
-
-			new_run = true;
-		}
-	}
+		Context.add_new_run(_T(""));
 
 	drawing.serialize(strm/*, Context.get_drawing_state_content()*/);
 
-	if (new_run)
-	{
-		Context.finish_run();
-		if (!paraState)
-		{
-			Context.finish_paragraph();
-		}
-	}
+	if (new_run) Context.finish_run();
 
-	Context.set_paragraph_state(paraState);		
+	Context.set_paragraph_state(pState);		
 
 	Context.get_drawing_context().stop_shape();
 }
@@ -1097,7 +1067,7 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 		return;
  
 	std::wstring href		= common_xlink_attlist_.href_.get_value_or(L"");
-	int pos_replaicement	= href.find(L"ObjectReplacements"); 
+	int pos_replaicement= href.find(L"ObjectReplacements"); 
 
     const draw_frame * frame = Context.get_drawing_context().get_current_frame();//owner
 	if (!frame)
@@ -1106,12 +1076,9 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 	oox::_docx_drawing * drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get()); 
 	if (!drawing) return;
 
- 	if (pos_replaicement >= 0)
+ 	if (pos_replaicement >= 0 && !Context.get_drawing_context().get_use_image_replace())
 	{
-		if (!Context.get_drawing_context().get_use_image_replace())
-			return; //skip replacement image (math, chart, ...)  - возможно записать как альтернативный контент - todooo ???
-		if (href.length() - (pos_replaicement + 18) < 2)
-			return; //href="./ObjectReplacements/"
+		return; //skip replacement image (math, chart, ...)  - возможно записать как альтернативный контент - todooo ???
 	}
 
 	if (drawing->type == oox::typeUnknown)
@@ -1155,7 +1122,7 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 	drawing->fill.bitmap = oox::oox_bitmap_fill::create();
 	drawing->fill.type = 2;
 	drawing->fill.bitmap->isInternal = false;
-    drawing->fill.bitmap->rId = Context.add_mediaitem(href, oox::typeImage, drawing->fill.bitmap->isInternal, href);
+    drawing->fill.bitmap->rId = Context.add_mediaitem(href, oox::typeImage, drawing->fill.bitmap->isInternal,href);
 	drawing->fill.bitmap->bStretch = true;
 
     const std::wstring styleName = frame->common_draw_attlists_.shape_with_text_and_styles_.
@@ -1414,34 +1381,22 @@ void draw_frame::docx_convert(oox::docx_conversion_context & Context)
 
 //-----------------------------------------------------------------------------------------------------
 	bool runState	= Context.get_run_state();
-	bool paraState	= Context.get_paragraph_state();
+	bool pState		= Context.get_paragraph_state();
 	bool keepState	= Context.get_paragraph_keep();
 
 	Context.set_run_state		(false);	
 	Context.set_paragraph_state	(false);	
 
 	if (!Context.get_drawing_context().in_group() && !runState)
-	{
-		if (!paraState)//0115GS3-KeyboardShortcuts.odt
-		{
-			Context.start_paragraph();
-		}
-		Context.add_new_run(L"");
-	}
+		Context.add_new_run(_T(""));
 
 	drawing->serialize(Context.output_stream()/*, Context.get_drawing_state_content()*/);
 
 	if (!Context.get_drawing_context().in_group() && !runState)
-	{
 		Context.finish_run();
-		if (!paraState)//0115GS3-KeyboardShortcuts.odt
-		{
-			Context.finish_paragraph();
-		}
-	}
 
 	Context.set_run_state		(runState);
-	Context.set_paragraph_state	(paraState);	
+	Context.set_paragraph_state	(pState);	
 	Context.set_paragraph_keep	(keepState);
 
 	Context.get_drawing_context().stop_frame();
@@ -1451,27 +1406,24 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 {
     try 
 	{
-        std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
+        std::wstring href		= common_xlink_attlist_.href_.get_value_or(L"");
 
-		if (!odf_document_ && !href.empty())
-		{			
-			std::wstring folderPath = Context.root()->get_folder();
-			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
+		std::wstring folderPath = Context.root()->get_folder();
+		std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
-			// normalize path ???? todooo
-			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		//normalize path ??? todooo
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
-		}
+        cpdoccore::odf_reader::odf_document objectSubDoc(objectPath ,NULL);    
 //---------------------------------------------------------------------------------------------------------------------
 		draw_frame*				frame			= NULL;
 		oox::_docx_drawing *	drawing			= NULL;
-		office_element*			contentSubDoc	= odf_document_ ? odf_document_->get_impl()->get_content() : NULL;
+		office_element*			contentSubDoc	= objectSubDoc.get_impl()->get_content();
 		
 		object_odf_context	objectBuild (href);
 		if (contentSubDoc)
 		{
-			process_build_object process_build_object_(objectBuild, odf_document_->odf_context());
+			process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
 			contentSubDoc->accept(process_build_object_); 
 
 			objectBuild.docx_convert(Context);		
@@ -1541,7 +1493,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 			bool & use_image_replace = Context.get_drawing_context().get_use_image_replace();
 			use_image_replace = true;
 
-			std::wstring href_new = office_convert(odf_document_, 2);
+			std::wstring href_new = office_convert(&objectSubDoc, 2);
 
 			if (!href_new.empty())
 			{

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -255,22 +255,18 @@ void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
 }
 void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 {
-    try 
-	{
-        std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
+    try {
+        std::wstring href		= common_xlink_attlist_.href_.get_value_or(L"");
 		
-		if (!odf_document_ && !href.empty())
-		{			
-			std::wstring folderPath = Context.root()->get_folder();
-			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
+		std::wstring folderPath	= Context.root()->get_folder();
+        std::wstring objectPath = folderPath + FILE_SEPARATOR_STR +  href;
 
-			// normalize path ???? todooo
-			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		//normalize path ??? todooo
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
-		}
+        cpdoccore::odf_reader::odf_document objectSubDoc(objectPath, NULL);    
 //---------------------------------------------------------------------------------------------------------------------
-		office_element *contentSubDoc = odf_document_ ? odf_document_->get_impl()->get_content() : NULL;
+		office_element *contentSubDoc = objectSubDoc.get_impl()->get_content();
 		if (!contentSubDoc)
 		{
 			//здесь другой формат xml (не Open Office)
@@ -279,13 +275,13 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 		}
 		object_odf_context objectBuild(href);
 
-		process_build_object process_build_object_(objectBuild, odf_document_->odf_context() );
-		contentSubDoc->accept(process_build_object_); 
+		process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
+        contentSubDoc->accept(process_build_object_); 
 
 //---------------------------------------------------------------------------------------------------------------------
 		if (objectBuild.object_type_ == 1)//диаграмма
 		{		
-			const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"Chart");
+			const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
 			objectBuild.pptx_convert(Context);
 			
 			Context.get_slide_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы 
@@ -294,7 +290,7 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 		{
 			Context.get_slide_context().set_use_image_replacement();
 
-			std::wstring href_new = office_convert( odf_document_, 1);
+			std::wstring href_new = office_convert( &objectSubDoc, 1);
 			
 			if (!href_new.empty())
 			{
@@ -328,7 +324,7 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 		{	
 			Context.get_slide_context().set_use_image_replacement();
 
-			std::wstring href_new = office_convert( odf_document_, 2);
+			std::wstring href_new = office_convert( &objectSubDoc, 2);
 			
 			if (!href_new.empty())
 			{

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -203,19 +203,8 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-    std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
-
-	if (href.empty() && office_binary_data_)
-	{
-		office_binary_data* binary_data = dynamic_cast<office_binary_data*>(office_binary_data_.get());
-		
-		if (binary_data)
-		{
-			href = binary_data->write_to(Context.root()->get_folder());
-		}
-	}
-
-	Context.get_drawing_context().set_image(href);
+    const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
+    Context.get_drawing_context().set_image(href);
 
 ////////////////////////////////////в принципе достаточно общая часть ...
 	Context.get_text_context().start_drawing_content();//...  если в объекте есть текст он привяжется к объекту - иначе к ячейке
@@ -257,40 +246,34 @@ void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	if (text_content_.length()>0)
 	{
-		Context.get_drawing_context().set_property(_property(L"text-content", text_content_));
+		Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
 	}
 }
 void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	try 
-	{
-		std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
-		
-		if (!odf_document_ && !href.empty())
-		{			
-			std::wstring folderPath = Context.root()->get_folder();
-			std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
+    try {
+        std::wstring href		= common_xlink_attlist_.href_.get_value_or(L"");
 
-			// normalize path ???? todooo
-			XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		std::wstring folderPath = Context.root()->get_folder();
+        std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
-			odf_document_ = odf_document_ptr(new odf_document(objectPath, NULL));    
-		}
-		office_element *contentSubDoc = odf_document_ ? odf_document_->get_impl()->get_content() : NULL;
-		if (!contentSubDoc)
-		{
-			//здесь другой формат xml (не Open Office)
-			//временно - замещающая картинка(если она конечно присутствует)
-			return;
-		}		
+		// normalize path ???? todooo
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+
+        cpdoccore::odf_reader::odf_document objectSubDoc(objectPath,NULL);    
+//---------------------------------------------------------------------------------------------------------------------
+		office_element *contentSubDoc = objectSubDoc.get_impl()->get_content();
 		object_odf_context objectBuild(href);
 		
-		process_build_object process_build_object_(objectBuild, odf_document_->odf_context() );
-		contentSubDoc->accept(process_build_object_); 
+		if (contentSubDoc)
+		{
+			process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
+			contentSubDoc->accept(process_build_object_); 
+		}
 //---------------------------------------------------------------------------------------------------------------------
 		if (objectBuild.object_type_ == 1) //диаграмма
 		{		
-			const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"chart");
+			const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
 			objectBuild.xlsx_convert(Context);
 			
 			Context.get_drawing_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы 
@@ -299,7 +282,7 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
 		{
 			Context.get_drawing_context().set_use_image_replacement();
 
-			std::wstring href_new = office_convert( odf_document_, 1);
+			std::wstring href_new = office_convert( &objectSubDoc, 1);
 			
 			if (!href_new.empty())
 			{

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -607,8 +607,9 @@ void draw_caption::add_attributes( const xml::attributes_wc_ptr & Attributes )
 void draw_connector_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"svg:d",			svg_d_);
-    CP_APPLY_ATTR(L"svg:viewBox",	svg_viewbox_);	
+    CP_APPLY_ATTR(L"svg:viewBox",	svg_viewbox_);
     CP_APPLY_ATTR(L"draw:type",		draw_type_);
+
 }
 // draw:connector
 const wchar_t * draw_connector::ns = L"draw";
@@ -668,42 +669,5 @@ void draw_connector::reset_svg_path()
 }
 ///////////////////////////////////////
 
-// dr3d:scene
-const wchar_t * dr3d_scene::ns = L"dr3d";
-const wchar_t * dr3d_scene::name = L"scene";
-
-void dr3d_scene::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-	draw_shape::add_attributes(Attributes);
-
-	sub_type_ = 10; 
-	
-}
-// dr3d:extrude
-const wchar_t * dr3d_extrude::ns = L"dr3d";
-const wchar_t * dr3d_extrude::name = L"extrude";
-
-void dr3d_extrude::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-    CP_APPLY_ATTR(L"svg:d",			svg_d_);
-    CP_APPLY_ATTR(L"svg:viewBox",	svg_viewbox_);	
-}
-void dr3d_extrude::reset_svg_path()
-{
-	if (!svg_d_) return;
-
-}
-// dr3d:light
-const wchar_t * dr3d_light::ns = L"dr3d";
-const wchar_t * dr3d_light::name = L"light";
-
-void dr3d_light::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-	CP_APPLY_ATTR(L"dr3d:diffuse_color", dr3d_diffuse_color_);
-	CP_APPLY_ATTR(L"dr3d:direction",	dr3d_direction_);
-	CP_APPLY_ATTR(L"dr3d:specular",		dr3d_specular_);
-	CP_APPLY_ATTR(L"dr3d:enabled",		dr3d_enabled_);
-}
-
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes.h

@@ -543,8 +543,8 @@ public:
 	virtual void docx_convert(oox::docx_conversion_context & Context);
     virtual void pptx_convert(oox::pptx_conversion_context & Context);
 
-    draw_connector_attlist	draw_connector_attlist_;
-    draw_line_attlist		draw_line_attlist_;
+    draw_connector_attlist draw_connector_attlist_;
+    draw_line_attlist draw_line_attlist_;
 
 	void reset_svg_path();
 	void reset_svg_attributes();
@@ -552,75 +552,5 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(draw_connector);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class dr3d_scene : public draw_shape
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-	
-	static const ElementType type = typeDr3dScene;
-	static const xml::NodeType xml_type = xml::typeElement;
-
-	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void docx_convert(oox::docx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context);
-
-
-};
-CP_REGISTER_OFFICE_ELEMENT2(dr3d_scene);
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class dr3d_extrude : public office_element_impl<dr3d_extrude>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-	
-	static const ElementType type = typeDr3dExtrude;
-	static const xml::NodeType xml_type = xml::typeElement;
-
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
-	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void docx_convert(oox::docx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context);
-
-	_CP_OPT(std::wstring) svg_d_;
-	_CP_OPT(std::wstring) svg_viewbox_;
-	
-	void reset_svg_path();
-
-};
-CP_REGISTER_OFFICE_ELEMENT2(dr3d_extrude);
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class dr3d_light : public office_element_impl<dr3d_light>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-	
-	static const ElementType type = typeDr3dLight;
-	static const xml::NodeType xml_type = xml::typeElement;
-
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
-	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void docx_convert(oox::docx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context);
-
-	_CP_OPT(std::wstring)	dr3d_diffuse_color_;
-	_CP_OPT(std::wstring)	dr3d_direction_;
-	_CP_OPT(std::wstring)	dr3d_specular_;
-	_CP_OPT(odf_types::Bool)dr3d_enabled_;
-
-};
-CP_REGISTER_OFFICE_ELEMENT2(dr3d_light);
-
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -298,8 +298,6 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 			shape->additional_.push_back(odf_reader::_property(L"custom_path", output_.str()));
 			
 			set_shape = true;
-			int w = 0;
-			int h = 0;
 
 			if (draw_enhanced_geometry_attlist_.drawooo_sub_view_size_)
 			{
@@ -308,8 +306,8 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 				
 				if (splitted.size() == 2)
 				{
-					w = boost::lexical_cast<int>(splitted[0]);
-					h = boost::lexical_cast<int>(splitted[1]);
+					int w = boost::lexical_cast<int>(splitted[0]);
+					int h = boost::lexical_cast<int>(splitted[1]);
 					
 					shape->additional_.push_back(odf_reader::_property(L"custom_path_w", w));
 					shape->additional_.push_back(odf_reader::_property(L"custom_path_h", h));
@@ -322,17 +320,6 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 					int b = boost::lexical_cast<int>(splitted[3]);
 
 				}
-
-				//if (shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_)
-				//{
-				//	int w_shape = shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_->get_value();
-				//	if (w_shape < 1) shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_ = length(1, length::pt);
-				//}
-				//if (shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_)
-				//{
-				//	int h_shape = shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_->get_value();
-				//	if (h_shape < 1) shape->common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_ = length(1, length::pt);
-				//}
 			}
 		}
 	}
@@ -351,28 +338,5 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 		shape->bad_shape_ = true;
 	}
 }
-
-void dr3d_scene::docx_convert(oox::docx_conversion_context & Context)
-{
-	//if (Context.get_drawing_context().get_current_level() >0 )return;
- 	if (Context.get_drawing_context().get_current_level() > 0 && !Context.get_drawing_context().in_group() )
-	{ 
-		if(Context.delayed_converting_ == false)
-			Context.add_delayed_element(this);
-		return;
-	}
-	common_docx_convert(Context);
-	//...
-	draw_shape::docx_convert(Context);
-}
-void dr3d_extrude::docx_convert(oox::docx_conversion_context & Context)
-{
-	reset_svg_path();
-
-}
-void dr3d_light::docx_convert(oox::docx_conversion_context & Context)
-{
-
-}
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -401,24 +401,6 @@ void draw_enhanced_geometry::pptx_convert(oox::pptx_conversion_context & Context
 	{
 		Context.get_slide_context().start_shape(1); //restart type shape
 	}
-}
-void dr3d_scene::pptx_convert(oox::pptx_conversion_context & Context)
-{
-	Context.get_slide_context().start_shape(sub_type_);
-
-	common_pptx_convert(Context);
-
-	Context.get_slide_context().end_shape();
-
-}
-void dr3d_extrude::pptx_convert(oox::pptx_conversion_context & Context)
-{
-	reset_svg_path();
-
-}
-void dr3d_light::pptx_convert(oox::pptx_conversion_context & Context)
-{
-
 }
 }
 }

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -334,26 +334,6 @@ void draw_enhanced_geometry::xlsx_convert(oox::xlsx_conversion_context & Context
 		{
 		}
 	}
-}
-void dr3d_scene::xlsx_convert(oox::xlsx_conversion_context & Context)
-{
-	//const std::wstring style = common_shape_draw_attlist_.draw_text_style_name_.get_value_or(L"");
-
-	Context.get_drawing_context().start_shape(1);//rect с наваротами-атрибутами .. а-ля TextBox
-	
-	common_xlsx_convert(Context);
-
-	Context.get_drawing_context().end_shape();
-	Context.get_drawing_context().clear();
-}
-void dr3d_extrude::xlsx_convert(oox::xlsx_conversion_context & Context)
-{
-	reset_svg_path();
-
-}
-void dr3d_light::xlsx_convert(oox::xlsx_conversion_context & Context)
-{
-
 }
 }
 }

ASCOfficeOdfFile/src/odf/font_face.cpp

@@ -41,22 +41,9 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-const wchar_t * svg_desc::ns	= L"svg";
-const wchar_t * svg_desc::name	= L"desc";
-
-std::wostream & svg_desc::text_to_stream(std::wostream & _Wostream) const
-{
-    _Wostream <<  text_ ;
-    return _Wostream;
-}
-
-void svg_desc::add_text(const std::wstring & Text) 
-{
-    text_ = Text;
-}
 
 // svg:font-face-uri
-//---------------------------------------------------------------------------------------
+//////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * svg_font_face_uri::ns = L"svg";
 const wchar_t * svg_font_face_uri::name = L"font-face-uri";
 

ASCOfficeOdfFile/src/odf/font_face.h

@@ -58,6 +58,7 @@ public:
     
 	odf_types::common_xlink_attlist common_xlink_attlist_;
 };
+
 //  svg:font-face-uri
 class svg_font_face_uri : public office_element_impl<svg_font_face_uri>
 {
@@ -79,31 +80,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
     virtual void add_text(const std::wstring & Text);
 };
-CP_REGISTER_OFFICE_ELEMENT2(svg_font_face_uri);
 
-//  svg:desc
-class svg_desc : public office_element_impl<svg_desc>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-    static const xml::NodeType xml_type = xml::typeElement;
-    static const ElementType type = typeSvgDesc;
-
-    CPDOCCORE_DEFINE_VISITABLE();
-
-    virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
-
-	std::wstring text_;
-
-private:
-	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes ){}
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
-    virtual void add_text(const std::wstring & Text);
-};
-CP_REGISTER_OFFICE_ELEMENT2(svg_desc);
-
-//	svg:font-face-format
 class svg_font_face_format : public office_element_impl<svg_font_face_format>
 {
 public:
@@ -123,6 +100,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
     virtual void add_text(const std::wstring & Text);
 };
+
 CP_REGISTER_OFFICE_ELEMENT2(svg_font_face_format);
 
 //  svg:font-face-name

ASCOfficeOdfFile/src/odf/math_layout_elements.cpp

@@ -33,7 +33,6 @@
 #include "math_layout_elements.h"
 #include "math_token_elements.h"
 #include "style_text_properties.h"
-#include "math_limit_elements.h"
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
@@ -121,7 +120,7 @@ void math_mrow::oox_convert(oox::math_context & Context)
 	for (int i = i_start; i < i_end ; i++)
 	{
 		office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
-		math_element->oox_convert(Context);		
+		math_element->oox_convert(Context);
 	}
 
 	if (bDPr)
@@ -298,21 +297,8 @@ void math_mstyle::oox_convert(oox::math_context & Context)
 
 	for (size_t i = 0; i < content_.size(); i++)
 	{
-		math_munder*	munder_test	= dynamic_cast<math_munder*>(content_[i].get());
-		math_mfrac*		frac_test	= dynamic_cast<math_mfrac*>(content_[i].get());
-		math_mrow*		row_test	= dynamic_cast<math_mrow*>(content_[i].get());
-		
-		if (row_test || munder_test || frac_test)
-			Context.output_stream() << L"<m:e>";
-		
 		office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
-		math_element->oox_convert(Context);		
-
-		if (row_test || munder_test || frac_test)
-			Context.output_stream() << L"</m:e>";
-		
-		//office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
-		//math_element->oox_convert(Context);
+		math_element->oox_convert(Context);
 	}
 //reset to default math text props
 	Context.text_properties_ = odf_reader::style_text_properties_ptr(new odf_reader::style_text_properties());

ASCOfficeOdfFile/src/odf/math_table_elements.cpp

@@ -31,8 +31,6 @@
  */
 
 #include "math_table_elements.h"
-#include "math_layout_elements.h"
-#include "math_limit_elements.h"
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
@@ -94,19 +92,10 @@ void math_mtr::oox_convert(oox::math_context & Context)
 	strm << L"<m:mr>";		
 		for (size_t i = 0; i < content_.size(); i++)
 		{
-			math_mrow*		row_test	= dynamic_cast<math_mrow*>(content_[i].get());
-			math_munder*	munder_test	= dynamic_cast<math_munder*>(content_[i].get());
-			math_mfrac*		frac_test	= dynamic_cast<math_mfrac*>(content_[i].get());
-			
-			if (row_test || munder_test || frac_test)
-				Context.output_stream() << L"<m:e>";// EqArray записался в числитель вместо знаменателя.docx - дублирование
-
-
+		//strm << L"<m:e>"; // EqArray записался в числитель вместо знаменателя.docx - дублирование
 			office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 			math_element->oox_convert(Context);
-			
-			if (row_test || munder_test || frac_test)
-				strm << L"</m:e>";
+		//strm << L"</m:e>";
 		}
 	strm << L"</m:mr>";
 }

ASCOfficeOdfFile/src/odf/math_token_elements.cpp

@@ -283,12 +283,7 @@ void math_mtext::add_text(const std::wstring & Text)
 
 void math_mtext::oox_convert(oox::math_context & Context)
 {
-	if (text_)
-	{
-		Context.output_stream() << L"<m:r><m:rPr><m:nor/></m:rPr><m:t>";
-			Context.output_stream() << *text_;
-		Context.output_stream() << L"</m:t></m:r>";
-	}
+
 }
 //----------------------------------------------------------------------------------------------------
 const wchar_t * math_mglyph::ns = L"math";

ASCOfficeOdfFile/src/odf/odf_content_xml.cpp

@@ -64,11 +64,7 @@ void content_xml_t::add_attributes( const xml::attributes_wc_ptr & Attributes )
 
 void content_xml_t::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
- 	if CP_CHECK_NAME(L"office", L"document")
-    {
-        create_element_and_read(Reader, Ns, Name, xml_content_, getContext(), true);
-    }
-	else if CP_CHECK_NAME(L"office", L"document-content")
+    if CP_CHECK_NAME(L"office", L"document-content")
     {
         create_element_and_read(Reader, Ns, Name, xml_content_, getContext(), true);
     }
@@ -88,10 +84,6 @@ void content_xml_t::add_child_element( xml::sax * Reader, const std::wstring & N
     {
         create_element_and_read(Reader, Ns, Name, xml_content_, getContext(), true);
     }
-	else if CP_CHECK_NAME(L"manifest", L"manifest")
-    {
-        create_element_and_read(Reader, Ns, Name, xml_content_, getContext(), true);
-    }	
 }
 
 void content_xml_t::add_text(const std::wstring & Text) 

ASCOfficeOdfFile/src/odf/odf_document.cpp

@@ -38,9 +38,7 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-odf_document::odf_document(const std::wstring & Folder, const ProgressCallback* CallBack) : impl_(new Impl(Folder, CallBack))
-{}
-odf_document::odf_document( xml::sax * Reader) : impl_(new Impl(Reader))
+odf_document::odf_document(const std::wstring & Folder, const ProgressCallback* CallBack) : impl_(new Impl(Folder,CallBack))
 {}
 
 odf_document::~odf_document()

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -106,122 +106,47 @@ content_xml_t_ptr read_file_content(const std::wstring & Path)
 
     return result;
 }
-content_xml_t_ptr read_file_content(xml::sax * reader_owner)
-{
-	if (!reader_owner) return content_xml_t_ptr();
-
-    content_xml_t_ptr result( new content_xml_t() );
-    
-	const std::wstring namespacePrefix	= reader_owner->namespacePrefix();
-	const std::wstring localName		= reader_owner->nodeLocalName();
-	
-	result->add_child_element(reader_owner, namespacePrefix, localName);		
-
-    return result;
 }
-}
-odf_document::Impl::Impl(xml::sax * Reader): 
-			context_(new odf_read_context()), base_folder_(L""), pCallBack(NULL), bUserStopConvert (0)
+
+odf_document::Impl::Impl(const std::wstring & folderPath, const ProgressCallback* CallBack) : 
+			context_(new odf_read_context()), base_folder_(folderPath), pCallBack(CallBack), bUserStopConvert (0)
 {
 	office_mime_type_ = 0;
 	encrypted = false;
 
-	content_xml_ = read_file_content(Reader);
-	
-	if (content_xml_)
-	{
-		_CP_LOG << L"[info] parse fonts" << std::endl;
-		parse_fonts(content_xml_->get_content());
-		
-		_CP_LOG << L"[info] parse styles" << std::endl;
-		parse_styles(content_xml_->get_content());
+    std::wstring content_xml	= folderPath + FILE_SEPARATOR_STR + L"content.xml";
+    std::wstring styles_xml		= folderPath + FILE_SEPARATOR_STR + L"styles.xml";
+    std::wstring meta_xml		= folderPath + FILE_SEPARATOR_STR + L"meta.xml";
+    std::wstring settings_xml	= folderPath + FILE_SEPARATOR_STR + L"settings.xml";
+	std::wstring manifest_xml	= folderPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
 
-		_CP_LOG << L"[info] parse manifest" << std::endl;
-		parse_manifests(content_xml_->get_content());
+    _CP_LOG << L"[info] read manifest.xml" << std::endl;
+    manifest_xml_ = read_file_content(manifest_xml);
 
-		_CP_LOG << L"[info] parse settings" << std::endl;
-		parse_settings(content_xml_->get_content());
-			
-		tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath());
-	}
-}
+      _CP_LOG << L"[info] read settings.xml" << std::endl;
+    settings_xml_ = read_file_content(settings_xml);
 
-odf_document::Impl::Impl(const std::wstring & srcPath, const ProgressCallback* CallBack) : 
-			context_(new odf_read_context()), pCallBack(CallBack), bUserStopConvert (0)
-{
-	office_mime_type_ = 0;
-	encrypted = false;
+    _CP_LOG << L"[info] read content.xml" << std::endl;
+    content_xml_ = read_file_content(content_xml);
 
-	if (NSDirectory::Exists(srcPath))
-	{
-		base_folder_ = srcPath; 
+      _CP_LOG << L"[info] read styles.xml" << std::endl;
+    styles_xml_ = read_file_content(styles_xml);
 
-		std::wstring content_xml	= srcPath + FILE_SEPARATOR_STR + L"content.xml";
-		std::wstring styles_xml		= srcPath + FILE_SEPARATOR_STR + L"styles.xml";
-		std::wstring meta_xml		= srcPath + FILE_SEPARATOR_STR + L"meta.xml";
-		std::wstring settings_xml	= srcPath + FILE_SEPARATOR_STR + L"settings.xml";
-		std::wstring manifest_xml	= srcPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
+    _CP_LOG << L"[info] parse fonts" << std::endl;
+    parse_fonts();
 
-		_CP_LOG << L"[info] read manifest.xml" << std::endl;
-		manifest_xml_ = read_file_content(manifest_xml);
+    _CP_LOG << L"[info] parse styles" << std::endl;
+    parse_styles();
 
-		  _CP_LOG << L"[info] read settings.xml" << std::endl;
-		settings_xml_ = read_file_content(settings_xml);
+    _CP_LOG << L"[info] parse manifest" << std::endl;
+    parse_manifests();
 
-		_CP_LOG << L"[info] read content.xml" << std::endl;
-		content_xml_ = read_file_content(content_xml);
-
-		  _CP_LOG << L"[info] read styles.xml" << std::endl;
-		styles_xml_ = read_file_content(styles_xml);
-//----------------------------------------------------------------------------------------
-		_CP_LOG << L"[info] parse fonts" << std::endl;
-		parse_fonts(content_xml_ ? content_xml_->get_content() : NULL);
-
-		_CP_LOG << L"[info] parse styles" << std::endl;
-		parse_styles(styles_xml_ ? styles_xml_->get_content() : NULL);
-
-		_CP_LOG << L"[info] parse manifest" << std::endl;
-		parse_manifests(manifest_xml_ ? manifest_xml_->get_content() : NULL);
-
-		_CP_LOG << L"[info] parse settings" << std::endl;
-		parse_settings(settings_xml_ ? settings_xml_->get_content() : NULL);
-
-	}
-	else 
-	{
-		_CP_LOG << L"[info] read flat document" << std::endl;
-		content_xml_ = read_file_content(srcPath);
-		
-		if (content_xml_)
-		{
-			_CP_LOG << L"[info] parse fonts" << std::endl;
-			parse_fonts(content_xml_->get_content());
-			
-			_CP_LOG << L"[info] parse styles" << std::endl;
-			parse_styles(content_xml_->get_content());
-
-			_CP_LOG << L"[info] parse manifest" << std::endl;
-			parse_manifests(content_xml_->get_content());
-
-			_CP_LOG << L"[info] parse settings" << std::endl;
-			parse_settings(content_xml_->get_content());
-
-			tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath());
-		}
-	}
+    _CP_LOG << L"[info] parse settings" << std::endl;
+    parse_settings();
 
 	UpdateProgress(400000);
 }
-odf_document::Impl::~Impl()
-{
-	if (!tmp_folder_.empty())
-		NSDirectory::DeleteDirectory(tmp_folder_);
-}
-const std::wstring & odf_document::Impl::get_folder() const 
-{
-	if (!base_folder_.empty())	return base_folder_; 
-	else return tmp_folder_;
-}
+
 bool odf_document::Impl::UpdateProgress(long nComplete)
 {
 	if (pCallBack)
@@ -237,11 +162,17 @@ bool odf_document::Impl::UpdateProgress(long nComplete)
 	return false;
 }
 
-void odf_document::Impl::parse_fonts(office_element *element)
+void odf_document::Impl::parse_fonts()
 {
     do 
     {
-        office_document_base * document = dynamic_cast<office_document_base *>( element );
+        if (!content_xml_)
+        {
+            _CP_LOG << L"[warning] empty content xml\n";
+            break;
+        }
+
+        office_document_base * document = dynamic_cast<office_document_base *>( content_xml_->get_content() );
         if (!document)
         {
             _CP_LOG << L"[warning] empty document\n";
@@ -305,12 +236,15 @@ void odf_document::Impl::parse_fonts(office_element *element)
     }
     while (0);
 }
-void odf_document::Impl::parse_manifests(office_element *element)
+void odf_document::Impl::parse_manifests()
 {
-    office_document_base * document = dynamic_cast<office_document_base *>( element );
+	if (!manifest_xml_)return;
+
+    office_document_base * document = dynamic_cast<office_document_base *>( manifest_xml_->get_content() );
     
 	if (!document)return;
 
+	int res =-1;
 	for (size_t i = 0; i < document->manifests_.size(); i++)
 	{	
 		office_element_ptr & elm = document->manifests_[i];
@@ -318,44 +252,34 @@ void odf_document::Impl::parse_manifests(office_element *element)
 		manifest_entry * entry = dynamic_cast<manifest_entry *>(elm.get());
 		if (!entry)continue;
 
-		if (entry->full_path_ == L"content.xml" && entry->encryption_) encrypted = true;
+		if (entry->full_path_==L"content.xml" && entry->encryption_) encrypted = true;
 
-		if (entry->full_path_ == L"/")
+		if (entry->full_path_==L"/")
 		{
-			if (std::wstring::npos != entry->media_type_.find(L"application/vnd.oasis.opendocument.text"))
+			res = entry->media_type_.find(L"application/vnd.oasis.opendocument.text");
+			if (res>=0)
 			{
 				office_mime_type_ = 1;
 			}
-			else if (std::wstring::npos != entry->media_type_.find(L"application/vnd.oasis.opendocument.spreadsheet"))
+			res = entry->media_type_.find(L"application/vnd.oasis.opendocument.spreadsheet");
+			if (res>=0)
 			{
 				office_mime_type_ = 2;
 			}
-			else if (std::wstring::npos != entry->media_type_.find(L"application/vnd.oasis.opendocument.presentation"))
+			res = entry->media_type_.find(L"application/vnd.oasis.opendocument.presentation");
+			if (res>=0)
 			{
 				office_mime_type_ = 3;
 			}
 		}
 	}
-	if (!office_mime_type_ && !document->office_mimetype_.empty())
-	{
-		if (std::wstring::npos != document->office_mimetype_.find(L"application/vnd.oasis.opendocument.text"))
-		{
-			office_mime_type_ = 1;
-		}
-		else if (std::wstring::npos != document->office_mimetype_.find(L"application/vnd.oasis.opendocument.spreadsheet"))
-		{
-			office_mime_type_ = 2;
-		}
-		else if (std::wstring::npos != document->office_mimetype_.find(L"application/vnd.oasis.opendocument.presentation"))
-		{
-			office_mime_type_ = 3;
-		}
-	}
 }
 
-void odf_document::Impl::parse_settings(office_element *element)
+void odf_document::Impl::parse_settings()
 {
-	office_document_base * document = dynamic_cast<office_document_base *>( element );
+	if (!settings_xml_)return;
+   
+	office_document_base * document = dynamic_cast<office_document_base *>( settings_xml_->get_content() );
 	if (!document)	return;
 
 	office_settings * settings = dynamic_cast<office_settings*>(document->office_settings_.get());
@@ -434,14 +358,20 @@ void odf_document::Impl::parse_settings(office_element *element)
 }
 }
 
-void odf_document::Impl::parse_styles(office_element *element)
+void odf_document::Impl::parse_styles()
 {
     do
     {
-        office_document_base * document = dynamic_cast<office_document_base *>( element );
+        if (!styles_xml_)
+        {
+            _CP_LOG << L"[warning] empty styles xml\n";
+            break;
+        }
+
+        office_document_base * document = dynamic_cast<office_document_base *>( styles_xml_->get_content() );
         if (!document)
         {
-            _CP_LOG << L"[warning] empty styles\n";
+            _CP_LOG << L"[warning] empty document\n";
             break;
         }
        

ASCOfficeOdfFile/src/odf/odf_document_impl.h

@@ -54,19 +54,16 @@ class odf_document::Impl
 {
 public:
     Impl(const std::wstring & Folder, const ProgressCallback* CallBack);
-	Impl(xml::sax * Reader);
-	virtual ~Impl();
-
     odf_read_context & odf_context();
    
 	bool docx_convert(oox::docx_conversion_context & Context);
     bool xlsx_convert(oox::xlsx_conversion_context & Context);
     bool pptx_convert(oox::pptx_conversion_context & Context);
 
-    const std::wstring & get_folder() const;
+    const std::wstring & get_folder() const { return base_folder_; }
    
-	const office_element * get_content() const;
-		  office_element * get_content();
+	const	office_element * get_content() const;
+		office_element * get_content();
 
 	long get_office_mime_type() {return office_mime_type_;}
 
@@ -80,20 +77,20 @@ private:
    
 	odf_read_context_ptr context_;
     
-	void parse_styles	(office_element *element);
-    void parse_fonts	(office_element *elemen);
-	void parse_manifests(office_element *element);
-    void parse_settings	(office_element *element);
+	void parse_styles();
+    void parse_fonts();
+	void parse_manifests();
+    void parse_settings();
 
+private:
     content_xml_t_ptr content_xml_;
     content_xml_t_ptr styles_xml_;
     content_xml_t_ptr meta_xml_;
     content_xml_t_ptr settings_xml_;
     content_xml_t_ptr manifest_xml_;
 
+private:
     std::wstring base_folder_;
-    std::wstring tmp_folder_;
-
 	long office_mime_type_;
 	bool encrypted;
             

ASCOfficeOdfFile/src/odf/office_binary_data.cpp

@@ -61,34 +61,7 @@ void office_binary_data::add_child_element( xml::sax * Reader, const std::wstrin
 
 void office_binary_data::add_text(const std::wstring & Text)
 {
-	base64Binary_ = std::string(Text.begin(), Text.end());
-}
-
-std::wstring office_binary_data::write_to(const std::wstring & path)
-{
-	std::wstring result;
-
-	NSFile::CBase64Converter base64;
-	int nLength = 0;
-	unsigned char *pData = NULL;
-
-	NSFile::CBase64Converter::Decode(base64Binary_.c_str(), base64Binary_.length(), pData, nLength);
-	if (pData)
-	{
-		NSFile::CFileBinary file;
-
-		std::wstring bin_file = file.CreateTempFileWithUniqueName(path + FILE_SEPARATOR_STR, L"bin");
-		if (file.CreateFileW(bin_file))
-		{
-			file.WriteFile(pData, nLength);
-			file.CloseFile();
-
-			int pos = bin_file.rfind(FILE_SEPARATOR_STR);
-			result = bin_file.substr(pos + 1);
-		}
-		delete []pData; pData = NULL;
-	}
-	return result;
+    base64Binary_ = Text;
 }
 
 }

ASCOfficeOdfFile/src/odf/office_binary_data.h

@@ -53,15 +53,17 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
+public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
-	std::wstring write_to(const std::wstring & path);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
-    virtual void add_text(const std::wstring & Text);    
+    virtual void add_text(const std::wstring & Text);
+
+private:
+    std::wstring base64Binary_;
     
-	std::string base64Binary_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(office_binary_data);

ASCOfficeOdfFile/src/odf/office_chart.cpp

@@ -63,10 +63,9 @@ void chart_chart_attlist::add_attributes( const xml::attributes_wc_ptr & Attribu
     common_draw_size_attlist_.add_attributes(Attributes);
     common_attlist_.add_attributes(Attributes);
     
-	CP_APPLY_ATTR(L"chart:class",				chart_class_, std::wstring(L""));
-	CP_APPLY_ATTR(L"chart:column-mapping",		chart_column_mapping_);
-    CP_APPLY_ATTR(L"chart:row-mapping",			chart_row_mapping_);
-    CP_APPLY_ATTR(L"loext:data-pilot-source",	loext_data_pilot_source_);
+	CP_APPLY_ATTR(L"chart:class", chart_class_, std::wstring(L""));
+	CP_APPLY_ATTR(L"chart:column-mapping", chart_column_mapping_);
+    CP_APPLY_ATTR(L"chart:row-mapping", chart_row_mapping_);
 }
 
 // chart:chart
@@ -76,7 +75,7 @@ const wchar_t * chart_chart::name = L"chart";
 
 void chart_chart::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_chart_attlist_.add_attributes(Attributes);
 }
 
 void chart_chart::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -98,7 +97,7 @@ const wchar_t * chart_title::name = L"title";
 
 void chart_title::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_title_attlist_.add_attributes(Attributes);
 }
 
 void chart_title::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -118,7 +117,7 @@ const wchar_t * chart_subtitle::name = L"subtitle";
 
 void chart_subtitle::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_title_attlist_.add_attributes(Attributes);
 }
 
 void chart_subtitle::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -158,7 +157,7 @@ const wchar_t * chart_legend::name = L"legend";
 
 void chart_legend::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_legend_attlist_.add_attributes(Attributes);
 }
 
 void chart_legend::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -195,7 +194,7 @@ const wchar_t * chart_plot_area::name = L"plot-area";
 
 void chart_plot_area::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_plot_area_attlist_.add_attributes(Attributes);
 }
 
 void chart_plot_area::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -218,7 +217,7 @@ const wchar_t * chart_wall::name = L"wall";
 
 void chart_wall::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_wall_attlist_.add_attributes(Attributes);
 }
 
 void chart_wall::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -257,7 +256,7 @@ const wchar_t * chart_axis::name = L"axis";
 
 void chart_axis::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_axis_attlist_.add_attributes(Attributes);
 }
 
 void chart_axis::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -280,7 +279,7 @@ const wchar_t * chart_grid::name = L"grid";
 
 void chart_grid::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_grid_attlist_.add_attributes(Attributes);
 }
 
 void chart_grid::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -307,12 +306,11 @@ void chart_categories::add_child_element( xml::sax * Reader, const std::wstring
 
 void chart_series_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"chart:values-cell-range-address",	chart_values_cell_range_address_);
-    CP_APPLY_ATTR(L"chart:label-cell-address",			chart_label_cell_address_);
-    CP_APPLY_ATTR(L"chart:class",						chart_class_);
-    CP_APPLY_ATTR(L"chart:attached-axis",				chart_attached_axis_);
-   
-	common_attlist_.add_attributes(Attributes);
+    CP_APPLY_ATTR(L"chart:values-cell-range-address", chart_values_cell_range_address_);
+    CP_APPLY_ATTR(L"chart:label-cell-", chart_label_cell_address_);
+    CP_APPLY_ATTR(L"chart:class", chart_class_);
+    CP_APPLY_ATTR(L"chart:attached-axis", chart_attached_axis_);
+    common_attlist_.add_attributes(Attributes);
 }
 
 // chart:categories
@@ -322,7 +320,7 @@ const wchar_t * chart_series::name = L"series";
 
 void chart_series::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_series_attlist_.add_attributes(Attributes);
 }
 
 void chart_series::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -360,7 +358,7 @@ const wchar_t * chart_data_point::name = L"data-point";
 
 void chart_data_point::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    attlist_.add_attributes(Attributes);
+    chart_data_point_attlist_.add_attributes(Attributes);
 }
 
 void chart_data_point::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)

ASCOfficeOdfFile/src/odf/office_chart.h

@@ -82,12 +82,12 @@ class chart_chart_attlist
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
+public:
     odf_types::common_draw_size_attlist	common_draw_size_attlist_;
     common_chart_attlist				common_attlist_;
     std::wstring						chart_class_;
     _CP_OPT(std::wstring)				chart_column_mapping_;
     _CP_OPT(std::wstring)				chart_row_mapping_;
-	_CP_OPT(std::wstring)				loext_data_pilot_source_;
 };
 
 //  chart:chart
@@ -105,8 +105,8 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_chart_attlist			attlist_;
-	office_element_ptr_array	content_;
+    chart_chart_attlist chart_chart_attlist_;
+	office_element_ptr_array content_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(chart_chart);
@@ -139,7 +139,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_title_attlist attlist_;
+    chart_title_attlist chart_title_attlist_;
     office_element_ptr	text_p_;
 };
 
@@ -160,8 +160,8 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_title_attlist	attlist_;
-    office_element_ptr	text_p_;
+    chart_title_attlist chart_title_attlist_;
+    office_element_ptr text_p_;
 
 };
 
@@ -183,7 +183,7 @@ private:
 
 public:
     common_chart_attlist		common_attlist_;
-	office_element_ptr			text_p_;
+	office_element_ptr text_p_;
 
 };
 
@@ -195,11 +195,11 @@ public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-    _CP_OPT(std::wstring)		chart_legend_position_;
-    _CP_OPT(std::wstring)		chart_legend_align_;
+    _CP_OPT(std::wstring) chart_legend_position_;
+    _CP_OPT(std::wstring) chart_legend_align_;
     odf_types::common_draw_position_attlist common_draw_position_attlist_;
-    _CP_OPT(std::wstring)		style_legend_expansion_;
-    _CP_OPT(double)				style_legend_expansion_aspect_ratio_;
+    _CP_OPT(std::wstring) style_legend_expansion_;
+    _CP_OPT(double) style_legend_expansion_aspect_ratio_;
     common_chart_attlist		common_attlist_;
 
 };
@@ -219,7 +219,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_legend_attlist attlist_;
+    chart_legend_attlist chart_legend_attlist_;
 
 };
 
@@ -234,7 +234,7 @@ public:
 public:
     odf_types::common_draw_position_attlist common_draw_position_attlist_;
     odf_types::common_draw_size_attlist		common_draw_size_attlist_;
-    common_chart_attlist					common_attlist_;
+    common_chart_attlist			common_attlist_;
     
 	_CP_OPT(std::wstring) table_cell_range_address_;
     _CP_OPT(std::wstring) chart_data_source_has_labels_;
@@ -257,8 +257,9 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_plot_area_attlist		attlist_;
-	office_element_ptr_array	content_;
+    chart_plot_area_attlist chart_plot_area_attlist_;
+
+	office_element_ptr_array content_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(chart_plot_area);
@@ -269,7 +270,7 @@ public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-    _CP_OPT(odf_types::length)	svg_width_;
+    _CP_OPT(odf_types::length)				svg_width_;
     common_chart_attlist		common_attlist_;
 
 };
@@ -288,7 +289,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_wall_attlist	attlist_;
+    chart_wall_attlist	chart_wall_attlist_;
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(chart_wall);
@@ -309,7 +310,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    common_chart_attlist	common_attlist_;
+    common_chart_attlist		common_attlist_;
 
 };
 
@@ -321,8 +322,8 @@ public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
 public:
-    _CP_OPT(std::wstring)		chart_dimension_;
-    _CP_OPT(std::wstring)		chart_name_;
+    _CP_OPT(std::wstring) chart_dimension_;
+    _CP_OPT(std::wstring) chart_name_;
     common_chart_attlist		common_attlist_;
 };
 
@@ -341,8 +342,9 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_axis_attlist			attlist_;
-    office_element_ptr_array	content_; 
+    chart_axis_attlist chart_axis_attlist_;
+
+    office_element_ptr_array content_; 
 
 };
 
@@ -374,7 +376,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_grid_attlist attlist_;
+    chart_grid_attlist chart_grid_attlist_;
 
 };
 
@@ -430,8 +432,9 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_series_attlist		attlist_;
-	office_element_ptr_array	content_;
+    chart_series_attlist chart_series_attlist_;
+
+	office_element_ptr_array content_;
 
 };
 
@@ -483,7 +486,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    chart_data_point_attlist attlist_;
+    chart_data_point_attlist chart_data_point_attlist_;
 
 };
 
@@ -547,8 +550,8 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    common_chart_attlist	common_attlist_;
-	_CP_OPT(bool)			display_r_square_;
+    common_chart_attlist		common_attlist_;
+	_CP_OPT(bool) display_r_square_;
 
 };
 

ASCOfficeOdfFile/src/odf/office_document.h

@@ -41,6 +41,7 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
+//  office_document_base
 class office_document_base  : public office_element
 {
 public:
@@ -66,8 +67,6 @@ public:
     
 	// office-document-attrs
     // office-document-common-attrs
-    office_element_ptr			office_body_;				// office-body
-
     office_element_ptr			office_meta_;				// office-meta
     office_element_ptr			office_settings_;			// office-settings
     office_element_ptr			office_scripts_;
@@ -76,9 +75,14 @@ public:
     office_element_ptr			office_styles_;				// office-styles
     office_element_ptr			office_automatic_styles_;	// office-automatic-styles
     office_element_ptr			office_master_styles_;		// office-master-styles
- 	office_element_ptr_array	manifests_;					// manifests   
+ 	office_element_ptr_array	manifests_;					// manifests
+   
+
+public:
+    office_element_ptr office_body_; // office-body
 
     friend class odf_document;
+
 };
 
 

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -190,7 +190,6 @@ enum ElementType
 
     typeStyleFontFace,
 
-    typeSvgDesc,
     typeSvgFontFaceUri,
     typeSvgFontFaceFormat,
     typeSvgFontFaceName,
@@ -235,9 +234,7 @@ enum ElementType
 	typeTableDatabaseSourceQuery,
 	typeTableDatabaseSourceSql,
 	typeTableSourceCellRange,
-	typeTableSourceCellRanges,
 	typeTableSourceService,
-	typeTableDataPilotGrandTotal,
 	typeTableDataPilotSubtotals,
 	typeTableDataPilotSubtotal,
 	typeTableDataPilotGroupMember,
@@ -346,13 +343,6 @@ enum ElementType
 	typeDrawHandle,
 	typeDrawEquation,
 
-	typeDr3dScene,
-	typeDr3dLight,
-	typeDr3dExtrude,
-	typeDr3dCube,
-	typeDr3dRotate,
-	typeDr3dSphere,
-
 	typeDrawPage,    
 	typePresentationFooterDecl,
 	typePresentationDateTimeDecl,

ASCOfficeOdfFile/src/odf/office_spreadsheet.cpp

@@ -88,13 +88,13 @@ void office_spreadsheet::xlsx_convert(oox::xlsx_conversion_context & Context)
 	if (database_ranges_)
 		database_ranges_->xlsx_convert(Context);
 
-	if (data_pilot_tables_)
-		data_pilot_tables_->xlsx_convert(Context);
-	
 	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->xlsx_convert(Context);
-    }        
+    }
+        
+	if (data_pilot_tables_)
+		data_pilot_tables_->xlsx_convert(Context);
 
 	Context.end_office_spreadsheet();
 }

ASCOfficeOdfFile/src/odf/paragraph_elements.cpp

@@ -86,42 +86,19 @@ void text::add_text(const std::wstring & Text)
 
 void text::docx_convert(oox::docx_conversion_context & Context)
 {
-	if (Context.get_process_note() != oox::docx_conversion_context::noNote && 
-		Context.get_delete_text_state()) 
-			return; //в ms нет рецензирования notes
-
-	bool add_del_run = false;
-	if (Context.get_drawing_state_content() && Context.get_delete_text_state())
-	{	//0503IG-AddingFormattingText.odt - удаленый текст в удаленом объекте
-
-		oox::text_tracked_context::_state  &state = Context.get_text_tracked_context().get_tracked_change(L"");
-		if (state.type == 2)
-		{
-			add_del_run = true;
-			Context.output_stream() << L"<w:del>";
-		}
-	}  
-	
-	Context.add_element_to_run();
+    Context.add_element_to_run();
+	std::wostream & strm = Context.output_stream();
   
 	std::wstring textNode = L"w:t";
-
 	if (Context.get_delete_text_state()) textNode = L"w:delText";
 
-	Context.output_stream() << L"<" << textNode;
+	strm << L"<" << textNode;
 	if (preserve_ && !Context.get_delete_text_state()) 
-		Context.output_stream() << L" xml:space=\"preserve\"";
-	Context.output_stream() << L">";
-
-	Context.output_stream() << xml::utils::replace_text_to_xml( text_ );
-    Context.output_stream() << L"</" << textNode << L">";
-
-	if (add_del_run)
-	{
-		Context.finish_run();
-		Context.output_stream() << L"</w:del>";
-	}
+		strm << L" xml:space=\"preserve\"";
+	strm << L">";
 
+	strm << xml::utils::replace_text_to_xml( text_ );
+    strm << L"</" << textNode << L">";
 }
 
 void text::xlsx_convert(oox::xlsx_conversion_context & Context)

ASCOfficeOdfFile/src/odf/style_text_properties.cpp

@@ -318,30 +318,8 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
 		CP_XML_NODE(node)//a:rPr & a:defRPr
 		{
 	//attr
-			if (fo_language_ || style_language_asian_ || style_language_complex_)
-			{
-				std::wstring w_val;
-				if (fo_language_)	
-				{
-					w_val = *fo_language_;
-					if (fo_country_) w_val += L"-" + *fo_country_;
-				}
-				else if (style_language_asian_)	
-				{
-					w_val = *style_language_asian_;
-					if (style_country_asian_) w_val += L"-" + *style_country_asian_;
-				}
-				else if (style_language_complex_)
-				{
-					w_val = *style_language_complex_;
-					if (style_country_complex_)w_val += L"-" + *style_country_complex_;
-				}
-
-				if (w_val.empty() == false)
-				{
-					CP_XML_ATTR(L"lang",  w_val);
-				}
-			}
+			const int W = process_font_weight(fo_font_weight_);
+			if (W > 0) CP_XML_ATTR(L"b", true);
 			
 			const int fontStyle = process_font_style(fo_font_style_);
 			if (fontStyle > 0) CP_XML_ATTR(L"i", true);
@@ -376,9 +354,6 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
 					CP_XML_ATTR(L"cap", "small");
 				}
 			}
-			const int W = process_font_weight(fo_font_weight_);
-			if (W > 0) CP_XML_ATTR(L"b", true);
-
 		// underline
 			line_width under	=	style_text_underline_width_.get_value_or(line_width::Auto);
 			bool underlineBold	=	under.get_type() == line_width::Bold	|| 
@@ -458,6 +433,18 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
 				CP_XML_ATTR(L"spc",(int)(20.0 * fo_letter_spacing_->get_length().get_value_unit(length::pt)));
 			}
 		
+			if (fo_language_ || style_language_asian_ || style_language_complex_)
+			{
+				std::wstring w_val;
+				if		(fo_language_)				w_val = *fo_language_;
+				else if (fo_country_)				w_val = *fo_country_;
+				else if (style_country_asian_)		w_val = *style_country_asian_;
+				else if (style_language_asian_)		w_val = *style_language_asian_;
+				else if (style_language_complex_)	w_val = *style_language_complex_;
+				else if (style_country_complex_)	w_val = *style_country_complex_;
+
+				CP_XML_ATTR(L"lang",  w_val);
+			}
 			if (style_text_position_)
 			{
 				if (style_text_position_->get_type() == text_position::Percent)

ASCOfficeOdfFile/src/odf/svg_parser.cpp

@@ -790,7 +790,7 @@ namespace svg_path
             }
         }
 
-        if ((aCurrPoly.points.size() > 0/* || !bIsClosed*/) && !aCurrPoly.command.empty() && aCurrPoly.command != L"a:cubicBezTo")
+        if ((aCurrPoly.points.size() > 0 || !bIsClosed) && !aCurrPoly.command.empty() && aCurrPoly.command != L"a:cubicBezTo")
         {
             // end-process last poly
 

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.cpp

@@ -54,6 +54,7 @@ void table_data_pilot_tables::add_child_element( xml::sax * Reader, const std::w
 }
 void table_data_pilot_tables::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
+	return;
     for (size_t i = 0; i < content_.size(); i++)
     {
 		content_[i]->xlsx_convert(Context);
@@ -68,11 +69,11 @@ void table_data_pilot_table::add_attributes( const xml::attributes_wc_ptr & Attr
 	CP_APPLY_ATTR(L"table:name"						, table_name_);
 	CP_APPLY_ATTR(L"table:application-data"			, table_application_data_);
     CP_APPLY_ATTR(L"table:buttons"					, table_buttons_);
-    CP_APPLY_ATTR(L"table:drill-down-on-double-click", table_drill_down_ondouble_click_);
+    CP_APPLY_ATTR(L"table:drill-down-ondouble-click", table_drill_down_ondouble_click_);
     CP_APPLY_ATTR(L"table:grand-total"				, table_grand_total_);
     CP_APPLY_ATTR(L"table:identify-categories"		, table_identify_categories_);
     CP_APPLY_ATTR(L"table:ignore-empty-rows"		, table_ignore_empty_rows_);
-    CP_APPLY_ATTR(L"table:show-filter-button"		, table_show_filter_button_, true);
+    CP_APPLY_ATTR(L"table:show-filter-button"		, table_show_filter_button_);
 	CP_APPLY_ATTR(L"table:target-range-address"		, table_target_range_address_);
 
 }
@@ -81,8 +82,6 @@ void table_data_pilot_table::add_child_element( xml::sax * Reader, const std::ws
 {
 	if (L"table" == Ns && L"data-pilot-field" == Name)
 		CP_CREATE_ELEMENT (fields_);
-	else if (L"tableooo" == Ns && L"data-pilot-grand-total" == Name)
-		CP_CREATE_ELEMENT (grand_total_);
 	else
 		CP_CREATE_ELEMENT (source_);
 
@@ -91,56 +90,39 @@ void table_data_pilot_table::xlsx_convert(oox::xlsx_conversion_context & Context
 {
 	if (!source_) return;
 
-	formulasconvert::odf2oox_converter formulas_converter;
+	int table_index = -1;
 
 	Context.get_pivots_context().start_table();
 
 	source_->xlsx_convert(Context);
 
-	std::wstring sheet_name;
-
-	if (table_name_) Context.get_pivots_context().set_view_name(*table_name_);
+	if (table_name_)	Context.get_pivots_context().set_view_name(*table_name_);
 	if (table_target_range_address_)
 	{
+		formulasconvert::odf2oox_converter formulas_converter;
+		
 		std::wstring ref = formulas_converter.convert_named_ref(*table_target_range_address_, false);
-		sheet_name = formulas_converter.get_table_name();
+		std::wstring table_name = formulas_converter.get_table_name();
+
+		table_index = Context.find_sheet_by_name(table_name);
 
 		Context.get_pivots_context().set_view_target_range(ref);
-		Context.get_pivots_context().set_view_target_table_name(sheet_name);
+		//Context.get_pivots_context().set_view_target_table(table_index);
 	}
 
-	if (table_buttons_)
-	{
-		std::vector<std::wstring> headers;
-		formulas_converter.split_distance_by(*table_buttons_, L" ", headers);
-
-		for (size_t i = table_show_filter_button_ ? 1 : 0; i < headers.size(); i++)
-		{
-			std::wstring ref = formulas_converter.convert_named_ref(headers[i], false);
-			Context.get_pivots_context().add_button_header(ref);
-		}
-	}
-	if (table_identify_categories_)
-		Context.get_pivots_context().set_identify_categories(table_identify_categories_->get());
-
-	if (table_drill_down_ondouble_click_)
-		Context.get_pivots_context().set_drill(table_drill_down_ondouble_click_->get());
-
 	for (size_t i = 0; i < fields_.size(); i++)
 	{
 		fields_[i]->xlsx_convert(Context);
 	}	  
 
-	int index_table_view = Context.get_pivots_context().end_table();
+	int index_view = Context.get_pivots_context().end_table();
 	
-	if (index_table_view < 0)
-		return;
-
-	if (0 == sheet_name.find(L"'"))
+	if (index_view > 0)
 	{
-		sheet_name = sheet_name.substr(1, sheet_name.length() - 2);
-	}
-	Context.add_pivot_sheet_source(sheet_name, index_table_view);
+		Context.current_sheet(table_index).sheet_rels().add(oox::relationship(L"pvId" + std::to_wstring(index_view),
+			L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable",
+			L"../pivotTables/pivotTable" + std::to_wstring(index_view) + L".xml"));
+	} 
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_field::ns		= L"table";
@@ -168,26 +150,18 @@ void table_data_pilot_field::add_child_element( xml::sax * Reader, const std::ws
 }
 void table_data_pilot_field::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	int field_type		= table_orientation_.get_value_or(table_orientation::data).get_type(); //?? default type ????
-	int field_hierarchy = table_used_hierarchy_.get_value_or(-1); 
-
 	Context.get_pivots_context().start_field();
 	
 	Context.get_pivots_context().set_field_name(table_source_field_name_.get_value_or(L""));
-	
-	if (table_is_data_layout_field_)
-		Context.get_pivots_context().set_field_data_layout(table_is_data_layout_field_->get());
-	
+	Context.get_pivots_context().set_field_type(table_orientation_.get_value_or(table_orientation::hidden).get_type());
+
 	if (table_function_)
 	{
 		table_function::type type = table_function_->get_type();
 
 		if (type == table_function::String)
 		{
-			formulasconvert::odf2oox_converter formulas_converter;
-
-			std::wstring user_funtion = formulas_converter.convert(table_function_->get_string());
-			Context.get_pivots_context().set_field_user_function(user_funtion);
+			Context.get_pivots_context().set_field_user_function(table_function_->get_string());
 		}
 		else
 		{
@@ -199,8 +173,6 @@ void table_data_pilot_field::xlsx_convert(oox::xlsx_conversion_context & Context
 	if (groups_)	groups_->xlsx_convert(Context);
 	if (level_)		level_->xlsx_convert(Context);
 
-	Context.get_pivots_context().set_field_type(field_type, field_hierarchy);
-	
 	Context.get_pivots_context().end_field();
 }
 //-------------------------------------------------------------------------------------------------
@@ -225,16 +197,13 @@ const wchar_t * table_database_source_table::name	= L"database-source-table";
 
 void table_database_source_table::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-	CP_APPLY_ATTR(L"table:database-name", table_database_name_);
-	CP_APPLY_ATTR(L"table:table-name"	, table_table_name_);
+	CP_APPLY_ATTR(L"table:database-name"		, table_database_name_);
+	CP_APPLY_ATTR(L"table:database-table-name"	, table_database_table_name_);
 }
 
 void table_database_source_table::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	if (table_database_name_)
-	{
-		Context.get_pivots_context().set_source_database(*table_database_name_, table_table_name_.get_value_or(L""));
-	}
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_database_source_query::ns		= L"table";
@@ -249,10 +218,7 @@ void table_database_source_query::add_attributes( const xml::attributes_wc_ptr &
 
 void table_database_source_query::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	if (table_database_name_)
-	{
-		Context.get_pivots_context().set_source_database_query(*table_database_name_, table_query_name_.get_value_or(L""));
-	}
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_database_source_sql::ns	= L"table";
@@ -267,12 +233,7 @@ void table_database_source_sql::add_attributes( const xml::attributes_wc_ptr & A
 
 void table_database_source_sql::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	//todoooo split data-base-ranges & pivots
 
-	if (table_database_name_)
-	{//table_parse_sql_statement_??
-		Context.get_pivots_context().set_source_database_sql(*table_database_name_, table_sql_statement_.get_value_or(L""));
-	}
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_source_cell_range::ns		= L"table";
@@ -300,26 +261,6 @@ void table_source_cell_range::xlsx_convert(oox::xlsx_conversion_context & Contex
 	}
 }
 //-------------------------------------------------------------------------------------------------
-const wchar_t * table_source_cell_ranges::ns	= L"table";
-const wchar_t * table_source_cell_ranges::name	= L"source-cell-ranges";
-
-void table_source_cell_ranges::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-	CP_APPLY_ATTR(L"table:cell-ranges-address", table_cell_ranges_address_);
-}
-void table_source_cell_ranges::xlsx_convert(oox::xlsx_conversion_context & Context)
-{
-	if (table_cell_ranges_address_)//??? split by ref
-	{
-		//formulasconvert::odf2oox_converter formulas_converter;
-		//
-		//std::wstring ref = formulas_converter.convert_named_ref(*table_cell_range_address_, false);
-		//std::wstring table_name = formulas_converter.get_table_name();
-
-		//Context.get_pivots_context().set_source_range(table_name, ref);
-	}
-}
-//-------------------------------------------------------------------------------------------------
 const wchar_t * table_source_service::ns	= L"table";
 const wchar_t * table_source_service::name	= L"source-service";
 
@@ -341,8 +282,7 @@ const wchar_t * table_data_pilot_level::name	= L"data-pilot-level";
 
 void table_data_pilot_level::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-	CP_APPLY_ATTR(L"table:show-empty", table_show_empty_);
-	CP_APPLY_ATTR(L"calcext:repeat-item-labels", calcext_repeat_item_labels_);
+	CP_APPLY_ATTR(L"table:show-empty-address", table_show_empty_);
 }
 void table_data_pilot_level::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
@@ -359,28 +299,22 @@ void table_data_pilot_level::add_child_element( xml::sax * Reader, const std::ws
 }
 void table_data_pilot_level::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	if (table_show_empty_)
-		Context.get_pivots_context().set_field_show_empty(table_show_empty_->get());
+	table_data_pilot_members*	members		= dynamic_cast<table_data_pilot_members*>(members_.get());
+	table_data_pilot_subtotals*	subtotals	= dynamic_cast<table_data_pilot_subtotals*>(subtotals_.get());
 	
-	if (calcext_repeat_item_labels_)
-		Context.get_pivots_context().set_repeat_item_labels(calcext_repeat_item_labels_->get());
-
-	if (members_)
-		members_->xlsx_convert(Context);
-
-	if (subtotals_)
-		subtotals_->xlsx_convert(Context);
-
-
-	table_data_pilot_sort_info *sort = dynamic_cast<table_data_pilot_sort_info*>(sort_info_.get());
-	if (sort)
+	for (size_t i = 0; members && i < members->content_.size(); i++)
 	{
-		Context.get_pivots_context().set_field_sort(sort->table_order_.get_value_or(table_order::ascending).get_type());
+		table_data_pilot_member* member	= dynamic_cast<table_data_pilot_member*>(members->content_[i].get());
+		if (member)
+			Context.get_pivots_context().add_field_cache(i, member->table_name_.get_value_or(L""));
 	}
-	
-	table_data_pilot_layout_info *layout = dynamic_cast<table_data_pilot_layout_info*>(layout_info_.get());
-	if (layout)
+	for (size_t i = 0; subtotals && i < subtotals->content_.size(); i++)
 	{
+		table_data_pilot_subtotal* subtotal	= dynamic_cast<table_data_pilot_subtotal*>(subtotals->content_[i].get());
+		if (subtotal)
+		{
+			Context.get_pivots_context().add_field_subtotal(subtotal->table_function_.get_value_or(table_function::Auto).get_type());
+		}
 	}
 }
 //-------------------------------------------------------------------------------------------------
@@ -403,10 +337,7 @@ void table_data_pilot_groups::add_child_element( xml::sax * Reader, const std::w
 }
 void table_data_pilot_groups::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	if (table_grouped_by_)
-		Context.get_pivots_context().set_field_groups(table_grouped_by_->get_type());
-
-	for (size_t i = 0; i < content_.size(); i++)
+    for (size_t i = 0; i < content_.size(); i++)
     {
 		content_[i]->xlsx_convert(Context);
 	}
@@ -458,7 +389,7 @@ void table_data_pilot_member::add_attributes( const xml::attributes_wc_ptr & Att
 
 void table_data_pilot_member::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	Context.get_pivots_context().add_field_cache(-1, table_name_.get_value_or(L""));
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_group_member::ns	= L"table";
@@ -499,21 +430,7 @@ void table_data_pilot_subtotal::add_attributes( const xml::attributes_wc_ptr & A
 
 void table_data_pilot_subtotal::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	Context.get_pivots_context().add_field_subtotal(table_function_.get_value_or(table_function::Auto).get_type());
-}
-//-------------------------------------------------------------------------------------------------
-const wchar_t * table_data_pilot_grand_total::ns	= L"tableooo";
-const wchar_t * table_data_pilot_grand_total::name	= L"data-pilot-grand-total";
 
-void table_data_pilot_grand_total::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-	CP_APPLY_ATTR(L"table:display"				, table_display_);
-	CP_APPLY_ATTR(L"table:orientation"			, table_orientation_);
-	//CP_APPLY_ATTR(L"table:display-name"		, table_display_name_);
-	CP_APPLY_ATTR(L"tableooo:display-name"		, table_display_name_);
-}
-void table_data_pilot_grand_total::xlsx_convert(oox::xlsx_conversion_context & Context)
-{
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_layout_info::ns	= L"table";
@@ -523,6 +440,10 @@ void table_data_pilot_layout_info::add_attributes( const xml::attributes_wc_ptr
 {
 	CP_APPLY_ATTR(L"table:add-empty-lines"	, table_add_empty_lines_);
 	CP_APPLY_ATTR(L"table:layout-mode"		, table_layout_mode_);
+}
+void table_data_pilot_layout_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_sort_info::ns		= L"table";
@@ -533,6 +454,10 @@ void table_data_pilot_sort_info::add_attributes( const xml::attributes_wc_ptr &
 	CP_APPLY_ATTR(L"table:data-field"	, table_data_field_);
 	CP_APPLY_ATTR(L"table:order"		, table_order_);
 	CP_APPLY_ATTR(L"table:sort-mode"	, table_sort_mode_);
+}
+void table_data_pilot_sort_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_display_info::ns	= L"table";
@@ -544,6 +469,10 @@ void table_data_pilot_display_info::add_attributes( const xml::attributes_wc_ptr
 	CP_APPLY_ATTR(L"table:display-member-mode"	, table_display_member_mode_);
 	CP_APPLY_ATTR(L"table:enabled"				, table_enabled_);
 	CP_APPLY_ATTR(L"table:member-count"			, table_member_count_);
+}
+void table_data_pilot_display_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 }
 }

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.h

@@ -46,7 +46,6 @@
 #include "datatypes/tabletype.h"
 #include "datatypes/tablefunction.h"
 #include "datatypes/tableorder.h"
-#include "datatypes/dategroup.h"
 
 namespace cpdoccore { 
 namespace odf_reader {
@@ -97,11 +96,10 @@ public:
      _CP_OPT(odf_types::grand_total)table_grand_total_;
      _CP_OPT(odf_types::Bool)		table_identify_categories_;
      _CP_OPT(odf_types::Bool)		table_ignore_empty_rows_;
-     bool							table_show_filter_button_;
+     _CP_OPT(odf_types::Bool)		table_show_filter_button_;
 	
 	office_element_ptr			source_;
 	office_element_ptr_array	fields_;
-	office_element_ptr			grand_total_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_table);
@@ -138,30 +136,6 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_field);
 //-------------------------------------------------------------------------------------
-
-class table_data_pilot_grand_total : public office_element_impl<table_data_pilot_grand_total>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-    static const xml::NodeType xml_type = xml::typeElement;
-    static const ElementType type = typeTableDataPilotGrandTotal;
-    CPDOCCORE_DEFINE_VISITABLE();
-   
-    virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-
-private:
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
-
-public:
-	_CP_OPT(std::wstring)					table_display_name_;
-	_CP_OPT(odf_types::Bool)				table_display_;
-	_CP_OPT(odf_types::table_orientation)	table_orientation_;
-};
-
-CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_grand_total );
-//-------------------------------------------------------------------------------------
 class table_data_pilot_field_reference : public office_element_impl<table_data_pilot_field_reference>
 {
 public:
@@ -204,7 +178,7 @@ private:
 
 public:
 	_CP_OPT(std::wstring)	table_database_name_;
-	_CP_OPT(std::wstring)	table_table_name_;
+	_CP_OPT(std::wstring)	table_database_table_name_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_source_table);
@@ -279,27 +253,6 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(table_source_cell_range);
 //-------------------------------------------------------------------------------------
-class table_source_cell_ranges : public office_element_impl<table_source_cell_ranges>
-{
-public:
-    static const wchar_t * ns;
-    static const wchar_t * name;
-    static const xml::NodeType xml_type = xml::typeElement;
-    static const ElementType type = typeTableSourceCellRanges;
-    CPDOCCORE_DEFINE_VISITABLE();
-   
-    virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-
-private:
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
-
-public:
-	_CP_OPT(std::wstring) table_cell_ranges_address_;
-};
-
-CP_REGISTER_OFFICE_ELEMENT2(table_source_cell_ranges);
-//-------------------------------------------------------------------------------------
 
 class table_source_service : public office_element_impl<table_source_service>
 {
@@ -344,7 +297,6 @@ private:
 
 public:
 	_CP_OPT(odf_types::Bool)	table_show_empty_;
-	_CP_OPT(odf_types::Bool)	calcext_repeat_item_labels_;
 
 	office_element_ptr	members_;  
 	office_element_ptr	subtotals_;  
@@ -371,13 +323,13 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-	_CP_OPT(std::wstring)			table_date_end_;
-	_CP_OPT(std::wstring)			table_date_start_;
-	_CP_OPT(std::wstring)			table_start;			//double 18.2 or auto.
-	_CP_OPT(std::wstring)			table_end_;				//double 18.2 or auto.
-	_CP_OPT(odf_types::date_group)	table_grouped_by_;		
-	_CP_OPT(std::wstring)			table_source_field_name_;
-	_CP_OPT(double)					table_step;
+	_CP_OPT(std::wstring)		table_date_end_;
+	_CP_OPT(std::wstring)		table_date_start_;
+	_CP_OPT(std::wstring)		table_start;			//double 18.2 or auto.
+	_CP_OPT(std::wstring)		table_end_;				//double 18.2 or auto.
+	_CP_OPT(std::wstring)		table_grouped_by_;		//seconds, minutes, hours, days, months, quarters or years.
+	_CP_OPT(std::wstring)		table_source_field_name_;
+	_CP_OPT(double)				table_step;
 	
 	office_element_ptr_array	content_;  
 };
@@ -526,7 +478,7 @@ public:
     static const ElementType type = typeTableDataLayoutInfo;
     CPDOCCORE_DEFINE_VISITABLE();
    
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context){}
+    virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
@@ -548,7 +500,7 @@ public:
     static const ElementType type = typeTableDataSortInfo;
     CPDOCCORE_DEFINE_VISITABLE();
    
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context){}
+    virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
@@ -571,7 +523,7 @@ public:
     static const ElementType type = typeTableDataDisplayInfo;
     CPDOCCORE_DEFINE_VISITABLE();
    
-	virtual void xlsx_convert(oox::xlsx_conversion_context & Context){}
+    virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -1248,7 +1248,7 @@ void text_changed_region::docx_convert(oox::docx_conversion_context & Context)
 	if (content_.empty() || !text_id_) return;
 
 	Context.get_text_tracked_context().start_change (*text_id_);
-
+	
 	for (size_t i = 0; i < content_.size(); i++)
 	{
 		content_[i]->docx_convert(Context);

ASCOfficeOdfFile/win32/cpcommon.vcproj

@@ -449,14 +449,6 @@
 				RelativePath="..\src\odf\datatypes\common_attlists.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\odf\datatypes\dategroup.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\odf\datatypes\dategroup.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\odf\datatypes\direction.cpp"
 				>

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -52,7 +52,7 @@ COfficePPTFile::~COfficePPTFile()
     CloseFile();
 }
 
-long COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring & password, bool &bMacros)
+long COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring & password)
 {
 	CloseFile();
 	
@@ -66,7 +66,6 @@ long COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring
     
 	pptReader->m_oDocumentInfo.m_strTmpDirectory	= m_strTempDirectory;
 	pptReader->m_oDocumentInfo.m_strPassword		= password;
-	pptReader->m_oDocumentInfo.m_bMacros			= bMacros;
 		
 	if	(pptReader->IsPowerPoint() == false) 
 	{ 
@@ -89,7 +88,6 @@ long COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring
 	//pptReader->ReadDocumentSummary();
 	pptReader->ReadDocument();
 
-	bMacros	= pptReader->m_oDocumentInfo.m_bMacros;
 	m_Status = READMODE;
 
 	return S_OK;
@@ -103,14 +101,14 @@ bool COfficePPTFile::CloseFile()
 	return S_OK;
 }
 
-HRESULT COfficePPTFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password, bool &bMacros)
+HRESULT COfficePPTFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password)
 {
     if (m_strTempDirectory.empty())
     {
         m_strTempDirectory = NSDirectory::GetTempPath();
     }
 
-    long nResult = OpenFile(sSrcFileName, password, bMacros);
+    long nResult = OpenFile(sSrcFileName, password);
 	if (nResult != S_OK)
     {
 		CloseFile();