fix previous commit

convert script text in toggle property in simple text

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -69,8 +69,13 @@ namespace OpenXmlContentTypes
     static const wchar_t* Tiff					=	L"image/tiff";
     static const wchar_t* Wmf					=	L"image/x-wmf";
     static const wchar_t* Bmp					=	L"image/bmp";
+	static const wchar_t* Pcz					=	L"image/x-pcz";
+}
+namespace DocPrContentTypes
+{
+    static const wchar_t* App			=	L"application/vnd.openxmlformats-officedocument.extended-properties+xml";
+    static const wchar_t* Core			=	L"application/vnd.openxmlformats-package.core-properties+xml";
 }
-
 namespace WordprocessingMLContentTypes
 {
 	// WordprocessingML content types
@@ -136,7 +141,7 @@ namespace OpenXmlNamespaces
 
 namespace OpenXmlRelationshipTypes
 {
-    static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+	static const wchar_t* CoreProperties		=	L"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
     static const wchar_t* ExtendedProperties	=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
 
     static const wchar_t* Theme					=	L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

@@ -47,30 +47,17 @@ namespace DocFileFormat
 
 		virtual ~ConversionContext()
 		{
-
 		}
 
-		// Adds a new RSID to the set
 		inline void AddRsid(const std::wstring& rsid)
 		{
 			if (AllRsids.find(rsid) == AllRsids.end())
 				AllRsids.insert(rsid);
 		}
 
-		inline WordDocument* GetDocument()
-		{
-			return _doc;
-		}
-
-		inline WordprocessingDocument* GetXmlDocument()
-		{
-			return _docx;
-		}
-	
-	public:
 		WordprocessingDocument*		_docx;	
 		WordDocument*				_doc;	
-		/// A set thta contains all revision ids.
+
 		std::set<std::wstring>		AllRsids;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -63,8 +63,16 @@ namespace DocFileFormat
 {
 	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
+		if (!doc || !docx) return S_FALSE;
+		
 		ConversionContext context( doc, docx );
 
+	//Write fontTable.xml
+		if (doc->FontTable)
+		{
+			FontTableMapping fontTableMapping( &context );
+			doc->FontTable->Convert( &fontTableMapping );
+		}
 	//Write styles.xml
 		if (doc->Styles)
 		{
@@ -107,14 +115,6 @@ namespace DocFileFormat
 				return S_FALSE;
 			}
 		}
-
-	//Write fontTable.xml
-		if (doc->FontTable)
-		{
-			FontTableMapping fontTableMapping( &context );
-			doc->FontTable->Convert( &fontTableMapping );
-		}
-
 		if ( progress != NULL )
 		{
 			progress->OnProgress( progress->caller, DOC_ONPROGRESSEVENT_ID, 875000 );

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

@@ -48,7 +48,8 @@ namespace DocFileFormat
 
   class FontFamilyName: public ByteStructure
   {
-    friend class CharacterPropertiesMapping;
+	friend class WordDocument;
+	friend class CharacterPropertiesMapping;
 	friend class DocumentMapping;
 	friend class FontTableMapping;
 	friend class StyleSheetMapping;

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -34,32 +34,30 @@
 
 namespace DocFileFormat
 {
-	FontTableMapping::FontTableMapping( ConversionContext* ctx ): AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
+	FontTableMapping::FontTableMapping( ConversionContext* ctx ) : AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
 	{
 		_ctx = ctx;
 	}
 
-	/*========================================================================================================*/
 
 	FontTableMapping::~FontTableMapping()
 	{
 		RELEASEOBJECT (m_pXmlWriter);
 	}
 
-	/*========================================================================================================*/
 
 	void FontTableMapping::Apply( IVisitable* visited )
 	{
 		StringTable<FontFamilyName>* table = static_cast<StringTable<FontFamilyName>*>( visited );
 
-		this->_ctx->_docx->RegisterFontTable();
+		_ctx->_docx->RegisterFontTable();
 
         m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
         m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
         m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
         m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
 
-		int sz_fonts	= table->Data.size();
+		int sz_fonts = table->Data.size();
 		int users_fonts = 0;
 
 		for ( std::vector<ByteStructure*>::iterator iter = table->Data.begin(); iter != table->Data.end(); iter++ )
@@ -140,6 +138,6 @@ namespace DocFileFormat
 
         m_pXmlWriter->WriteNodeEnd( L"w:fonts");
 
-		this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
+		_ctx->_docx->FontTableXML = m_pXmlWriter->GetXmlString() ;
 	}
 }

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -38,8 +38,8 @@ namespace DocFileFormat
 	{
 		if (m_context)
 		{
-			m_document		=	m_context->GetDocument();
-			m_xmldocument	=	m_context->GetXmlDocument();
+			m_document		=	m_context->_doc;
+			m_xmldocument	=	m_context->_docx;
 		}
 	}
 

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

@@ -110,6 +110,11 @@ namespace DocFileFormat
 			unused2		=	Reader->ReadByte();
 			unused3		=	Reader->ReadByte();
 
+			if (btMacOS != btWin32)
+			{
+				btWin32 = btMacOS = (Global::BlipType)this->Instance;
+			}
+
 			if (BodySize > 0x24)
 			{
 				Blip	=	RecordFactory::ReadRecord(Reader, 0);

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/MetafilePictBlip.h

@@ -192,14 +192,14 @@ public:
 	{
 		if (!bIsCompressed)
 		{
-			m_pMetaFile		= pCompress;
-			m_lMetaFileSize = lUncompressSize;
+			m_pMetaFile		= new BYTE[lCompressSize];
+			m_lMetaFileSize = lCompressSize;
+			memcpy(m_pMetaFile, pCompress, lCompressSize);
 		}
 		else
 		{
 			ULONG lSize = lUncompressSize;
 			m_pMetaFile = new BYTE[lUncompressSize];
-            //bool bRes	= NSZLib::Decompress(pCompress, (ULONG)lCompressSize, m_pMetaFile, lSize);
 
 			HRESULT res = S_OK;
 			COfficeUtils* pOfficeUtils = new COfficeUtils(NULL); 
@@ -340,6 +340,8 @@ typedef enum _BlipCompression
 
 			if (typeCode == 0xf01b)
 			{
+				oMetaFile.m_sExtension	= L".wmf";
+				
 				WmfPlaceableFileHeader oWmfHeader = {};
 				oMetaHeader.ToWMFHeader(&oWmfHeader);
 				
@@ -349,24 +351,12 @@ typedef enum _BlipCompression
 
 				oMetaFile.SetHeader(pMetaHeader, lLenHeader);	
 			}
-			
+			if (typeCode == 0xf01c)
+			{
+				oMetaFile.m_sExtension	= L".pcz";
+				//decompress???
+			}
 			oMetaFile.SetData(m_pvBits, oMetaHeader.cbSave, oMetaHeader.cbSize, 0 == oMetaHeader.compression);
-
-			//if (pos < sz)
-			//{
-			//	NSFile::CFileBinary oFile;
-
-			//	if (oFile.CreateFile(L"d:\\blop.dat"))
-			//	{
-			//		BYTE * d = Reader->ReadBytes( sz - pos, true );
-			//		if (d)
-			//		{
-			//			oFile.WriteFile (d, sz - pos);
-			//			delete []d;
-			//			oFile.CloseFile();
-			//		}
-			//	}
-			//}
 		}
 
 		virtual ~MetafilePictBlip()

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -64,6 +64,8 @@ namespace DocFileFormat
         DocumentContentTypesFile._defaultTypes.insert( make_pair( L"xml", std::wstring( OpenXmlContentTypes::Xml ) ) );
 
         MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId1"), OpenXmlRelationshipTypes::OfficeDocument, L"word/document.xml") );
+        MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId2"), OpenXmlRelationshipTypes::CoreProperties, L"docProps/core.xml") );
+        MainRelationshipsFile.Relationships.push_back( Relationship( std::wstring( L"rId3"), OpenXmlRelationshipTypes::ExtendedProperties, L"docProps/app.xml") );
 	}
 
 
@@ -164,7 +166,7 @@ namespace DocFileFormat
 				std::wstring path = L"ObjectPool/" + oleObjectFileStructure.objectID;
 
 				std::list<std::wstring> entries = storageInp->entries(path);
-				for (std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); it++)
+				for (std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it)
 				{
 					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + L"/"+ (*it));
 					if (stream_inp == NULL)continue;
@@ -195,14 +197,18 @@ namespace DocFileFormat
 		delete storageOut;
 		return S_OK;
 	}
-
-	int OpenXmlPackage::RegisterDocument()
+	void OpenXmlPackage::RegisterDocPr()
 	{
-        return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
+        AddPart( L"docProps", L"app.xml", DocPrContentTypes::App, L"");
+        AddPart( L"docProps", L"core.xml", DocPrContentTypes::Core, L"");
 	}
-	int OpenXmlPackage::RegisterDocumentMacros()
+	void OpenXmlPackage::RegisterDocument()
 	{
-        return AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocumentMacro, L"");
+        AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocument, L"");
+	}
+	void OpenXmlPackage::RegisterDocumentMacros()
+	{
+        AddPart( L"word", L"document.xml", WordprocessingMLContentTypes::MainDocumentMacro, L"");
 	}
 	int OpenXmlPackage::RegisterVbaProject()
 	{

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -165,8 +165,9 @@ namespace DocFileFormat
 		HRESULT SaveOLEObject		( const std::wstring& fileName, const OleObjectFileStructure& oleObjectFileStructure );
 		HRESULT SaveEmbeddedObject	( const std::wstring& fileName, const std::string& data );
 
-		int RegisterDocument();
-		int RegisterDocumentMacros();
+		void RegisterDocPr();
+		void RegisterDocument();
+		void RegisterDocumentMacros();
 		int RegisterFontTable();
 		int RegisterNumbering();
 		int RegisterSettings();

ASCOfficeDocFile/DocDocxConverter/StringTable.h

@@ -41,6 +41,7 @@ namespace DocFileFormat
 {
 	template<class T> class StringTable: public IVisitable
 	{
+		friend class WordDocument;
 		friend class CharacterPropertiesMapping;
 		friend class FontTableMapping;
 		friend class StyleSheetMapping;	

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -90,7 +90,7 @@ namespace DocFileFormat
 			std::list<std::wstring> entries, entries_sort;
 			entries = m_pStorage->entries_with_prefix( path );
 			
-			for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); it++ )
+			for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
 			{
 				std::wstring name = *it;
 				std::wstring fullname = path + name;
@@ -104,8 +104,8 @@ namespace DocFileFormat
 					entries_sort.push_front(name);
 				}
 			}
-			//for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
-			for( std::list<std::wstring>::iterator it = entries_sort.begin(); it != entries_sort.end(); it++ )
+			//for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); ++it )
+			for( std::list<std::wstring>::iterator it = entries_sort.begin(); it != entries_sort.end(); ++it )
 			{
 				std::wstring name = *it;
 				std::wstring fullname = path + name;

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -156,16 +156,16 @@ namespace DocFileFormat
 		file.CloseFile();
 
 		OOX::CPath path(sTempXmlFile);
-		OOX::CDocument docEmbedded(path, path);
+		OOX::CDocument docEmbedded(NULL, path, path);
 
 		bool res = false;
-		for (std::list<OOX::WritingElement*>::iterator it = docEmbedded.m_arrItems.begin(); it != docEmbedded.m_arrItems.end(); it++)
+        for (std::vector<OOX::WritingElement*>::iterator it = docEmbedded.m_arrItems.begin(); it != docEmbedded.m_arrItems.end(); ++it)
 		{
 			if ((*it)->getType() == OOX::et_w_p)
 			{
 				OOX::Logic::CParagraph *paragraph = dynamic_cast<OOX::Logic::CParagraph *>(*it);
 
-				for (std::list<OOX::WritingElement*>::iterator		jt = paragraph->m_arrItems.begin(); 
+                for (std::vector<OOX::WritingElement*>::iterator		jt = paragraph->m_arrItems.begin();
 													(paragraph) && (jt != paragraph->m_arrItems.end()); jt++)
 				{
 					if ((*jt)->getType() == OOX::et_m_oMath)
@@ -178,7 +178,7 @@ namespace DocFileFormat
 					{
 						OOX::Logic::COMathPara *mathPara = dynamic_cast<OOX::Logic::COMathPara *>(*jt);
 						
-						for (std::list<OOX::WritingElement*>::iterator kt = mathPara->m_arrItems.begin(); 
+                        for (std::vector<OOX::WritingElement*>::iterator kt = mathPara->m_arrItems.begin();
 														(mathPara) && (kt != mathPara->m_arrItems.end()); kt++)
 						{
 							if ((*kt)->getType() == OOX::et_m_oMath)
@@ -500,6 +500,7 @@ namespace DocFileFormat
 			{
 				case Global::msoblipEMF:
 				case Global::msoblipWMF:
+				case Global::msoblipPICT:
 				{
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(oBlipEntry->Blip);
 					if (metaBlip)
@@ -567,6 +568,9 @@ namespace DocFileFormat
 		case Global::msoblipWMF:
 			return std::wstring(L".wmf");
 
+		case Global::msoblipPICT:
+			return std::wstring(L".pcz");
+
 		default:
 			return std::wstring(L".png");
 		}
@@ -601,6 +605,9 @@ namespace DocFileFormat
 		case Global::msoblipWMF:
 			return std::wstring(OpenXmlContentTypes::Wmf);
 
+		case Global::msoblipPICT:
+			return std::wstring(OpenXmlContentTypes::Pcz);
+
 		case Global::msoblipDIB:
 			return std::wstring(OpenXmlContentTypes::Bmp);
 		

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1287,6 +1287,7 @@ namespace DocFileFormat
 			{
 			case Global::msoblipEMF:
 			case Global::msoblipWMF:
+			case Global::msoblipPICT:
 				{
 					//it's a meta image
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(RecordFactory::ReadRecord(&reader, 0));
@@ -1373,6 +1374,9 @@ namespace DocFileFormat
 			case Global::msoblipWMF:
 				return std::wstring( L".wmf" );
 
+			case Global::msoblipPICT:
+				return std::wstring( L".pcz" );
+
 			default:
 				return std::wstring( L".png" );
 		}

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -40,8 +40,45 @@
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/common/Directory.h"
 
+#include <unordered_map>
+
 namespace DocFileFormat
 {
+	static const int aCodePages[][2] = {
+		//charset	codepage
+		0,	1252, //ANSI
+		1,	0,//Default
+		2,	42,//Symbol
+		77,	10000,//Mac Roman
+		78,	10001,//Mac Shift Jis
+		79,	10003,//Mac Hangul
+		80,	10008,//Mac GB2312
+		81,	10002,//Mac Big5
+		83,	10005,//Mac Hebrew
+		84,	10004,//Mac Arabic
+		85,	10006,//Mac Greek
+		86,	10081,//Mac Turkish
+		87,	10021,//Mac Thai
+		88,	10029,//Mac East Europe
+		89,	10007,//Mac Russian
+		128,	932,//Shift JIS
+		129,	949,//Hangul
+		130,	1361,//Johab
+		134,	936,//GB2312
+		136,	950,//Big5
+		238,	1250,//Greek
+		161,	1253,//Greek
+		162,	1254,//Turkish
+		163,	1258,//Vietnamese
+		177,	1255,//Hebrew
+		178,	1256, //Arabic
+		186,	1257,//Baltic
+		204,	1251,//Russian
+		222,	874,//Thai
+		238,	1250,//Eastern European
+		254,	437,//PC 437
+		255,	850//OEM
+	};
 	WordDocument::WordDocument (const ProgressCallback* pCallFunc, const std::wstring & sTempFolder ) :	
 		m_PieceTable(NULL), WordDocumentStream(NULL), TableStream(NULL), DataStream(NULL),  FIB(NULL), 
 		Text(NULL), RevisionAuthorTable(NULL), FontTable(NULL), BookmarkNames(NULL), AutoTextNames(NULL), 
@@ -55,12 +92,15 @@ namespace DocFileFormat
 		AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL),
 		AnnotStartPlex(NULL), AnnotEndPlex(NULL), encryptionHeader(NULL)
 	{
-		m_pCallFunc			=	pCallFunc;	
-		m_sTempFolder		=	sTempFolder;
+		m_pCallFunc			= pCallFunc;	
+		m_sTempFolder		= sTempFolder;
 		
-		m_pStorage			=	NULL;
-		officeArtContent	=	NULL;
-		bOlderVersion		=	false;
+		m_pStorage			= NULL;
+		officeArtContent	= NULL;
+		bOlderVersion		= false;
+		
+		bDocumentCodePage	= false;
+		nDocumentCodePage	= ENCODING_WINDOWS_1250;
 	}
 
 	WordDocument::~WordDocument()
@@ -178,8 +218,6 @@ namespace DocFileFormat
 		
 		m_pStorage->GetStream (L"SummaryInformation",			&Summary);
 		m_pStorage->GetStream (L"DocumentSummaryInformation",	&DocSummary);
-
-		document_code_page = ENCODING_WINDOWS_1250;
 		
 		if ((Summary) && (Summary->size() > 0))
 		{
@@ -188,7 +226,10 @@ namespace DocFileFormat
 			int document_code_page1 = summary_info.GetCodePage(); //from software last open 
 			
 			if (document_code_page1 > 0)
-				document_code_page = document_code_page1;		
+			{
+				nDocumentCodePage = document_code_page1;		
+				bDocumentCodePage = true;
+			}
 		}
 		if ((DocSummary) && (DocSummary->size() > 0))
 		{
@@ -197,12 +238,18 @@ namespace DocFileFormat
 			int document_code_page2 = doc_summary_info.GetCodePage();
 
 			if (document_code_page2 > 0)
-				document_code_page = document_code_page2;
+			{
+				nDocumentCodePage = document_code_page2;
+				bDocumentCodePage = true;
+			}
 		}
 		if (!bOlderVersion)
-			document_code_page = ENCODING_UTF16;
+		{
+			nDocumentCodePage = ENCODING_UTF16;
+			bDocumentCodePage = true;
+		}
 
-		FIB->m_CodePage =  document_code_page;
+		FIB->m_CodePage =  nDocumentCodePage;
 //-------------------------------------------------------------------------------------------------
 		try
 		{
@@ -353,6 +400,31 @@ namespace DocFileFormat
 				return AVS_ERROR_FILEFORMAT;
 			}
 		}
+		if (!bDocumentCodePage && FontTable)
+		{
+			std::unordered_map<int, int> fonts_charsets;
+
+			for ( std::vector<ByteStructure*>::iterator iter = FontTable->Data.begin();!bDocumentCodePage &&  iter != FontTable->Data.end(); iter++ )
+			{
+				FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
+				if (!font) continue;
+
+				if (fonts_charsets.find(font->chs) == fonts_charsets.end())
+				{
+					fonts_charsets.insert(std::make_pair(font->chs, font->ff));
+					
+					for (int i = 0 ; i < sizeof(aCodePages) / 2; i++)
+					{
+						if (aCodePages[i][0] == font->chs && font->chs != 0)
+						{
+							nDocumentCodePage = aCodePages[i][1];
+							bDocumentCodePage = true;
+							break;
+						}
+					}	
+				}
+			}
+		}
 
 		if (FIB->m_FibWord97.lcbClx > 0)
 		{
@@ -371,7 +443,7 @@ namespace DocFileFormat
 			WordDocumentStream->read (bytes, cb);
 
 			Text = new std::vector<wchar_t>();
-			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, document_code_page);
+			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, nDocumentCodePage);
 
 			RELEASEARRAYOBJECTS(bytes);
 		}
@@ -487,7 +559,7 @@ namespace DocFileFormat
 
 		//std::list<std::string> listStream = storageIn->entries();
 
-		//for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); it++)
+		//for (std::list<std::string>::iterator it = listStream.begin(); it != listStream.end(); ++it)
 		//{
 		//	if (storageIn->isDirectory(*it)) 
 		//	{
@@ -531,7 +603,7 @@ namespace DocFileFormat
 		std::list<std::wstring> entries, entries_files, entries_dir;
 		entries = storageIn->entries_with_prefix( path );
 		
-		for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); it++ )
+		for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
 		{
 			std::wstring name = *it;
 			std::wstring fullname = path + name;

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -69,7 +69,6 @@ namespace DocFileFormat
 {
 	class WordDocument: public IVisitable
 	{
-		/*Mapping classes with direct access to the Word Document.*/
 		friend class FootnotesMapping;
 		friend class EndnotesMapping;
         friend class CommentsMapping;
@@ -98,7 +97,8 @@ namespace DocFileFormat
 		long LoadDocument (const std::wstring & fileName, const std::wstring & password);
 
 		bool	bOlderVersion;
-		int		document_code_page;
+		int		nDocumentCodePage;
+		bool	bDocumentCodePage;
 		
 		inline StructuredStorageReader* GetStorage() const
 		{

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -35,6 +35,10 @@
 #include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/common/Directory.h"
 
+#include "../../Common/DocxFormat/Source/DocxFormat/App.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
+
 namespace ImageHelper
 {
     struct __BITMAPINFOHEADER
@@ -211,6 +215,37 @@ namespace DocFileFormat
 		{
 			RegisterDocument();
 		}
+		OOX::CContentTypes oContentTypes;
+		OOX::CPath pathDocProps = m_strOutputPath + FILE_SEPARATOR_STR + _T("docProps");
+		NSDirectory::CreateDirectory(pathDocProps.GetPath());
+		
+		OOX::CPath DocProps = std::wstring(_T("docProps"));
+
+		OOX::CApp* pApp = new OOX::CApp(NULL);
+		if (pApp)
+		{
+			pApp->SetApplication(L"ONLYOFFICE");
+	#if defined(INTVER)
+			pApp->SetAppVersion(VALUE2STR(INTVER));
+	#endif
+			pApp->SetDocSecurity(0);
+			pApp->SetScaleCrop(false);
+			pApp->SetLinksUpToDate(false);
+			pApp->SetSharedDoc(false);
+			pApp->SetHyperlinksChanged(false);
+			
+			pApp->write(pathDocProps + FILE_SEPARATOR_STR + _T("app.xml"), DocProps, oContentTypes);
+			delete pApp;
+		}				
+		OOX::CCore* pCore = new OOX::CCore(NULL);
+		if (pCore)
+		{
+			pCore->SetCreator(_T(""));
+			pCore->SetLastModifiedBy(_T(""));
+			pCore->write(pathDocProps + FILE_SEPARATOR_STR + _T("core.xml"), DocProps, oContentTypes);
+			delete pCore;
+		} 
+		RegisterDocPr();
 
 		WritePackage();
 

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Urlmon.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				IgnoreDefaultLibraryNames=""
 				IgnoreEmbeddedIDL="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -372,7 +372,7 @@ public:
 class rPr
 {
 private:
-    std::map<std::wstring, int>& m_mapFonts;
+    boost::unordered_map<std::wstring, int>& m_mapFonts;
 public:
 	bool Bold;
 	bool Italic;
@@ -445,7 +445,7 @@ public:
 
 	bool bDoNotWriteNullProp;
 public:
-    rPr(std::map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
+    rPr(boost::unordered_map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
 	{
 		Reset();
 
@@ -1787,8 +1787,8 @@ w15:paraIdParent=\"" + pComment->m_sParaIdParent + L"\" w15:done=\"" + sDone + L
 };
 class CComments
 {
-	std::map<int, CComment*> m_mapComments;
-    std::map<std::wstring, CComment*> m_mapAuthors;
+    boost::unordered_map<int, CComment*>          m_mapComments;
+    boost::unordered_map<std::wstring, CComment*> m_mapAuthors;
 public:
 	IdCounter m_oFormatIdCounter;
 	IdCounter m_oParaIdCounter;
@@ -1798,7 +1798,7 @@ public:
 	}
 	~CComments()
 	{
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
 			delete it->second;
 		}
@@ -1822,7 +1822,7 @@ public:
 	CComment* get(int nInd)
 	{
 		CComment* pRes = NULL;
-		std::map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
+        boost::unordered_map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
 		if(m_mapComments.end() != pair)
 			pRes = pair->second;
 		return pRes;
@@ -1834,7 +1834,7 @@ public:
     std::wstring writeContent()
 	{
         std::wstring sRes;
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContent));
 		}
@@ -1843,7 +1843,7 @@ public:
     std::wstring writeContentExt()
 	{
         std::wstring sRes;
-		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContentExt));
 		}
@@ -1852,7 +1852,7 @@ public:
     std::wstring writePeople()
 	{
         std::wstring sRes;
-        for (std::map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
+        for (boost::unordered_map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
 		{
             sRes += (it->second->writePeople(it->second));
 		}

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(NULL);
     m_oFileWriter.m_pVbaProject->fromPPTY(&m_oBufferedStream);
 
     return c_oSerConstants::ReadOk;

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -37,7 +37,17 @@
 
 #include "../BinWriter/BinReaderWriterDefines.h"
 #include "../../XlsxSerializerCom/Writer/BinaryReader.h"
+
 #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Document.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Numbering.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Comments.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Styles.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Settings/Settings.h"
+
 #include "../DocWrapper/XlsxSerializer.h"
 
 #include "../../DesktopEditor/common/ASCVariant.h"
@@ -2981,7 +2991,7 @@ public:
 	int Read()
 	{
 		return ReadTable(&Binary_OtherTableReader::ReadOtherContent, this);
-	};
+	}
 	int ReadOtherContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -2991,7 +3001,7 @@ public:
 		}
 		else if(c_oSerOtherTableTypes::DocxTheme == type)
 		{
-			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme();
+			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme(NULL);
 			pTheme->fromPPTY(&m_oBufferedStream);
 			NSBinPptxRW::CXmlWriter xmlWriter;
 			pTheme->toXmlWriter(&xmlWriter);
@@ -3000,7 +3010,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	};
+	}
 	int ReadImageMapContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -3043,7 +3053,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	};
+	}
 };
 class Binary_CommentsTableReader : public Binary_CommonReader<Binary_CommentsTableReader>
 {
@@ -7258,7 +7268,7 @@ public:
 				BinXlsxRW::SaveParams			oSaveParams(m_oFileWriter.m_sThemePath, m_oFileWriter.m_pDrawingConverter->GetContentTypes());
 				BinXlsxRW::BinaryChartReader	oBinaryChartReader(m_oBufferedStream, oSaveParams, m_oFileWriter.m_pDrawingConverter);
 				
-				OOX::Spreadsheet::CChartSpace* pChartSpace = new OOX::Spreadsheet::CChartSpace();
+				OOX::Spreadsheet::CChartSpace* pChartSpace = new OOX::Spreadsheet::CChartSpace(NULL);
 				oBinaryChartReader.ReadCT_ChartSpace(length, &pChartSpace->m_oChartSpace);
 
 				//save xlsx

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -35,6 +35,7 @@
 #include "../../XlsxSerializerCom/Common/Common.h"
 #include "../../DesktopEditor/fontengine/FontManager.h"
 #include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include <boost/unordered_map.hpp>
 
 namespace Writers
 {
@@ -48,7 +49,7 @@ namespace Writers
         CApplicationFonts       m_oApplicationFonts;
         CFontManager*           m_pFontManager;
 	public:
-        std::map<std::wstring, int> m_mapFonts;
+        boost::unordered_map<std::wstring, int> m_mapFonts;
 
 		FontTableWriter(std::wstring sDir, std::wstring sFontDir, bool bNoFontDir):m_sDir(sDir)
 		{
@@ -81,7 +82,7 @@ namespace Writers
 			bool bCalibri = false;
 			bool bTimes = false;
 			bool bCambria = false;
-            for (std::map<std::wstring, int>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
+            for (boost::unordered_map<std::wstring, int>::const_iterator it = m_mapFonts.begin(); it != m_mapFonts.end(); ++it)
 			{
                 const std::wstring& sFontName = it->first;
 				if(_T("Calibri") == sFontName)

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -37,12 +37,30 @@
 #include "../../Common/Base64.h"
 #include "../../ASCOfficePPTXFile/Editor/FontCutter.h"
 #include "../../XlsxSerializerCom/Reader/BinaryWriter.h"
-#include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
-#include "../../Common/DocxFormat/Source/MathEquation/MathEquation.h"
 #include "BinEquationWriter.h"
 
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
+#include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
+#include "../../Common/DocxFormat/Source/MathEquation/MathEquation.h"
+
+#include "../../Common/DocxFormat/Source/DocxFormat/Document.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Numbering.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Comments.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Styles.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Footnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Endnote.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Settings/Settings.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/External/HyperLink.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/Image.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/OleObject.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/ActiveX.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/VbaProject.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Media/JsaProject.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/HeaderFooter.h"
+
 namespace BinDocxRW
 {
 	class ParamsWriter
@@ -3024,18 +3042,18 @@ namespace BinDocxRW
             m_oBcw.m_oStream.EndRecord();
 
 		}
-		void Write(std::list<OOX::WritingElement*> & aElems)
+        void Write(std::vector<OOX::WritingElement*> & aElems)
 		{
 			int nStart = m_oBcw.WriteItemWithLengthStart();
 			WriteDocumentContent(aElems);
 			m_oBcw.WriteItemWithLengthEnd(nStart);
 		}
-		void WriteDocumentContent(const std::list<OOX::WritingElement*> & aElems)
+        void WriteDocumentContent(const std::vector<OOX::WritingElement*> & aElems)
 		{
 			int nCurPos = 0;
-			for ( std::list<OOX::WritingElement*>::const_iterator it = aElems.begin(); it != aElems.end(); it++)
+            for ( size_t i = 0; i < aElems.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = aElems[i];
 
 				switch(item->getType())
 				{				
@@ -3184,12 +3202,13 @@ namespace BinDocxRW
 			m_oBcw.WriteItemWithLengthEnd(nCurPos);
 
 		}
-		void WriteParagraphContent(const std::list<OOX::WritingElement*> & content, bool bHyperlink = false)
+        void WriteParagraphContent(const std::vector<OOX::WritingElement*> & content, bool bHyperlink = false)
 		{
 			int nCurPos = 0;
-			for(std::list<OOX::WritingElement*>::const_iterator it = content.begin(); it != content.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for ( size_t i = 0; i < content.size(); ++i)
+            {
+                OOX::WritingElement* item = content[i];
+
 				switch (item->getType())
 				{
 				case OOX::et_w_fldSimple:
@@ -3836,8 +3855,8 @@ namespace BinDocxRW
 			bool bWasText		= false;
 			int nRecordType		= 0;
 			
-            std::list<OOX::WritingElement*>::iterator nIndexStart   = pRun->m_arrItems.begin();
-            std::list<OOX::WritingElement*>::iterator nIndexEnd     = pRun->m_arrItems.end();
+            std::vector<OOX::WritingElement*>::iterator nIndexStart   = pRun->m_arrItems.begin();
+            std::vector<OOX::WritingElement*>::iterator nIndexEnd     = pRun->m_arrItems.end();
 
 			if (bMathRun)
 				nRecordType = c_oSer_OMathContentType::Run;
@@ -3845,9 +3864,9 @@ namespace BinDocxRW
 				nRecordType = c_oSerParType::Run;
 
 	//Разбиваем массив по знаку et_w_sym			
-            for (std::list<OOX::WritingElement*>::iterator it = pRun->m_arrItems.begin(); it != nIndexEnd; it++)
+            for (std::vector<OOX::WritingElement*>::iterator it = nIndexStart; it != nIndexEnd; ++it)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = (*it);
 				
 				if(OOX::et_w_sym == item->getType())
 				{
@@ -3859,7 +3878,7 @@ namespace BinDocxRW
 						m_oBcw.WriteItemWithLengthEnd(nCurPos);
 					}
 					nCurPos = m_oBcw.WriteItemStart(nRecordType);
-						std::list<OOX::WritingElement*>::iterator it_next = it; it_next++;
+                        std::vector<OOX::WritingElement*>::iterator it_next = it; it_next++;
 						WritePreparedRun( pRun, bHyperlink, it, it_next);
 					m_oBcw.WriteItemWithLengthEnd(nCurPos);
 					nIndexStart = it; nIndexStart++;
@@ -3874,11 +3893,11 @@ namespace BinDocxRW
 				m_oBcw.WriteItemWithLengthEnd(nCurPos);
 			}
 		}
-		void WriteMathArgNodes(const std::list<OOX::WritingElement*>& m_arrItems)
+        void WriteMathArgNodes(const std::vector<OOX::WritingElement*>& arrItems)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = m_arrItems.begin(); it != m_arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for (size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
 				
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
@@ -4046,7 +4065,7 @@ namespace BinDocxRW
 
 						LONG lCol = 0; 
 		//TODO убрать, тк при отсутствии m:mcs, к-во столбцов должно разруливаться динамически в скрипте
-						for (std::list<OOX::WritingElement*>::iterator jt = pMatrix->m_arrItems.begin(); jt != pMatrix->m_arrItems.end(); jt++)
+                        for (std::vector<OOX::WritingElement*>::iterator jt = pMatrix->m_arrItems.begin(); jt != pMatrix->m_arrItems.end(); jt++)
 						{
 							OOX::WritingElement* item = *jt;
 							if (item->getType() == OOX::et_m_mr)
@@ -4496,11 +4515,11 @@ namespace BinDocxRW
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-		void WriteMathDelimiter(const std::list<OOX::WritingElement*> & arrItems, LONG &lColumn)
+        void WriteMathDelimiter(const std::vector<OOX::WritingElement*> & arrItems, LONG &lColumn)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
+            for(size_t i = 0; i < arrItems.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = arrItems[i];
 				
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
@@ -4616,11 +4635,12 @@ namespace BinDocxRW
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-		void WriteMathEqArr(const std::list<OOX::WritingElement*> & arrItems, LONG& lRow)
+        void WriteMathEqArr(const std::vector<OOX::WritingElement*> & arrItems, LONG& lRow)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for(size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
+
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
 				switch(eType)
@@ -4844,12 +4864,13 @@ namespace BinDocxRW
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-		void WriteMathMatrix(const std::list<OOX::WritingElement*> & arrItems, LONG &lRow, LONG &lCol)
+        void WriteMathMatrix(const std::vector<OOX::WritingElement*> & arrItems, LONG &lRow, LONG &lCol)
 		{
             bool bColumn = false;
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for(size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
+
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
 				switch(eType)
@@ -4946,9 +4967,9 @@ namespace BinDocxRW
 		{
 			int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathBottomNodesType::Mcs);
 
-			for(std::list<OOX::WritingElement*>::const_iterator it = pMcs.m_arrItems.begin(); it != pMcs.m_arrItems.end(); it++)
+            for(size_t i = 0; i < pMcs.m_arrItems.size(); ++i)
 			{			
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = pMcs.m_arrItems[i];
 				
 				OOX::EElementType eType = item->getType();
 				int nCurPos1 = 0;
@@ -5007,11 +5028,12 @@ namespace BinDocxRW
 								
 			m_oBcw.WriteItemEnd(nCurPos);
 		}		
-		void WriteMathMr(const std::list<OOX::WritingElement*> & arrItems)
+        void WriteMathMr(const std::vector<OOX::WritingElement*> & arrItems)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for(size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
+
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
 				if (eType == OOX::et_m_e)
@@ -5089,11 +5111,12 @@ namespace BinDocxRW
 			WriteMathArgNodes(pOMath.m_arrItems);			
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-		void WriteMathOMathPara(const std::list<OOX::WritingElement*> & arrItems)
+        void WriteMathOMathPara(const std::vector<OOX::WritingElement*> & arrItems)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for(size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
+
 				OOX::EElementType eType = item->getType();
 				int nCurPos = 0;
 				if (eType == OOX::et_m_oMath)
@@ -5505,7 +5528,7 @@ namespace BinDocxRW
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
-		void WritePreparedRun(OOX::Logic::CRun *pRun, bool bHyperlink, std::list<OOX::WritingElement*>::iterator &start, std::list<OOX::WritingElement*>::iterator &end)
+        void WritePreparedRun(OOX::Logic::CRun *pRun, bool bHyperlink, std::vector<OOX::WritingElement*>::iterator &start, std::vector<OOX::WritingElement*>::iterator &end)
 		{
 			if (!pRun) return;
 
@@ -5543,12 +5566,12 @@ namespace BinDocxRW
 
 			//Content пишется начиная от индекса nIndexStart и заканчивая предшествующим элементом для nIndexStop
 			nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::Content);
-				WriteRunContent(pRun->m_arrItems, start, end, bHyperlink);
+                WriteRunContent( start, end, bHyperlink);
 			m_oBcw.WriteItemWithLengthEnd(nCurPos);
 		}
-		void WriteRunContent(std::list<OOX::WritingElement*>& m_arrItems, std::list<OOX::WritingElement*>::iterator &start, std::list<OOX::WritingElement*>::iterator &end, bool bHyperlink = false)
+        void WriteRunContent(std::vector<OOX::WritingElement*>::iterator &start, std::vector<OOX::WritingElement*>::iterator &end, bool bHyperlink = false)
 		{
-			for ( std::list<OOX::WritingElement*>::iterator it = start; it != end; it++ )
+            for ( std::vector<OOX::WritingElement*>::iterator it = start; it != end; ++it )
 			{
 				OOX::WritingElement* item = *it;
 				switch (item->getType())
@@ -6533,13 +6556,15 @@ namespace BinDocxRW
 
 			RELEASEOBJECT(pTblPr);
 		}
-		bool ValidateRow(const std::list<OOX::WritingElement *> & arrItems)
+        bool ValidateRow(const std::vector<OOX::WritingElement *> & arrItems)
 		{
 	//Проверяем чтобы не все ячейки в ряду были вертикально замержены
 			bool bRes = true;
-			for(std::list<OOX::WritingElement*>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+
+            for(size_t i = 0; i < arrItems.size(); ++i)
+            {
+                OOX::WritingElement* item = arrItems[i];
+
 				if(OOX::et_w_tc == item->getType())
 				{
 					OOX::Logic::CTc* tc = static_cast<OOX::Logic::CTc*>(item);
@@ -6581,11 +6606,12 @@ namespace BinDocxRW
 			}
 			return false;
 		}
-		void GetTableSize(std::list<OOX::WritingElement *> & rows, int& nRows, int& nCols, OOX::Logic::CTableProperty** ppTblPr)
+        void GetTableSize(std::vector<OOX::WritingElement *> & rows, int& nRows, int& nCols, OOX::Logic::CTableProperty** ppTblPr)
 		{
-			for(std::list<OOX::WritingElement*>::iterator it = rows.begin(); it != rows.end(); it++)
+            for(size_t i = 0; i < rows.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = rows[i];
+
 				if(OOX::et_w_tblPr == item->getType())
 				{
 					*ppTblPr = new OOX::Logic::CTableProperty();
@@ -6605,8 +6631,7 @@ namespace BinDocxRW
 					}
 					else
 					{
-						//
-						rows.erase(it);
+                        rows.erase(rows.begin() + i);
 					}
 				}
 				else if(OOX::et_w_sdt == item->getType())
@@ -6632,18 +6657,20 @@ namespace BinDocxRW
 				}
 			}
 		}
-		int GetColsCount(const std::list<OOX::WritingElement *>& arrItems)
+        int GetColsCount(const std::vector<OOX::WritingElement *>& arrItems)
 		{
 			int nColCount = 0;
-			for(std::list<OOX::WritingElement *>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
+
+            for(size_t i = 0; i <  arrItems.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = arrItems[i];
+
 				if(OOX::et_w_tc == item->getType())
 				{
 					nColCount++;
 					OOX::Logic::CTc* tc = static_cast<OOX::Logic::CTc*>(item);
 					
-					for(std::list<OOX::WritingElement *>::iterator jt = tc->m_arrItems.begin(); jt != tc->m_arrItems.end(); jt++)
+                    for(std::vector<OOX::WritingElement *>::iterator jt = tc->m_arrItems.begin(); jt != tc->m_arrItems.end(); jt++)
 					{
 						OOX::WritingElement* item2 = *jt;
 
@@ -6723,14 +6750,15 @@ namespace BinDocxRW
 			}
 		}
 
-		void WriteTableContent(std::list<OOX::WritingElement *>& content, OOX::Logic::CTableProperty* pTblPr, int nRows, int nCols)
+        void WriteTableContent(std::vector<OOX::WritingElement *>& content, OOX::Logic::CTableProperty* pTblPr, int nRows, int nCols)
 		{
 			int nCurPos			= 0;
 			int nCurRowIndex	= 0;
 			
-			for(std::list<OOX::WritingElement*>::iterator it = content.begin(); it != content.end(); it++)
+            for(size_t i = 0; i < content.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = content[i];
+
 				if(OOX::et_w_tr == item->getType())
 				{
 					nCurPos = m_oBcw.WriteItemStart(c_oSerDocTableType::Row);
@@ -6793,14 +6821,14 @@ namespace BinDocxRW
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
 
-		void WriteRowContent(const std::list<OOX::WritingElement *> & content, OOX::Logic::CTableProperty* pTblPr, int nCurRowIndex, int nRows, int nCols)
+        void WriteRowContent(const std::vector<OOX::WritingElement *> & content, OOX::Logic::CTableProperty* pTblPr, int nCurRowIndex, int nRows, int nCols)
 		{
 			int nCurPos = 0;
 			int nCurColIndex = 0;
 			
-			for(std::list<OOX::WritingElement*>::const_iterator it = content.begin(); it != content.end(); it++)
-			{
-				OOX::WritingElement* item = *it;
+            for(size_t i = 0; i < content.size(); ++i)
+            {
+                OOX::WritingElement* item = content[i];
 				
 				if(OOX::et_w_tc == item->getType())
 				{
@@ -7200,7 +7228,7 @@ namespace BinDocxRW
 					if(mapAuthorToUserId.end() != pPair)
 						pNewCommentWriteTemp->sUserId = pPair->second;
 				}
-				for(std::list<OOX::WritingElement*>::iterator jt = pComment->m_arrItems.begin(); jt != pComment->m_arrItems.end(); jt++)
+                for(std::vector<OOX::WritingElement*>::iterator jt = pComment->m_arrItems.begin(); jt != pComment->m_arrItems.end(); jt++)
 				{
 					OOX::WritingElement* pWe = *jt;
 
@@ -7384,9 +7412,10 @@ namespace BinDocxRW
 		};
 		void WriteMathPr(const OOX::Logic::CMathPr &pMathPr)
 		{
-			for(std::list<OOX::WritingElement*>::const_iterator it = pMathPr.m_arrItems.begin(); it != pMathPr.m_arrItems.end(); it++)
+            for(size_t i = 0; i < pMathPr.m_arrItems.size(); ++i)
 			{
-				OOX::WritingElement* item = *it;
+                OOX::WritingElement* item = pMathPr.m_arrItems[i];
+
 				OOX::EElementType eType = item->getType();
 				switch(eType)
 				{
@@ -7960,9 +7989,11 @@ namespace BinDocxRW
 				if(NULL != pParagraph)
 				{
 					OOX::Logic::CParagraphProperty* pPr = NULL;
-					for(std::list<OOX::WritingElement*>::iterator it = pParagraph->m_arrItems.begin(); it != pParagraph->m_arrItems.end(); it++)
+
+                    for(size_t i = 0; i < pParagraph->m_arrItems.size(); ++i)
 					{
-						OOX::WritingElement* we = *it;
+                        OOX::WritingElement* we = pParagraph->m_arrItems[i];
+
 						if(OOX::et_w_pPr == we->getType())
 						{
 							pPr = static_cast<OOX::Logic::CParagraphProperty*>(we);

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -32,7 +32,12 @@
 #include "ChartWriter.h"
 
 #include <algorithm>
+
 #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h"
 
 #define NUMID_START 160
 const wchar_t* gc_Cat = L"cat";
@@ -127,10 +132,11 @@ namespace BinXlsxRW{
 	}
 	ChartWriter::~ChartWriter()
 	{
-		for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); it++)
+        for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it)
 		{
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = it->second;
-			for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++)
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = it->second;
+
+            for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRow = rows->begin(); itRow != rows->end(); itRow++)
 			{
 				delete itRow->second;
 			}
@@ -140,28 +146,34 @@ namespace BinXlsxRW{
 	void ChartWriter::toXlsx(OOX::Spreadsheet::CXlsx& oXlsx)
 	{
 		std::vector<std::wstring> aSharedStrings;
-		//Sheet
-		OOX::Spreadsheet::CWorkbook* pWorkbook = oXlsx.CreateWorkbook();
-		pWorkbook->m_oSheets.Init();
-		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets = oXlsx.GetWorksheets();
+		
+		oXlsx.CreateWorkbook();
+		oXlsx.m_pWorkbook->m_oSheets.Init();
+
 		int nSheetId = 1;
 		OOX::Spreadsheet::CWorksheet* pFirstWorksheet = NULL;
-		for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); it++)
+
+        for (std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::iterator it = m_mapSheets.begin(); it != m_mapSheets.end(); ++it)
 		{
 			const std::wstring& sSheetName = it->first;
-			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(mapWorksheets, sSheetName);
+			
+			//find or generate black worksheet
+			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(oXlsx.m_arWorksheets, oXlsx.m_mapWorksheets, sSheetName);
+			//fill data to worksheet
 			toXlsxSheetdata(pWorksheet, *it->second, aSharedStrings);
+			
 			OOX::Spreadsheet::CSheet* pSheet = new OOX::Spreadsheet::CSheet();
 			pSheet->m_oName.Init();
 			pSheet->m_oName->append(sSheetName);
 			pSheet->m_oSheetId.Init();
 			pSheet->m_oSheetId->SetValue(nSheetId++);
+			
 			smart_ptr<OOX::File> oWorksheetFile = smart_ptr<OOX::File>(pWorksheet);
-			const OOX::RId oRId = pWorkbook->Add(oWorksheetFile);
+			const OOX::RId oRId = oXlsx.m_pWorkbook->Add(oWorksheetFile);
 			pSheet->m_oRid.Init();
 			pSheet->m_oRid->SetValue(oRId.get());
-			pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
-			mapWorksheets[pSheet->m_oName.get()] = pWorksheet;
+			
+			oXlsx.m_pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
 
 			if(NULL == pFirstWorksheet)
 			{
@@ -170,7 +182,7 @@ namespace BinXlsxRW{
 		}
 
 		//SharedStrings
-		OOX::Spreadsheet::CSharedStrings* pSharedStrings = oXlsx.CreateSharedStrings();
+		oXlsx.CreateSharedStrings();
 		for(size_t i = 0; i < aSharedStrings.size(); ++i)
 		{
 			OOX::Spreadsheet::CText* pText = new OOX::Spreadsheet::CText();
@@ -182,33 +194,35 @@ namespace BinXlsxRW{
 			}
 			OOX::Spreadsheet::CSi* pSi = new OOX::Spreadsheet::CSi();
 			pSi->m_arrItems.push_back(pText);
-			pSharedStrings->AddSi(pSi);
+			oXlsx.m_pSharedStrings->AddSi(pSi);
 		}
-		pSharedStrings->m_oCount.Init();
-		pSharedStrings->m_oCount->SetValue(pSharedStrings->m_nCount);
-		pSharedStrings->m_oUniqueCount.Init();
-		pSharedStrings->m_oUniqueCount->SetValue(pSharedStrings->m_nCount);
+		oXlsx.m_pSharedStrings->m_oCount.Init();
+		oXlsx.m_pSharedStrings->m_oCount->SetValue(oXlsx.m_pSharedStrings->m_nCount);
+		oXlsx.m_pSharedStrings->m_oUniqueCount.Init();
+		oXlsx.m_pSharedStrings->m_oUniqueCount->SetValue(oXlsx.m_pSharedStrings->m_nCount);
 		//Styles
-		OOX::Spreadsheet::CStyles* pStyles = oXlsx.CreateStyles();
-		pStyles->m_oCellXfs.Init();
+		oXlsx.CreateStyles();
+		oXlsx.m_pStyles->m_oCellXfs.Init();
 		for(size_t i = 0; i < m_aXfs.size(); ++i)
 		{
-			pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
+			oXlsx.m_pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
 		}
-		pStyles->m_oNumFmts.Init();
-		for (std::map<std::wstring, int>::iterator it = m_mapFormats.begin(); it != m_mapFormats.end(); it++)
+		oXlsx.m_pStyles->m_oNumFmts.Init();
+
+        for (boost::unordered_map<std::wstring, int>::iterator it = m_mapFormats.begin(); it != m_mapFormats.end(); ++it)
 		{
 			OOX::Spreadsheet::CNumFmt* pNumFmt = new OOX::Spreadsheet::CNumFmt();
 			pNumFmt->m_oFormatCode.Init();
 			pNumFmt->m_oFormatCode->append(it->first);
 			pNumFmt->m_oNumFmtId.Init();
 			pNumFmt->m_oNumFmtId->SetValue(NUMID_START + it->second);
-			pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
+			oXlsx.m_pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
 		}
-		pStyles->m_oNumFmts->m_oCount.Init();
-		pStyles->m_oNumFmts->m_oCount->SetValue(pStyles->m_oNumFmts->m_arrItems.size());
-		pStyles->m_oCellXfs->m_oCount.Init();
-		pStyles->m_oCellXfs->m_oCount->SetValue(pStyles->m_oCellXfs->m_arrItems.size());
+		oXlsx.m_pStyles->m_oNumFmts->m_oCount.Init();
+		oXlsx.m_pStyles->m_oNumFmts->m_oCount->SetValue(oXlsx.m_pStyles->m_oNumFmts->m_arrItems.size());
+		oXlsx.m_pStyles->m_oCellXfs->m_oCount.Init();
+		oXlsx.m_pStyles->m_oCellXfs->m_oCount->SetValue(oXlsx.m_pStyles->m_oCellXfs->m_arrItems.size());
+		
 		OOX::Spreadsheet::CDxf* pDxf = new OOX::Spreadsheet::CDxf();
 		pDxf->m_oBorder.Init();
 		pDxf->m_oBorder->m_oStart.Init();
@@ -235,15 +249,16 @@ namespace BinXlsxRW{
 		pDxf->m_oBorder->m_oBottom->m_oColor.Init();
 		pDxf->m_oBorder->m_oBottom->m_oColor->m_oIndexed.Init();
 		pDxf->m_oBorder->m_oBottom->m_oColor->m_oIndexed->SetValue(12);
-		pStyles->m_oDxfs.Init();
-		pStyles->m_oDxfs->m_arrItems.push_back(pDxf);
-		pStyles->m_oDxfs->m_oCount.Init();
-		pStyles->m_oDxfs->m_oCount->SetValue(pStyles->m_oDxfs->m_arrItems.size());
+		
+		oXlsx.m_pStyles->m_oDxfs.Init();
+		oXlsx.m_pStyles->m_oDxfs->m_arrItems.push_back(pDxf);
+		oXlsx.m_pStyles->m_oDxfs->m_oCount.Init();
+		oXlsx.m_pStyles->m_oDxfs->m_oCount->SetValue(oXlsx.m_pStyles->m_oDxfs->m_arrItems.size());
 		//Table
 		//todo table в случае нескольких sheet или если серии разнесены по sheet
 		if(m_aTableNames.size() > 0)
 		{
-			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile();
+			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile(NULL);
 			pTable->m_oTable.Init();
 			pTable->m_oTable->m_oDisplayName.Init();
 			pTable->m_oTable->m_oDisplayName->append(L"Table1");
@@ -286,9 +301,11 @@ namespace BinXlsxRW{
 			{
 				OOX::Spreadsheet::CTablePart* pTablePart = new OOX::Spreadsheet::CTablePart();
 				NSCommon::smart_ptr<OOX::File> pTableFile(pTable);
+				
 				const OOX::RId oRId = pFirstWorksheet->Add(pTableFile);
 				pTablePart->m_oRId.Init();
 				pTablePart->m_oRId->SetValue(oRId.get());
+				
 				pFirstWorksheet->m_oTableParts.Init();
 				pFirstWorksheet->m_oTableParts->m_arrItems.push_back(pTablePart);
 				pFirstWorksheet->m_oTableParts->m_oCount.Init();
@@ -458,18 +475,22 @@ namespace BinXlsxRW{
 		//проверяем можем ли создать таблицу
 		if(m_mapSheets.size() > 0 && m_nRow1 > 0 && m_nRow2 > 0 && m_nCol1 > 0 && m_nCol2 > 0 && m_nRow1 < m_nRow2)
 		{
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = m_mapSheets.begin()->second;
-			std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator itRows = rows->find(m_nRow1);
-			if(itRows != rows->end())
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*            rows = m_mapSheets.begin()->second;
+            std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::iterator   itRows = rows->find(m_nRow1);
+
+            if(itRows != rows->end())
 			{
-				std::map<int, OOX::Spreadsheet::CCell*>* cells = itRows->second;
+                std::map<int, OOX::Spreadsheet::CCell*>* cells = itRows->second;
 				std::vector<int> aIndexesCell;
-				for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells->begin(); it != cells->end(); it++)
+
+                for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells->begin(); it != cells->end(); ++it)
 				{
 					aIndexesCell.push_back(it->first);
 				}
-				std::sort(aIndexesCell.begin(), aIndexesCell.end());
-				if(m_nCol2 - m_nCol1 + 1 == aIndexesCell.size() && m_nCol1 == aIndexesCell[0] && m_nCol2 == aIndexesCell[aIndexesCell.size() - 1])
+
+                std::sort(aIndexesCell.begin(), aIndexesCell.end());
+
+                if(m_nCol2 - m_nCol1 + 1 == aIndexesCell.size() && m_nCol1 == aIndexesCell[0] && m_nCol2 == aIndexesCell[aIndexesCell.size() - 1])
 				{
 					for(size_t j = 0; j < aIndexesCell.size(); ++j)
 					{
@@ -482,13 +503,14 @@ namespace BinXlsxRW{
 			}
 		}
 	}
-	OOX::Spreadsheet::CWorksheet* ChartWriter::toXlsxGetSheet(std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName)
+	OOX::Spreadsheet::CWorksheet* ChartWriter::toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName)
 	{
 		OOX::Spreadsheet::CWorksheet* pWorksheet = NULL;
-		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>::const_iterator it = mapWorksheets.find(sName);
-		if (it == mapWorksheets.end())
+		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>::const_iterator pFind = mapWorksheets.find(sName);
+
+        if (pFind == mapWorksheets.end())
 		{
-			pWorksheet = new OOX::Spreadsheet::CWorksheet();
+			pWorksheet = new OOX::Spreadsheet::CWorksheet(NULL);
 			pWorksheet->m_oSheetFormatPr.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight->SetValue(15);
@@ -508,39 +530,48 @@ namespace BinXlsxRW{
 			pWorksheet->m_oPageMargins->m_oFooter->FromInches(0.3);
 
 			mapWorksheets[sName] = pWorksheet;
+			arWorksheets.push_back(pWorksheet);
 		}
 		else
 		{
-			pWorksheet = it->second;
+			pWorksheet = pFind->second;
 		}
 		return pWorksheet;
 	}
-	void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings)
+    void ChartWriter::toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings)
 	{
 		pWorksheet->m_oSheetData.Init();
 		std::vector<int> aIndexesRow;
-		for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator it = rows.begin(); it != rows.end(); it++)
+
+        for(std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator it = rows.begin(); it != rows.end(); ++it)
 		{
 			aIndexesRow.push_back(it->first);
 		}
-		std::sort(aIndexesRow.begin(), aIndexesRow.end());
-		for(size_t i = 0; i < aIndexesRow.size(); ++i)
+
+        std::sort(aIndexesRow.begin(), aIndexesRow.end());
+
+        for(size_t i = 0; i < aIndexesRow.size(); ++i)
 		{
 			int nIndexRow = aIndexesRow[i];
-			OOX::Spreadsheet::CRow* pRow = new OOX::Spreadsheet::CRow();
+
+            OOX::Spreadsheet::CRow* pRow = new OOX::Spreadsheet::CRow();
 			pRow->m_oR.Init();
 			pRow->m_oR->SetValue(nIndexRow);
-			const std::map<int, OOX::Spreadsheet::CCell*>& cells = *rows.at(nIndexRow);
+
+            const std::map<int, OOX::Spreadsheet::CCell*>& cells = *rows.at(nIndexRow);
 			std::vector<int> aIndexesCell;
-			for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells.begin(); it != cells.end(); it++)
+
+            for(std::map<int, OOX::Spreadsheet::CCell*>::const_iterator it = cells.begin(); it != cells.end(); ++it)
 			{
 				aIndexesCell.push_back(it->first);
 			}
 			std::sort(aIndexesCell.begin(), aIndexesCell.end());
-			for(size_t j = 0; j < aIndexesCell.size(); ++j)
+
+            for(size_t j = 0; j < aIndexesCell.size(); ++j)
 			{
 				int nIndexCell = aIndexesCell[j];
-				OOX::Spreadsheet::CCell* pCell = cells.at(nIndexCell);
+
+                OOX::Spreadsheet::CCell* pCell = cells.at(nIndexCell);
 				//SharedStrings
 				if(pCell->m_oValue.IsInit())
 				{
@@ -588,22 +619,24 @@ namespace BinXlsxRW{
 	}
 	void ChartWriter::parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format = NULL)
 	{
-		std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
-		std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
-		if(itSheets == m_mapSheets.end())
+        std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>::const_iterator itSheets = m_mapSheets.find(sheet);
+        std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>* rows = NULL;
+
+        if(itSheets == m_mapSheets.end())
 		{
-			rows = new std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>();
+            rows = new std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>();
 			m_mapSheets.insert(std::make_pair(sheet, rows));
 		}
 		else
 		{
 			rows = itSheets->second;
 		}
-		std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator itRows = rows->find(nRow);
-		std::map<int, OOX::Spreadsheet::CCell*>* cells = NULL;
-		if(itRows == rows->end())
+        std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>::const_iterator itRows = rows->find(nRow);
+        std::map<int, OOX::Spreadsheet::CCell*>* cells = NULL;
+
+        if(itRows == rows->end())
 		{
-			cells = new std::map<int, OOX::Spreadsheet::CCell*>();
+            cells = new std::map<int, OOX::Spreadsheet::CCell*>();
 			rows->insert(std::make_pair(nRow, cells));
 		}
 		else
@@ -622,10 +655,12 @@ namespace BinXlsxRW{
 		//пока добавляем как есть, shared string после записи таблицы
 		pNewCell->m_oValue.Init();
 		pNewCell->m_oValue->m_sText = val;
-		if(NULL != format)
+
+        if(NULL != format)
 		{
 			int nXfsIndex = m_aXfs.size();
-			std::map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
+
+            boost::unordered_map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
 			if(itFormat == m_mapFormats.end())
 			{
 				m_mapFormats[*format] = nXfsIndex;

ASCOfficeDocxFile2/DocWrapper/ChartWriter.h

@@ -33,8 +33,9 @@
 #define CHART_WRITER
 
 #include <string>
-#include <map>
 #include <vector>
+#include <map>
+#include <boost/unordered_map.hpp>
 
 namespace OOX
 {
@@ -59,22 +60,26 @@ namespace BinXlsxRW {
 	class ChartWriter
 	{
 	public:
-		std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*> m_mapSheets;
-		std::map<std::wstring, int> m_mapFormats;
-		std::vector<OOX::Spreadsheet::CXfs*> m_aXfs;
-		std::vector<std::wstring> m_aTableNames;
-		int m_nRow1;
+        std::map<std::wstring, std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>*>  m_mapSheets;
+        boost::unordered_map<std::wstring, int>                                           m_mapFormats;
+
+        std::vector<OOX::Spreadsheet::CXfs*>    m_aXfs;
+        std::vector<std::wstring>               m_aTableNames;
+
+        int m_nRow1;
 		int m_nCol1;
 		int m_nRow2;
 		int m_nCol2;
-	public:
-		ChartWriter();
+
+        ChartWriter();
 		~ChartWriter();
 		void toXlsx(OOX::Spreadsheet::CXlsx& oXlsx);
 		void parseChart(const OOX::Spreadsheet::CT_Chart* pChart);
-	private:
-		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
+
+    private:
+		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
 		void toXlsxSheetdata(OOX::Spreadsheet::CWorksheet* pWorksheet, const std::map<int, std::map<int, OOX::Spreadsheet::CCell*>*>& rows, std::vector<std::wstring>& aSharedStrings);
+		
 		void parseCell(const std::wstring& sheet, const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		OOX::Spreadsheet::CCell* parseCreateCell(const int& nRow, const int& nCol, const std::wstring& val, std::wstring* format);
 		void parseStrRef(const OOX::Spreadsheet::CT_StrRef* pStrRef, bool bUpdateRange, const wchar_t* cRangeName);

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -39,6 +39,9 @@
 #include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
+#include "../../Common/DocxFormat/Source/DocxFormat/App.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Core.h"
+
 int BinDocxRW::g_nCurFormatVersion = 0;
 
 BinDocxRW::CDocxSerializer::CDocxSerializer()
@@ -47,7 +50,7 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
 	m_pCurFileWriter	= NULL;
 
 	m_bIsNoBase64Save	= false;
-	m_bIsNoBase64	= false;
+	m_bIsNoBase64		= false;
 	m_bSaveChartAsImg	= false;
 }
 BinDocxRW::CDocxSerializer::~CDocxSerializer()
@@ -292,11 +295,13 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				
                 OOX::CPath DocProps = std::wstring(_T("docProps"));
 
-				OOX::CApp* pApp = new OOX::CApp();
+				OOX::CApp* pApp = new OOX::CApp(NULL);
 				if (pApp)
 				{
-					pApp->SetApplication(_T("OnlyOffice"));
-					pApp->SetAppVersion(_T("5.0"));
+					pApp->SetApplication(L"ONLYOFFICE");
+#if defined(INTVER)
+                    pApp->SetAppVersion(VALUE2STR(INTVER));
+#endif
 					pApp->SetDocSecurity(0);
 					pApp->SetScaleCrop(false);
 					pApp->SetLinksUpToDate(false);
@@ -306,7 +311,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 					pApp->write(pathDocProps + FILE_SEPARATOR_STR + _T("app.xml"), DocProps, *pContentTypes);
 					delete pApp;
 				}				
-				OOX::CCore* pCore = new OOX::CCore();
+				OOX::CCore* pCore = new OOX::CCore(NULL);
 				if (pCore)
 				{
 					pCore->SetCreator(_T(""));

ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp

@@ -33,6 +33,12 @@
 
 #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
+
+#include "../../Common/DocxFormat/Source/DocxFormat/FontTable.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Styles/TableStyles.h"
+
+#include "../../ASCOfficePPTXFile/PPTXFormat/Theme.h"
+
 #include "../../Common/ASCUtils.h"
 
 namespace DocWrapper {

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -42,6 +42,7 @@
 #include "ChartWriter.h"
 
 #include "../BinReader/DefaultThemeWriter.h"
+//#include "../../Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h"
 
 namespace BinXlsxRW{
 	int g_nCurFormatVersion = 0;
@@ -168,7 +169,7 @@ namespace BinXlsxRW{
 
 	//todo theme path
 		BinXlsxRW::SaveParams			oSaveParams(sThemePath, m_pExternalDrawingConverter->GetContentTypes());
-		OOX::Spreadsheet::CChartSpace	oChartSpace;
+		OOX::Spreadsheet::CChartSpace	oChartSpace(NULL);
 		BinXlsxRW::BinaryChartReader	oBinaryChartReader(*pReader, oSaveParams, m_pExternalDrawingConverter);
 		
 		oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -68,6 +68,7 @@
 				ShowProgress="0"
 				Version=""
 				LinkIncremental="2"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -407,11 +407,11 @@ namespace formulasconvert {
 	std::wstring is_forbidden(const std::wstring & formula)
 	{
 		std::wstring result = formula;
-		std::map<std::wstring, std::wstring> forbidden_formulas;
+        std::map<std::wstring, std::wstring> forbidden_formulas;
 
 		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++)
+        for (std::map<std::wstring, std::wstring>::iterator it = forbidden_formulas.begin(); it != forbidden_formulas.end(); ++it)
 		{
 			if (boost::algorithm::contains(formula, it->first))
 			{

ASCOfficeOdfFile/include/cpdoccore/utf8cpp/utf8/core.h

@@ -335,8 +335,8 @@ namespace internal
     inline bool starts_with_bom (octet_iterator it, octet_iterator end)
     {
         return (
-            ((it != end) && (internal::mask8(*it++)) == bom[0]) &&
-            ((it != end) && (internal::mask8(*it++)) == bom[1]) &&
+            ((it != end) && (internal::mask8(*++it)) == bom[0]) &&
+            ((it != end) && (internal::mask8(*++it)) == bom[1]) &&
             ((it != end) && (internal::mask8(*it))   == bom[2])
            );
     }
@@ -346,8 +346,8 @@ namespace internal
     inline bool is_bom (octet_iterator it)
     {
         return (
-            (internal::mask8(*it++)) == bom[0] &&
-            (internal::mask8(*it++)) == bom[1] &&
+            (internal::mask8(*++it)) == bom[0] &&
+            (internal::mask8(*++it)) == bom[1] &&
             (internal::mask8(*it))   == bom[2]
            );
     }

ASCOfficeOdfFile/include/cpdoccore/utf8cpp/utf8/unchecked.h

@@ -66,7 +66,7 @@ namespace utf8
                 case 1:
                     break;
                 case 2:
-                    it++;
+                    ++it;
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
                     break;
                 case 3:

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -732,16 +732,38 @@ void docx_conversion_context::start_process_style_content()
     styles_context_.start();
 }
 
-void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)
+void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)//from page layout
 {
 	int count_columns = 1;
 	bool sep_columns = false;
 
 	oox::section_context::_section & section = get_section_context().get();
+
+	if (!columns)
+	{
+		if (const odf_reader::style_instance * secStyle = root()->odf_context().styleContainer().style_by_name(section.style_, odf_types::style_family::Section, process_headers_footers_))
+		{
+			if (const odf_reader::style_content * content = secStyle->content())
+			{
+				if (odf_reader::style_section_properties * sectPr = content->get_style_section_properties())
+				{
+					columns = dynamic_cast<odf_reader::style_columns *>( sectPr->style_columns_.get());
+					
+					section.margin_left_	= sectPr->common_horizontal_margin_attlist_.fo_margin_left_;
+					section.margin_right_	= sectPr->common_horizontal_margin_attlist_.fo_margin_right_;		
+				}
+			}
+			if (section.is_dump_)
+			{
+				get_section_context().remove_section();				
+			}
+		}
+	}
 	
+	std::vector<std::pair<double, double>> width_space;
 	if (columns)
 	{
-		if ((columns->fo_column_count_) && (*columns->fo_column_count_ > 1))
+		if (columns->fo_column_count_)
 		{
 			count_columns =  *columns->fo_column_count_;
 		}
@@ -750,44 +772,63 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 			if (columns_sep->style_style_ != _T("none"))
 				sep_columns = true;
 		}
-	}
-	if (const odf_reader::style_instance * secStyle = root()->odf_context().styleContainer().style_by_name(section.style_, odf_types::style_family::Section, process_headers_footers_))
-	{
-		if (const odf_reader::style_content * content = secStyle->content())
-		{
-			if (odf_reader::style_section_properties * sectPr = content->get_style_section_properties())
-			{
-				if (odf_reader::style_columns * columns = dynamic_cast<odf_reader::style_columns *>( sectPr->style_columns_.get() ))
-				{
-					if (columns->fo_column_count_)
-					{
-						count_columns =  *columns->fo_column_count_;
-					}
-					if (odf_reader::style_column_sep * columns_sep = dynamic_cast<odf_reader::style_column_sep *>( columns->style_column_sep_.get() ))
-					{
-						if (columns_sep->style_style_ != _T("none"))
-							sep_columns = true;
-					}
-				}
 
-				section.margin_left_	= sectPr->common_horizontal_margin_attlist_.fo_margin_left_;
-				section.margin_right_	= sectPr->common_horizontal_margin_attlist_.fo_margin_right_;
+		if (!columns->style_columns_.empty())
+		{
+			double page_width = 0;
+			const odf_reader::page_layout_instance * pp = root()->odf_context().pageLayoutContainer().page_layout_first();
+			if (pp)
+			{
+				odf_reader::style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
+				if (attr_page.fo_page_width_)
+				{
+					page_width = attr_page.fo_page_width_->get_value_unit(odf_types::length::pt);
+				}
+				if (attr_page.common_horizontal_margin_attlist_.fo_margin_left_)
+				{
+					page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_left_->get_length().get_value_unit(odf_types::length::pt);
+				}
+				if (attr_page.common_horizontal_margin_attlist_.fo_margin_right_)
+				{
+					page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_right_->get_length().get_value_unit(odf_types::length::pt);
+				}
+			}		
+			for (size_t i = 0; page_width > 0, i < columns->style_columns_.size(); i++)
+			{
+				odf_reader::style_column * col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i].get());
+				if (!col) continue;
+
+				double width = page_width * (col->style_rel_width_ ? col->style_rel_width_->get_value() / 65535. : 0);
+
+				double space = col->fo_end_indent_ ? col->fo_end_indent_->get_value_unit(odf_types::length::pt) : 0;
+
+				if (i < columns->style_columns_.size() - 1)
+				{
+					col = dynamic_cast<odf_reader::style_column*>( columns->style_columns_[i + 1].get());
+					space += col->fo_start_indent_ ? col->fo_start_indent_->get_value_unit(odf_types::length::pt) : 0;
+				}
+				
+				width_space.push_back(std::make_pair(width, space));
 			}
 		}
-		if (section.is_dump_)
-		{
-			get_section_context().remove_section();				
-		}
 	}
-
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"w:cols")
 		{
-			CP_XML_ATTR(L"w:equalWidth", L"true");
+			CP_XML_ATTR(L"w:equalWidth", width_space.empty());
 			CP_XML_ATTR(L"w:num", count_columns);
 			CP_XML_ATTR(L"w:sep", sep_columns);
-			CP_XML_ATTR(L"w:space",0);
+			CP_XML_ATTR(L"w:space", 708);
+
+			for (size_t i = 0; i < width_space.size(); i++)
+			{
+				CP_XML_NODE(L"w:col")
+				{
+					CP_XML_ATTR(L"w:w", (int)(width_space[i].first * 20));	
+					CP_XML_ATTR(L"w:space", (int)(width_space[i].second * 20));	
+				}
+			}
 		}
 	}
 }
@@ -846,18 +887,18 @@ void docx_conversion_context::docx_serialize_paragraph_style(std::wostream & str
    
 	CP_XML_WRITER(strm)
 	{
-		//Tutor_Charlotte_Tutor_the_Entire_World_.odt
-		if (get_section_context().dump_.empty() == false && (!ParentId.empty() || get_section_context().get().is_dump_ || in_header_) 
-			 && !get_table_context().in_table() && !in_drawing)
-		{//две подряд секции или если стиль определен и в заголовки нельзя пихать !!!
-			CP_XML_NODE(L"w:pPr")
-			{
-				CP_XML_STREAM() << get_section_context().dump_;
-				get_section_context().dump_.clear();
-			}
-			finish_paragraph();
-			start_paragraph();
-		}
+		////Tutor_Charlotte_Tutor_the_Entire_World_.odt
+		//if (get_section_context().dump_.empty() == false && (!ParentId.empty() || get_section_context().get().is_dump_ || in_header_) 
+		//	 && !get_table_context().in_table() && !in_drawing)
+		//{//две подряд секции или если стиль определен и в заголовки нельзя пихать !!!
+		//	CP_XML_NODE(L"w:pPr")
+		//	{
+		//		CP_XML_STREAM() << get_section_context().dump_;
+		//		get_section_context().dump_.clear();
+		//	}
+		//	finish_paragraph();
+		//	start_paragraph();
+		//}
 
 		if (!paragraph_style.str().empty() || !ParentId.empty())
 		{		
@@ -1320,7 +1361,7 @@ void docx_conversion_context::start_changes()
 	text_tracked_context_.dumpTcPr_.clear();
 	text_tracked_context_.dumpTblPr_.clear();
 
-	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); it++)
+	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{
 		text_tracked_context::_state  &state = it->second;
 
@@ -1413,7 +1454,7 @@ void docx_conversion_context::end_changes()
 {
 	if (process_comment_) return;
 
-	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); it++)
+	for (map_changes_iterator it = map_current_changes_.begin(); it != map_current_changes_.end(); ++it)
 	{
 		text_tracked_context::_state  &state = it->second;
 

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -103,7 +103,7 @@ public:
 		reset_fill(l.fill_);
 		//floor_.content_= l;
 	}
-	void set_legend(odf_reader::chart::simple & l)
+	void set_legend(odf_reader::chart::legend & l)
 	{
 		reset_fill(l.fill_);
 		legend_.content_= l;

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -52,10 +52,9 @@ void oox_chart_legend::oox_serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE(L"c:legend")
         {
-
 			CP_XML_NODE(L"c:legendPos")
 			{
-				CP_XML_ATTR(L"val", "r");//  "b" | "l" |  "r" |  "t"// == bottom left right top
+				CP_XML_ATTR(L"val", content_.position);
 
 			}
             layout_.oox_serialize(CP_XML_STREAM());		

ASCOfficeOdfFile/src/docx/oox_chart_legend.h

@@ -48,7 +48,7 @@ public:
  
     void oox_serialize(std::wostream & _Wostream);
 
-	odf_reader::chart::simple content_;  
+	odf_reader::chart::legend content_;  
 private:
 	
 	cpdoccore::oox::oox_layout layout_;	//layout (Layout) §21.2.2.88

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -71,7 +71,7 @@ void oox_data_labels::oox_serialize(std::wostream & _Wostream)
         {
 			oox_serialize_default_text(CP_XML_STREAM(), textPr_);
 	
-			for (std::map<int, std::vector<odf_reader::_property>>::iterator it = dLbls_.begin(); it != dLbls_.end(); it++)
+			for (std::map<int, std::vector<odf_reader::_property>>::iterator it = dLbls_.begin(); it != dLbls_.end(); ++it)
 			{
 				CP_XML_NODE(L"c:dLbl")
 				{

ASCOfficeOdfFile/src/docx/oox_package.cpp

@@ -40,6 +40,7 @@
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/raster/Metafile/MetaFile.h"
 #include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../Common/DocxFormat/Source/Base/Base.h"
 
 namespace cpdoccore { 
 namespace oox {
@@ -284,8 +285,8 @@ void core_file::write(const std::wstring & RootPath)
     L"xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dcmitype=\"http://purl.org/dc/dcmitype/\" "
     L"xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" >";
 
-	//resStream << L"<dc:creator>ONLYOFFICE Online Editor</dc:creator>";
-	//resStream << L"<cp:lastModifiedBy>ONLYOFFICE Online Editor</cp:lastModifiedBy>";
+	//resStream << L"<dc:creator>ONLYOFFICE</dc:creator>";
+	//resStream << L"<cp:lastModifiedBy>ONLYOFFICE</cp:lastModifiedBy>";
 	resStream << L"<cp:revision>1</cp:revision>";
     resStream << L"</cp:coreProperties>";
 
@@ -300,8 +301,12 @@ void app_file::write(const std::wstring & RootPath)
     resStream << L"<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" "
         L"xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\" >";
    
-	resStream << L"<Application>OnlyOffice</Application>"; 
-    resStream << L"</Properties>";
+	resStream << L"<Application>ONLYOFFICE"; 
+#if defined(INTVER)
+	std::string s = VALUE2STR(INTVER);
+	resStream << L"/" << std::wstring(s.begin(), s.end()) ;
+#endif	
+	resStream << L"</Application></Properties>";
     
     simple_element elm(L"app.xml", resStream.str());
     elm.write(RootPath);

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.cpp

@@ -194,7 +194,7 @@ private:
 		std::map<size_t, size_t> count;
 
 		size_t max_size = 0;
-		for (std::map<size_t, size_t>::iterator it = map.begin(); it != map.end(); it++)
+		for (std::map<size_t, size_t>::iterator it = map.begin(); it != map.end(); ++it)
 		{
 			std::map<size_t, size_t>::iterator pFind = count.find(it->second);
 			if (pFind != count.end())
@@ -215,7 +215,7 @@ private:
 
 		size_t found = 0;
 
-		for (std::map<size_t, size_t>::iterator it = count.begin() ; it != count.end(); it++)
+		for (std::map<size_t, size_t>::iterator it = count.begin() ; it != count.end(); ++it)
 		{
 			if (it->second == max_size)
 			{
@@ -229,16 +229,16 @@ private:
 		{
 			if (it->second != found)
 			{
-				std::map<size_t, size_t>::iterator del = it; it++;
+				std::map<size_t, size_t>::iterator del = it; ++it;
 				map.erase(del);
 			}
-			else it++;
+			else ++it;
 		}
 		return true;
 	}
 	void clear_header_map2(std::map<size_t, size_t> & map, std::map<size_t, size_t> & map_by)
 	{//отсев тех кто во втором
-		for (std::map<size_t, size_t>::iterator it = map_by.begin() ; it != map_by.end(); it++)
+		for (std::map<size_t, size_t>::iterator it = map_by.begin() ; it != map_by.end(); ++it)
 		{
 			std::map<size_t, size_t>::iterator pFind = map.find(it->second);
 			if (pFind != map.end())

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -253,7 +253,7 @@ void xlsx_table_context::serialize_sort(std::wostream & _Wostream)
 
 	range = xlsx_data_ranges_map_.equal_range(state()->tableName_);
 
-	for (std::multimap<std::wstring, int>::iterator it = range.first; it != range.second; it++)
+	for (std::multimap<std::wstring, int>::iterator it = range.first; it != range.second; ++it)
 	{
 		xlsx_data_ranges_[it->second]->serialize_sort(_Wostream);
 	}
@@ -271,7 +271,7 @@ void xlsx_table_context::serialize_autofilter(std::wostream & _Wostream)
 
 	range = xlsx_data_ranges_map_.equal_range(state()->tableName_);
 
-	for (std::multimap<std::wstring, int>::iterator it = range.first; it != range.second; it++)
+	for (std::multimap<std::wstring, int>::iterator it = range.first; it != range.second; ++it)
 	{
 		if (xlsx_data_ranges_[it->second]->filter)
 		{

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -717,6 +717,16 @@ void xlsx_conversion_context::end_hyperlink(std::wstring const & href)
 		xlsx_text_context_.end_span2();
 	}
 }
+void xlsx_conversion_context::start_content_validation(const std::wstring & name, const std::wstring & ref)
+{
+}
+void xlsx_conversion_context::set_content_validation_condition(const std::wstring & val)
+{
+}
+void xlsx_conversion_context::end_content_validation()
+{
+}
+
 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));

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -136,6 +136,10 @@ public:
     void start_hyperlink	(const std::wstring & styleName);
     void end_hyperlink		(std::wstring const & href);
 
+	void start_content_validation(const std::wstring & name, const std::wstring & ref);
+		void set_content_validation_condition(const std::wstring & val);
+	void end_content_validation();
+
 //------------------------------------------------------------------------------------
 	void add_pivot_sheet_source				(const std::wstring & sheet_name, int index_table_view);
 

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -762,6 +762,28 @@ void process_build_object::visit(const chart_footer& val)
 void process_build_object::visit(const chart_legend& val)
 {
 	object_odf_context_.legend_.bEnabled = true;
+	object_odf_context_.legend_.position = L"r"; 
+
+	if (val.attlist_.chart_legend_position_)
+	{
+		std::wstring pos = val.attlist_.chart_legend_position_.get();
+		
+		if ( pos == L"bottom")		object_odf_context_.legend_.position = L"b"; 
+		if ( pos == L"start")		object_odf_context_.legend_.position = L"l"; 
+		if ( pos == L"top")			object_odf_context_.legend_.position = L"t"; 
+		if ( pos == L"top-end")		object_odf_context_.legend_.position = L"tr"; 
+		if ( pos == L"top-start")	object_odf_context_.legend_.position = L"tl"; 
+		if ( pos == L"bottom-start")	object_odf_context_.legend_.position = L"bl"; 
+		if ( pos == L"bottom-end")	object_odf_context_.legend_.position = L"br"; 
+	}
+	if (val.attlist_.chart_legend_align_)
+	{
+		std::wstring align = val.attlist_.chart_legend_align_.get();
+		
+		//if ( pos == L"start")		object_odf_context_.legend_.align = L"b"; 
+		//if ( pos == L"center")		object_odf_context_.legend_.align = L"l"; 
+		//if ( pos == L"end")			object_odf_context_.legend_.align = L"t"; 
+	}
 	
 	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_);

ASCOfficeOdfFile/src/odf/chart_build_oox.h

@@ -188,7 +188,7 @@ public:
 	office_element_ptr_array	title_odf_context_;
 
 	chart::title				sub_title_;
-	chart::simple				legend_;
+	chart::legend				legend_;
 	chart::plot_area			plot_area_;
 
 	chart::simple				wall_;

ASCOfficeOdfFile/src/odf/chart_objects.h

@@ -76,6 +76,7 @@ namespace chart {
 	struct simple
 	{
 		simple() : bEnabled(false) {}
+		
 		bool					bEnabled;
 		std::vector<_property>	properties_; 
  		std::vector<_property>	text_properties_;
@@ -92,6 +93,11 @@ namespace chart {
 		treadline(){bEquation = false; bREquation = false;}
 
 	};
+	struct legend : public simple
+    {
+		std::wstring position;
+		std::wstring align;
+	};
 	struct plot_area : public simple
     {
 		std::wstring cell_range_address_;

ASCOfficeOdfFile/src/odf/datatypes/calcext_type.cpp

@@ -58,6 +58,9 @@ std::wostream & operator << (std::wostream & _Wostream, const calcext_type & _Va
         break;
     case calcext_type::Minimum:
         _Wostream << L"minimum";
+		break;
+	case calcext_type::Percentile:
+        _Wostream << L"percentile";
         break;
     default:
         break;
@@ -84,6 +87,8 @@ calcext_type calcext_type::parse(const std::wstring & Str)
         return calcext_type( Minimum );
     else if (tmp == L"formula")
         return calcext_type( Formula );
+	else if (tmp == L"percentile")
+        return calcext_type( Percentile );
 	else
     {
         return calcext_type( Number );

ASCOfficeOdfFile/src/odf/datatypes/calcext_type.h

@@ -49,7 +49,8 @@ public:
         Minimum,
         AutoMaximum,
         AutoMinimum,
-		Formula
+		Formula,
+		Percentile
     };
 
     calcext_type() {}

ASCOfficeOdfFile/src/odf/font_face.h

@@ -144,7 +144,6 @@ 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_name);
 
 //  svg:definition-src
@@ -164,10 +163,8 @@ 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);
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(svg_definition_src);
 
-
 //  style:font-face
 class style_font_face : public office_element_impl<style_font_face>
 {
@@ -233,7 +230,6 @@ public:
 
     friend class odf_document;
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(style_font_face);
 
 //  office-font-face-decls
@@ -257,7 +253,6 @@ 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);
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(office_font_face_decls);
 
 }

ASCOfficeOdfFile/src/odf/note.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "paragraph_elements.h"
 

ASCOfficeOdfFile/src/odf/number_style.cpp

@@ -38,7 +38,6 @@
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/CPColorUtils.h>
 
 #include "serialize_elements.h"

ASCOfficeOdfFile/src/odf/office_binary_data.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 namespace cpdoccore { 
 namespace odf_reader {

ASCOfficeOdfFile/src/odf/office_body.cpp

@@ -36,7 +36,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include <cpdoccore/odf/odf_document.h>
 

ASCOfficeOdfFile/src/odf/office_chart.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 
@@ -81,7 +80,16 @@ void chart_chart::add_attributes( const xml::attributes_wc_ptr & Attributes )
 
 void chart_chart::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-	CP_CREATE_ELEMENT(content_);
+	if CP_CHECK_NAME(L"text", L"tracked-changes") 
+	{
+		CP_CREATE_ELEMENT(tracked_changes_);
+	}
+	else if CP_CHECK_NAME(L"table", L"content-validations")
+	{
+		CP_CREATE_ELEMENT(content_validations_);
+	}
+	else
+		CP_CREATE_ELEMENT(content_);
 }
 void chart_title_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {

ASCOfficeOdfFile/src/odf/office_chart.h

@@ -60,7 +60,10 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    office_element_ptr_array content_;
+	office_element_ptr			tracked_changes_;
+	office_element_ptr			content_validations_;
+    
+	office_element_ptr_array	content_;
 
 };
 
@@ -72,7 +75,6 @@ class common_chart_attlist
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     _CP_OPT(std::wstring)		chart_style_name_;
 };
 
@@ -106,6 +108,10 @@ private:
 
 public:
     chart_chart_attlist			attlist_;
+	
+	office_element_ptr			tracked_changes_;
+	office_element_ptr			content_validations_;
+	
 	office_element_ptr_array	content_;
 };
 
@@ -117,7 +123,6 @@ class chart_title_attlist
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     _CP_OPT(std::wstring)					table_cell_range_;
     odf_types::common_draw_position_attlist common_draw_position_attlist_;
     common_chart_attlist					common_attlist_;
@@ -194,13 +199,13 @@ class chart_legend_attlist
 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_;
-    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_;
-    common_chart_attlist		common_attlist_;
+	
+	odf_types::common_draw_position_attlist		common_draw_position_attlist_;
+	common_chart_attlist						common_attlist_;
 
 };
 

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -69,8 +69,14 @@ enum ElementType
     typeTextTime,
     typeTextModificationTime,
     typeTextFileName,
-    typeTextSequence,
     typeTextSheetName,
+    typeTextTemplateName,
+	typeTextDropDown,
+	typeTextLabel,
+
+    typeTextSequenceDecls,
+    typeTextSequenceDecl,
+    typeTextSequence,
 
 	typePresentationFooter,
 	typePresentationDateTime,
@@ -78,6 +84,8 @@ enum ElementType
 	typeDcCreator,
 	typeDcDate,
 
+	typeDrawA,
+
     typeTextH,
     typeTextP,
 
@@ -90,28 +98,42 @@ enum ElementType
     typeTextSectionSource,
     typeTextIndexTitle,
     typeTextIndexBody,
-
-    typeTextNumberedParagraph,    
-   
-    typeDrawA,
+    typeTextNumberedParagraph, 
+	typeTextExpression,    
 
     typeTextTableOfContent,
-    typeTextIllustrationIndex,
-    typeTextTableIndex,
-    typeTextObjectIndex,
-    typeTextUserIndex,
-    typeTextAlphabeticalIndex,
-    typeTextBibliography,
-
-	typeTextBibliographyMark,
-  	
     typeTextTableOfContentSource,
+    
+	typeTextIllustrationIndex,
     typeTextIllustrationIndexSource,
+   
+	typeTextTableIndex,
     typeTextTableIndexSource,
+    
+	typeTextObjectIndex,
     typeTextObjectIndexSource,
+   
+	typeTextUserIndex,
     typeTextUserIndexSource,
+    
+	typeTextAlphabeticalIndex,
     typeTextAlphabeticalIndexSource,
-    typeTextBibliographySource,
+   
+	typeTextBibliography,
+	typeTextBibliographyMark,
+    typeTextBibliographySource,  	
+
+	typeTextVariableInput,
+	typeTextVariableGet,
+	typeTextVariableSet,
+	typeTextVariableDecl,
+	typeTextVariableDecls,
+
+	typeTextUserFieldDecls,
+	typeTextUserFieldDecl,
+	typeTextUserFieldGet,
+	typeTextUserFieldSet,
+	typeTextUserFieldInput,
 
 	typeTextTrackedChanges,
 	typeTextChangedRegion,
@@ -125,6 +147,11 @@ enum ElementType
 	typeTextFormatChange,
 	typeTextInsertion,
 
+	typeTextMeta,
+	typeTextMetaField,
+
+	typeTextTextInput,
+
 	typeShape,
     typeChangeMarks,
 
@@ -206,6 +233,11 @@ enum ElementType
 	typeTableDatabaseRange,
 	typeTableSort,
 	typeTableSortBy,
+	typeTableCalculationSettings,
+    typeTableNullDate,
+    typeTableShapes,
+	typeTableContentValidation,
+	typeTableContentValidations,
 
 	typeTableFilter,
 	typeTableFilterAnd,
@@ -384,9 +416,6 @@ enum ElementType
 
 	typeScriptEventListener,
 
-	typeTableCalculationSettings,
-    typeTableNullDate,
-
     typeNumberNumberStyle,
     typeNumberDataStyle,
     typeNumberText,
@@ -409,7 +438,6 @@ enum ElementType
     typeNumberMinutes,
     typeNumberSeconds,
     typeNumberAmPm,
-    typeTableShapes,
 
     typeChartChart,
     typeChartTitle,

ASCOfficeOdfFile/src/odf/office_presentation.cpp

@@ -54,11 +54,25 @@ const wchar_t * office_presentation::name = L"presentation";
 void office_presentation::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
 	if	CP_CHECK_NAME(L"draw", L"page") 
+	{
 		CP_CREATE_ELEMENT(pages_);
+	}
+	else if CP_CHECK_NAME(L"table", L"tracked-changes")
+	{
+		CP_CREATE_ELEMENT(tracked_changes_);
+	}
+	else if CP_CHECK_NAME(L"table", L"content-validations")
+	{
+		CP_CREATE_ELEMENT(content_validations_);
+	}
 	else if CP_CHECK_NAME(L"presentation", L"footer-decl") 
+	{
 		CP_CREATE_ELEMENT(footer_decls_);
+	}
 	else if CP_CHECK_NAME(L"presentation", L"date-time-decl") 
+	{
 		CP_CREATE_ELEMENT(date_time_decls_);
+	}
 
 }
 

ASCOfficeOdfFile/src/odf/office_presentation.h

@@ -62,10 +62,13 @@ private:
 
 public:
 
-    office_element_ptr_array date_time_decls_;
-    office_element_ptr_array footer_decls_;
+	office_element_ptr			tracked_changes_;
+	office_element_ptr			content_validations_;
+    
+    office_element_ptr_array	date_time_decls_;
+    office_element_ptr_array	footer_decls_;
   
-	office_element_ptr_array pages_;
+	office_element_ptr_array	pages_;
 
 };
 

ASCOfficeOdfFile/src/odf/office_scripts.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 

ASCOfficeOdfFile/src/odf/office_settings.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 

ASCOfficeOdfFile/src/odf/office_spreadsheet.cpp

@@ -63,6 +63,10 @@ void office_spreadsheet::add_child_element( xml::sax * Reader, const std::wstrin
 	{
 		CP_CREATE_ELEMENT(tracked_changes_);
 	}
+	else if CP_CHECK_NAME(L"table", L"content-validations")
+	{
+		CP_CREATE_ELEMENT(content_validations_);
+	}
 	else
 		CP_CREATE_ELEMENT(content_);
 }

ASCOfficeOdfFile/src/odf/office_spreadsheet.h

@@ -62,12 +62,12 @@ public:
 	office_element_ptr			database_ranges_; 
 	office_element_ptr			data_pilot_tables_;
 	office_element_ptr			tracked_changes_;
-
+	office_element_ptr			content_validations_;
+	
 	office_element_ptr_array	content_;
  	
 	// table:calculation-settings
 	// table:consolidation
-	// table:content-validations
 	// table:dde-links
 	// table:label-ranges
 	

ASCOfficeOdfFile/src/odf/office_text.cpp

@@ -101,6 +101,10 @@ void office_text::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 	{
 		CP_CREATE_ELEMENT(tracked_changes_);
 	}
+	else if CP_CHECK_NAME(L"table", L"content-validations")
+	{
+		CP_CREATE_ELEMENT(content_validations_);
+	}
 	else if (is_text_content(Ns, Name))
     {
         CP_CREATE_ELEMENT(content_);

ASCOfficeOdfFile/src/odf/office_text.h

@@ -67,7 +67,9 @@ private:
     //  TODO: table-decls
 
 	office_element_ptr			tracked_changes_;
-    office_element_ptr_array	content_;
+	office_element_ptr			content_validations_;
+    
+	office_element_ptr_array	content_;
     // TODO: text-page-sequence
     // TODO: office-text-content-epilogue:
     // TODO: table-functions

ASCOfficeOdfFile/src/odf/paragraph_elements.cpp

@@ -39,7 +39,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/common/readstring.h>
 #include <cpdoccore/odf/odf_document.h>
@@ -742,7 +741,7 @@ std::wostream & title::text_to_stream(std::wostream & _Wostream) const
 
 void title::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    common_field_fixed_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void title::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -806,7 +805,7 @@ std::wostream & subject::text_to_stream(std::wostream & _Wostream) const
 
 void subject::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    common_field_fixed_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void subject::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -823,8 +822,8 @@ void subject::docx_convert(oox::docx_conversion_context & Context)
 {
     std::wostream & strm = Context.output_stream();
     Context.finish_run();
-    strm << L"<w:r><w:fldChar w:fldCharType=\"begin\" /></w:r>";
-    strm << L"<w:r><w:instrText>SUBJECT</w:instrText></w:r><w:r><w:fldChar w:fldCharType=\"separate\" /></w:r>";
+    strm << L"<w:r><w:fldChar w:fldCharType=\"begin\"/></w:r>";
+    strm << L"<w:r><w:instrText>SUBJECT</w:instrText></w:r><w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
     Context.add_new_run();
 	
 	std::wstring textNode = L"w:t";
@@ -838,7 +837,7 @@ void subject::docx_convert(oox::docx_conversion_context & Context)
     strm << L"</" << textNode << L">"; 
     
 	Context.finish_run();
-    strm << L"<w:r><w:fldChar w:fldCharType=\"end\" /></w:r>";
+    strm << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
 }
 
 void subject::xlsx_convert(oox::xlsx_conversion_context & Context)
@@ -869,7 +868,7 @@ std::wostream & chapter::text_to_stream(std::wostream & _Wostream) const
 
 void chapter::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    common_field_fixed_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void chapter::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -1379,9 +1378,77 @@ void sequence::pptx_convert(oox::pptx_conversion_context & Context)
         text_[i]->pptx_convert(Context);
     }
 }
+//-------------------------------------------------------------------------------------------------------------------
+// text:drop-down
+//-------------------------------------------------------------------------------------------------------------------
+const wchar_t * text_drop_down::ns		= L"text";
+const wchar_t * text_drop_down::name	= L"drop-down";
 
-// text:sequesheet-namence
-//////////////////////////////////////////////////////////////////////////////////////////////////
+void text_drop_down::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"text:name", text_name_);
+}
+
+void text_drop_down::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	if CP_CHECK_NAME(L"text", L"label")
+	{
+		CP_CREATE_ELEMENT(content_);
+	}
+	else
+	{
+	}
+}
+
+void text_drop_down::add_text(const std::wstring & Text) 
+{
+    text_ = Text;
+}
+std::wostream & text_drop_down::text_to_stream(std::wostream & _Wostream) const
+{
+    _Wostream << xml::utils::replace_text_to_xml( text_ );
+    return _Wostream;
+}
+
+void text_drop_down::docx_convert(oox::docx_conversion_context & Context) 
+{
+    std::wostream & strm = Context.output_stream();
+	Context.finish_run();
+	
+	strm << L"<w:r><w:fldChar w:fldCharType=\"begin\"><w:ffData><w:name w:val=\"" << text_name_.get_value_or(L"") << L"\"/><w:enabled/>";
+
+	strm << L"<w:ddList><w:result w:val=\"0\"/>";
+	for (size_t i = 0; i < content_.size(); i++)
+    {
+        content_[i]->docx_convert(Context);
+    }
+	strm << L"</w:ddList></w:ffData>";
+
+	strm << L"</w:fldChar></w:r>";
+	strm << L"<w:r><w:instrText>FORMDROPDOWN</w:instrText></w:r>";
+	strm << L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
+	strm << L"<w:r><w:t>" << text_ << L"</w:t></w:r>";
+    strm << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
+}
+//-------------------------------------------------------------------------------------------------------------------
+// text:label
+//-------------------------------------------------------------------------------------------------------------------
+const wchar_t * text_label::ns		= L"text";
+const wchar_t * text_label::name	= L"label";
+
+void text_label::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"text:value", text_value_);
+}
+void text_label::docx_convert(oox::docx_conversion_context & Context) 
+{
+    std::wostream & strm = Context.output_stream();
+	
+	strm << L"<w:listEntry w:val=\"" << text_value_.get_value_or(L"") << L"\"/>";
+}
+//-------------------------------------------------------------------------------------------------------------------
+// text:sheet-name
+//-------------------------------------------------------------------------------------------------------------------
 const wchar_t * sheet_name::ns = L"text";
 const wchar_t * sheet_name::name = L"sheet-name";
 

ASCOfficeOdfFile/src/odf/paragraph_elements.h

@@ -122,7 +122,6 @@ private:
     _CP_OPT(unsigned int) text_c_;
 	_CP_OPT(std::wstring) content_;
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(s);
 
 // text:tab
@@ -431,7 +430,6 @@ CP_REGISTER_OFFICE_ELEMENT2(a);
 
 // text:note
 //////////////////////////////////////////////////////////////////////////////////////////////////
-
 class note : public paragraph_content_element<note>
 {
 public:
@@ -452,18 +450,16 @@ 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);
 
-	std::wstring text_id_;
-	odf_types::noteclass text_note_class_;
-    office_element_ptr text_note_citation_;
-    office_element_ptr text_note_body_;
+	std::wstring			text_id_;
+	odf_types::noteclass	text_note_class_;
+    office_element_ptr		text_note_citation_;
+    office_element_ptr		text_note_body_;
   
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(note);
 
 // text:ruby
 //////////////////////////////////////////////////////////////////////////////////////////////////
-
 class ruby : public paragraph_content_element<ruby>
 {
 public:
@@ -485,7 +481,6 @@ private:
     office_element_ptr	text_ruby_text_;
   
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(ruby);
 
 class common_field_fixed_attlist
@@ -521,8 +516,8 @@ 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);
 
-    common_field_fixed_attlist common_field_fixed_attlist_;
-    office_element_ptr_array content_;
+    common_field_fixed_attlist	attlist_;
+    office_element_ptr_array	content_;
 
 };
 
@@ -549,7 +544,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);
 
-    common_field_fixed_attlist	common_field_fixed_attlist_;
+    common_field_fixed_attlist	attlist_;
     office_element_ptr_array	content_;
 
 };
@@ -577,7 +572,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);
 
-    common_field_fixed_attlist	common_field_fixed_attlist_;
+    common_field_fixed_attlist	attlist_;
     office_element_ptr_array	content_;
 
 };
@@ -687,7 +682,7 @@ public:
 	_CP_OPT(bool)				text_fixed_;
 	_CP_OPT(std::wstring)		text_date_value_;//with format
 
-    office_element_ptr_array text_;
+    office_element_ptr_array	text_;
 
 private:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
@@ -715,8 +710,9 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(text_modification_date);
 
+//-------------------------------------------------------------------------------------------------------------------
 // text:time 
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 class text_time : public paragraph_content_element<text_time>
 {
 public:
@@ -745,8 +741,9 @@ private:
 
 CP_REGISTER_OFFICE_ELEMENT2(text_time);
 
+//-------------------------------------------------------------------------------------------------------------------
 // text:modification-date
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 class text_modification_time : public text_time
 {
 public:
@@ -762,8 +759,9 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(text_modification_time);
 
+//-------------------------------------------------------------------------------------------------------------------
 // text:file-name 
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 class text_file_name : public paragraph_content_element<text_file_name>
 {
 public:
@@ -787,11 +785,11 @@ private:
     office_element_ptr_array text_;
     
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(text_file_name);
 
+//-------------------------------------------------------------------------------------------------------------------
 // text:sequence
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 class sequence : public paragraph_content_element<sequence>
 {
 public:
@@ -815,11 +813,58 @@ private:
     office_element_ptr_array text_;
     
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(sequence);
+//-------------------------------------------------------------------------------------------------------------------
+//text:drop-down
+//-------------------------------------------------------------------------------------------------------------------
+class text_drop_down : public paragraph_content_element<text_drop_down>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTextDropDown;
+    CPDOCCORE_DEFINE_VISITABLE();
+ 
+	void docx_convert(oox::docx_conversion_context & Context);
 
+    virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
+
+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_OPT(std::wstring)		text_name_;
+    office_element_ptr_array	content_;
+    
+    std::wstring				text_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_drop_down);
+//-------------------------------------------------------------------------------------------------------------------
+//text:drop-down
+//-------------------------------------------------------------------------------------------------------------------
+class text_label : public paragraph_content_element<text_label>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTextLabel;
+    CPDOCCORE_DEFINE_VISITABLE();
+ 
+	void docx_convert(oox::docx_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){}
+
+	_CP_OPT(std::wstring) text_value_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_label);
+//-------------------------------------------------------------------------------------------------------------------
 // text:sheet-name
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 class sheet_name : public paragraph_content_element<sheet_name>
 {
 public:
@@ -837,11 +882,11 @@ private:
     office_element_ptr_array text_;
     
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(sheet_name);
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 //presentation:footer
+//-------------------------------------------------------------------------------------------------------------------
 class presentation_footer : public paragraph_content_element<presentation_footer>
 {
 public:
@@ -861,8 +906,9 @@ private:
 };
 CP_REGISTER_OFFICE_ELEMENT2(presentation_footer);
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-------------------------------------------------------------------------------------------------------------------
 //presentation:date-time
+//-------------------------------------------------------------------------------------------------------------------
 class presentation_date_time: public paragraph_content_element<presentation_date_time>
 {
 public:

ASCOfficeOdfFile/src/odf/ruby.cpp

@@ -33,7 +33,6 @@
 
 #include "ruby.h"
 
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/xmlchar.h>
 

ASCOfficeOdfFile/src/odf/style_paragraph_properties_docx.cpp

@@ -201,18 +201,24 @@ void paragraph_format_properties::docx_convert(oox::docx_conversion_context & Co
 			CP_XML_NODE(L"w:keepNext");
 			CP_XML_NODE(L"w:framePr")
 			{
+				CP_XML_ATTR(L"w:dropCap", L"drop");
+				if (Context.get_drop_cap_context().Scale > 0)
+				{
+					CP_XML_ATTR(L"w:lines",Context.get_drop_cap_context().Scale);
+				}
+				else
+				{
+					CP_XML_ATTR(L"w:hSpace", Context.get_drop_cap_context().Space);	
+				}
+				CP_XML_ATTR(L"w:wrap", L"around"); 
 				CP_XML_ATTR(L"w:hAnchor", L"text");
 				CP_XML_ATTR(L"w:vAnchor", L"text");
-				CP_XML_ATTR(L"w:wrap", L"around"); 
-				CP_XML_ATTR(L"w:dropCap", L"drop");
-				CP_XML_ATTR(L"w:hSpace", Context.get_drop_cap_context().Space);	
-				CP_XML_ATTR(L"w:lines",Context.get_drop_cap_context().Scale);
 			}
 			
 			CP_XML_NODE(L"w:spacing")
 			{
 				CP_XML_ATTR(L"w:after", 0); 
-				if (Context.get_drop_cap_context().FontSize>0)
+				if (Context.get_drop_cap_context().FontSize > 0)
 					CP_XML_ATTR(L"w:line", Context.get_drop_cap_context().FontSize);
 				else
 					CP_XML_ATTR(L"w:line", 240);

ASCOfficeOdfFile/src/odf/style_regions.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 

ASCOfficeOdfFile/src/odf/style_table_properties.cpp

@@ -67,10 +67,11 @@ void table_format_properties::add_attributes( const xml::attributes_wc_ptr & Att
     CP_APPLY_ATTR(L"style:rel-width",				style_rel_width_);
     CP_APPLY_ATTR(L"style:may-break-between-rows",	style_may_break_between_rows_);
     
-	CP_APPLY_ATTR(L"table:align",			table_align_);
-    CP_APPLY_ATTR(L"table:border-model",	table_border_model_);
-    CP_APPLY_ATTR(L"table:display",			table_display_);
-	CP_APPLY_ATTR(L"tableooo:tab-color",	tableooo_tab_color_);			
+	CP_APPLY_ATTR(L"table:align",					table_align_);
+    CP_APPLY_ATTR(L"table:border-model",			table_border_model_);
+    CP_APPLY_ATTR(L"table:display",					table_display_);
+	CP_APPLY_ATTR(L"tableooo:tab-color",			tableooo_tab_color_);			
+	CP_APPLY_ATTR(L"style:use-optimal-column-width",style_use_optimal_column_width_);
 }
 
 bool table_format_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name, document_context * Context)
@@ -94,17 +95,22 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
     if (style_rel_width_)
     {
         int w_w = (int)(0.5 + 50.0 * style_rel_width_->get_value());
-        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"" <<  w_w << "\" />";
+        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"" <<  w_w << "\"/>";
     }
-    else if (style_width_)
+	else if (style_use_optimal_column_width_)
+	{
+       _tblPr << L"<w:tblW w:type=\"auto\" w:w=\"0\"/>";
+	}    
+	else if (style_width_)
     {
         int w_w = (int)(0.5 + 20.0 * style_width_->get_value_unit(length::pt));
  		if (w_w > 31680)w_w = 31680;
-       _tblPr << L"<w:tblW w:type=\"dxa\" w:w=\"" <<  w_w << "\" />";
+       _tblPr << L"<w:tblW w:type=\"dxa\" w:w=\"" <<  w_w << "\"/>";
     }
+
     else
     {
-        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"5000\" />";
+        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"5000\"/>";
     }
 
     if (common_break_attlist_.fo_break_before_)
@@ -127,23 +133,26 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
 			{
 				odf_types::length indent = common_horizontal_margin_attlist_.fo_margin_left_->get_length();
 				
-				_tblPr << L"<w:tblInd w:w=\"" << indent.get_value_unit(odf_types::length::pt) * 20 << "\" w:type=\"dxa\" />";
+				_tblPr << L"<w:tblInd w:w=\"" << indent.get_value_unit(odf_types::length::pt) * 20 << "\" w:type=\"dxa\"/>";
 			}
 		}
         else //if (table_align_->get_type() == table_align::Center)
 			w_val = boost::lexical_cast<std::wstring>(*table_align_);
 
-        _tblPr << L"<w:jc w:val=\"" << w_val << "\" />";
+        _tblPr << L"<w:jc w:val=\"" << w_val << "\"/>";
     }
 
-	_tblPr << "<w:tblLayout w:type=\"fixed\" />";
+	if (!style_use_optimal_column_width_)
+	{
+		_tblPr << "<w:tblLayout w:type=\"fixed\"/>";
+	}
 
     if (common_background_color_attlist_.fo_background_color_)
     {
         const std::wstring w_fill = (common_background_color_attlist_.fo_background_color_->get_type() == background_color::Enabled 
             ? common_background_color_attlist_.fo_background_color_->get_color().get_hex_value() : L"auto");
 
-        _tblPr << L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" << w_fill << "\" />";
+        _tblPr << L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" << w_fill << "\"/>";
     }
 
 }

ASCOfficeOdfFile/src/odf/style_table_properties.h

@@ -79,7 +79,6 @@ public:
    
     _CP_OPT(odf_types::length)			style_width_;
     _CP_OPT(odf_types::percent)			style_rel_width_;
-	office_element_ptr					style_background_image_;
     _CP_OPT(bool)						style_may_break_between_rows_;
 
     _CP_OPT(odf_types::border_model)	table_border_model_;
@@ -87,6 +86,8 @@ public:
     _CP_OPT(bool)						table_display_;	
 	_CP_OPT(odf_types::color)			tableooo_tab_color_;
        
+    _CP_OPT(odf_types::Bool)			style_use_optimal_column_width_; //not specification
+	office_element_ptr					style_background_image_;
 };
 
 class style_table_properties : public office_element_impl<style_table_properties>

ASCOfficeOdfFile/src/odf/style_text_properties.cpp

@@ -1236,12 +1236,19 @@ void text_format_properties_content::docx_convert(oox::docx_conversion_context &
     {
          int fontSize=0;
 		 if (Context.get_drop_cap_context().state()==2)
+		 {
 			 fontSize = process_font_size(fo_font_size_, Context.get_styles_context().get_current_processed_style(),false,
 				 Context.get_drop_cap_context().Scale + (Context.get_drop_cap_context().Scale-1) * 0.7);//вместо 1 ДОЛЖНОБЫТЬ коэфф. межстрочного интервала!!!
+
+			 if (fontSize < 1)
+				 fontSize = Context.get_drop_cap_context().FontSize / 7.52;
+		 }
 		 else
+		 {
 			 fontSize = process_font_size(fo_font_size_, Context.get_styles_context().get_current_processed_style());
+		 }
        
-		 if (fontSize>0)
+		if (fontSize >  0)
 		{
             _rPr << L"<w:sz w:val=\"" << fontSize << "\" />";
 		}

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -34,7 +34,6 @@
 #include "styles.h"
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include <cpdoccore/odf/odf_document.h>
@@ -734,7 +733,7 @@ void style_columns::add_attributes( const xml::attributes_wc_ptr & Attributes )
 void style_columns::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
     if (L"style" == Ns && L"column" == Name)
-        CP_CREATE_ELEMENT(style_column_);
+        CP_CREATE_ELEMENT(style_columns_);
     else if (L"style" == Ns && L"column-sep" == Name)
         CP_CREATE_ELEMENT(style_column_sep_);
     else
@@ -750,11 +749,10 @@ const wchar_t * style_column::name = L"column";
 void style_column::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"style:rel-width",	style_rel_width_);
-    CP_APPLY_ATTR(L"fo:start-indent",	fo_start_indent_,	length(0.0, length::cm));
-    CP_APPLY_ATTR(L"fo:end-indent",		fo_end_indent_,		length(0.0, length::cm));
-    CP_APPLY_ATTR(L"fo:space-before",	fo_space_before_,	length(0.0, length::cm));
-    CP_APPLY_ATTR(L"fo:space-after",	fo_space_after_,	length(0.0, length::cm));
-    
+    CP_APPLY_ATTR(L"fo:start-indent",	fo_start_indent_);
+    CP_APPLY_ATTR(L"fo:end-indent",		fo_end_indent_);
+    CP_APPLY_ATTR(L"fo:space-before",	fo_space_before_);
+    CP_APPLY_ATTR(L"fo:space-after",	fo_space_after_);    
 }
 
 void style_column::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -764,7 +762,7 @@ void style_column::add_child_element( xml::sax * Reader, const std::wstring & Ns
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_column_sep::ns = L"style";
-const wchar_t * style_column_sep::name = L":column-sep";
+const wchar_t * style_column_sep::name = L"column-sep";
 
 void style_column_sep::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
@@ -1349,16 +1347,20 @@ void style_page_layout_properties::docx_serialize(std::wostream & strm, oox::doc
 		{
 			Context.process_section( CP_XML_STREAM(), columns);
 			
-			bool next_page = Context.is_next_dump_page_properties();
+			bool change_page_layout = Context.is_next_dump_page_properties();
 			
 			CP_XML_NODE(L"w:type")
 			{				
-				if (next_page)	CP_XML_ATTR(L"w:val", L"nextPage");
-				else			CP_XML_ATTR(L"w:val", L"continuous");
+				if (change_page_layout)
+				{
+					CP_XML_ATTR(L"w:val", L"nextPage");
+				}
+				else			
+					CP_XML_ATTR(L"w:val", L"continuous");
 			}			
 
 			std::wstring masterPageName = Context.get_master_page_name();
-			bool res = Context.get_headers_footers().write_sectPr(masterPageName, next_page, strm);
+			bool res = Context.get_headers_footers().write_sectPr(masterPageName, change_page_layout, strm);
 			
 			if (res == false)
 			{
@@ -1369,7 +1371,7 @@ void style_page_layout_properties::docx_serialize(std::wostream & strm, oox::doc
 				Context.remove_page_properties();
 				Context.add_page_properties(masterPageNameLayout);
 				
-				bool res = Context.get_headers_footers().write_sectPr(masterPageName, next_page, strm);
+				bool res = Context.get_headers_footers().write_sectPr(masterPageName, change_page_layout, strm);
 			}
 	
 			oox::section_context::_section & section = Context.get_section_context().get();

ASCOfficeOdfFile/src/odf/styles.h

@@ -674,9 +674,6 @@ public:
 
 CP_REGISTER_OFFICE_ELEMENT2(style_footer_left);
 
-/// style_columns
-/// style-columns
-/// style:columns
 class style_columns : public office_element_impl<style_columns>
 {
 public:
@@ -695,15 +692,12 @@ public:
 	_CP_OPT(odf_types::length)	fo_column_gap_;
 
     office_element_ptr			style_column_sep_;
-    office_element_ptr_array	style_column_;
+    office_element_ptr_array	style_columns_;
 
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(style_columns);
 
-/// style_column
-/// style-column
-/// style:column
 class style_column : public office_element_impl<style_column>
 {
 public:
@@ -719,18 +713,14 @@ private:
 
 public:
     _CP_OPT(odf_types::length)	style_rel_width_;
-    odf_types::length			fo_start_indent_;
-    odf_types::length			fo_end_indent_;
-    odf_types::length			fo_space_before_;
-    odf_types::length			fo_space_after_;
+    _CP_OPT(odf_types::length)	fo_start_indent_;
+    _CP_OPT(odf_types::length)	fo_end_indent_;
+    _CP_OPT(odf_types::length)	fo_space_before_;
+    _CP_OPT(odf_types::length)	fo_space_after_;
     
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(style_column);
 
-/// style_column_sep
-/// style-column-sep
-/// style:column-sep
 class style_column_sep : public office_element_impl<style_column_sep>
 {
 public:
@@ -751,11 +741,9 @@ public:
     odf_types::vertical_align	style_vertical_align_; //default top
     odf_types::color			style_color_; // default #000000
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(style_column_sep);
 
 
-///         style:section-properties
 class style_section_properties : public office_element_impl<style_section_properties>
 {
 public:

ASCOfficeOdfFile/src/odf/table.cpp

@@ -35,7 +35,6 @@
 #include <boost/make_shared.hpp>
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 
@@ -337,23 +336,6 @@ void table_columns_and_groups::add_child_element( xml::sax * Reader, const std::
     }
     else
         not_applicable_element(L"table-columns-and-groups", Reader, Ns, Name);
-    /*
-    if (CP_CHECK_NAME(L"table", L"table-column-group") && type_ != 1)
-    {
-        type_ = 0;
-        CP_CREATE_ELEMENT_SIMPLE(table_table_column_group_);
-    } 
-    else if ((  CP_CHECK_NAME(L"table", L"table-columns") ||
-                CP_CHECK_NAME(L"table", L"table-column") ||
-                CP_CHECK_NAME(L"table", L"table-header-columns") ) 
-                && type_ != 0)
-    {
-        type_ = 1;
-        table_columns_no_group_.add_child_element(Reader, Ns, Name, Context);
-    }
-    else
-        not_applicable_element(L"table-columns-and-groups", Reader, Ns, Name);
-    */
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -746,6 +728,82 @@ void table_shapes::add_child_element( xml::sax * Reader, const std::wstring & Ns
     CP_CREATE_ELEMENT(content_);
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// table:content-validations
+const wchar_t * table_content_validations::ns = L"table";
+const wchar_t * table_content_validations::name = L"content-validations";
+
+void table_content_validations::docx_convert(oox::docx_conversion_context & Context)
+{
+	for (size_t i = 0 ; i < content_.size(); i++)
+	{
+        content_[i]->docx_convert(Context);
+    }
+}
+void table_content_validations::pptx_convert(oox::pptx_conversion_context & Context)
+{
+	for (size_t i = 0 ; i < content_.size(); i++)
+	{
+        content_[i]->pptx_convert(Context);
+    }
+}
+
+void table_content_validations::xlsx_convert(oox::xlsx_conversion_context & Context) 
+{
+	for (size_t i = 0 ; i < content_.size(); i++)
+	{
+		content_[i]->xlsx_convert(Context);
+    }
+}
+
+void table_content_validations::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+    CP_CREATE_ELEMENT(content_);
+}
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// table:content-validation
+const wchar_t * table_content_validation::ns = L"table";
+const wchar_t * table_content_validation::name = L"content-validation";
+
+void table_content_validation::docx_convert(oox::docx_conversion_context & Context)
+{
+	//for (size_t i = 0 ; i < content_.size(); i++)
+	//{
+ //       content_[i]->docx_convert(Context);
+ //   }
+}
+void table_content_validation::pptx_convert(oox::pptx_conversion_context & Context)
+{
+	//for (size_t i = 0 ; i < content_.size(); i++)
+	//{
+ //       content_[i]->pptx_convert(Context);
+ //   }
+}
+
+void table_content_validation::xlsx_convert(oox::xlsx_conversion_context & Context) 
+{
+	Context.start_content_validation(table_name_.get_value_or(L""), table_base_cell_address_.get_value_or(L""));
+	Context.set_content_validation_condition(table_condition_.get_value_or(L""));
+	
+	for (size_t i = 0 ; i < content_.size(); i++)
+	{
+		content_[i]->xlsx_convert(Context);
+    }
+	
+	Context.end_content_validation();
+}
+void table_content_validation::add_attributes(xml::attributes_wc_ptr const & Attributes)
+{
+    CP_APPLY_ATTR(L"table:name",				table_name_);
+    CP_APPLY_ATTR(L"table:condition",			table_condition_);
+	CP_APPLY_ATTR(L"table:display-list",		table_display_list_);
+	CP_APPLY_ATTR(L"table:allowempty-cell",		table_allowempty_cell_);
+	CP_APPLY_ATTR(L"table:base-cell-address",	table_base_cell_address_);
+}
+void table_content_validation::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+    CP_CREATE_ELEMENT(content_);
+}
 
 
 }

ASCOfficeOdfFile/src/odf/table.h

@@ -653,6 +653,7 @@ public:
 };
 CP_REGISTER_OFFICE_ELEMENT2(table_table);
 
+//table:content-shapes
 class table_shapes : public office_element_impl<table_shapes>
 {
 public:
@@ -676,5 +677,57 @@ private:
 };
 CP_REGISTER_OFFICE_ELEMENT2(table_shapes);
 
+//table:content-validations
+class table_content_validations : public office_element_impl<table_content_validations>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableContentValidations;
+
+    CPDOCCORE_DEFINE_VISITABLE();
+
+    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) ;
+
+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);
+
+    office_element_ptr_array content_;
+
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_content_validations);
+
+//table:content-validation
+class table_content_validation : public office_element_impl<table_content_validation>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableContentValidation;
+
+    CPDOCCORE_DEFINE_VISITABLE();
+
+    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) ;
+
+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);
+
+    _CP_OPT(std::wstring)		table_name_;
+	_CP_OPT(odf_types::Bool)	table_allowempty_cell_;
+	_CP_OPT(std::wstring)		table_display_list_;
+    _CP_OPT(std::wstring)		table_condition_;
+    _CP_OPT(std::wstring)		table_base_cell_address_;
+
+    office_element_ptr_array	content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_content_validation);
 }
 }

ASCOfficeOdfFile/src/odf/table_calculation_settings.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 

ASCOfficeOdfFile/src/odf/table_docx.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 #include "odfcontext.h"
@@ -164,7 +163,6 @@ void table_table::docx_convert(oox::docx_conversion_context & Context)
     if (inst && inst->content())
         inst->content()->docx_convert(Context);
 
-
 	Context.get_styles_context().docx_serialize_table_style(_Wostream, Context.get_text_tracked_context().dumpTblPr_);
 
 	_Wostream << L"<w:tblGrid>";

ASCOfficeOdfFile/src/odf/table_pptx.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "serialize_elements.h"

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/odf/odf_document.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
@@ -804,11 +803,13 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
     
 	is_style_visible = (!cellStyleName.empty() || defaultColumnCellStyle) ? true : false;
 
-	if ( content_.elements_.size() > 0	|| 
-		!formula.empty()	||
+	if ( content_.elements_.size() > 0	|| attlist_.table_content_validation_name_ || !formula.empty()	||
 		(	t_val == oox::XlsxCellType::n										&& !number_val.empty()) || 
 		(	t_val == oox::XlsxCellType::b										&& bool_val) ||
-		((	t_val == oox::XlsxCellType::str || oox::XlsxCellType::inlineStr)	&& str_val))	is_data_visible = true;
+		((	t_val == oox::XlsxCellType::str || oox::XlsxCellType::inlineStr)	&& str_val))	
+	{
+		is_data_visible = true;
+	}
 
 	if (attlist_.table_number_columns_repeated_ < 199 && last_cell_)	last_cell_ = false;
 	
@@ -888,6 +889,10 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
                     {
                         CP_XML_NODE(L"v")   { CP_XML_CONTENT((int)(bool_val.get())); }
                     }
+
+					if (attlist_.table_content_validation_name_)
+					{
+					}
                 }
 				if ( is_data_visible || (cellStyle && is_style_visible && !last_cell_))
 				{

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -34,7 +34,7 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
+#include <cpdoccore/xml/utils.h>
 
 #include "paragraph_elements.h"
 #include "serialize_elements.h"
@@ -126,8 +126,8 @@ void process_paragraph_drop_cap_attr(const paragraph_attrs & Attr, oox::docx_con
 	if ((text_properties) && (text_properties->content().fo_font_size_))
 	{
 		Context.get_drop_cap_context().FontSize = styleContent->get_style_text_properties()->content().process_font_size(
-				text_properties->content().fo_font_size_, Context.get_styles_context().get_current_processed_style(),false,
-					 7.25 * (Context.get_drop_cap_context().Scale + (Context.get_drop_cap_context().Scale-1) * 0.7));//формула ачуметь !! - подбор вручную
+				text_properties->content().fo_font_size_, Context.get_styles_context().get_current_processed_style(), false, //1.);
+		7.25 * (Context.get_drop_cap_context().Scale + (Context.get_drop_cap_context().Scale-1) * 0.7));//формула ачуметь !! - подбор вручную
 	}
 	return;
 }
@@ -185,6 +185,29 @@ int process_paragraph_attr(const paragraph_attrs & Attr, oox::docx_conversion_co
 					Context.end_automatic_style();
 
                     Context.push_text_properties(styleContent->get_style_text_properties());
+
+					if (!Context.get_section_context().dump_.empty()
+						&& !Context.get_table_context().in_table()
+						&& (Context.get_process_note() == oox::docx_conversion_context::noNote)
+						&& !in_drawing)
+					{
+						Context.output_stream() << L"<w:pPr>";
+						if (Context.is_paragraph_header() )
+						{
+							Context.output_stream() << Context.get_section_context().dump_;
+							Context.get_section_context().dump_.clear();
+
+							Context.output_stream() << L"</w:pPr>";
+							Context.finish_paragraph();
+							Context.start_paragraph();					
+						}
+						else
+						{
+							Context.output_stream() << Context.get_section_context().dump_;
+							Context.get_section_context().dump_.clear();
+							Context.output_stream() << L"</w:pPr>";
+						}
+					}
 					return 1;
                 }            
             }
@@ -318,26 +341,37 @@ void paragraph::drop_cap_text_docx_convert(office_element_ptr first_text_element
 	int textStyle = process_paragraph_attr(attrs_, Context);
 	first_text_paragraph->docx_convert(Context); 
 
-	int str_start	= Context.get_drop_cap_context().Length;
-	int str_size	= store_str.length()-Context.get_drop_cap_context().Length;
+	size_t str_start	= Context.get_drop_cap_context().Length;
+	size_t str_size	= store_str.length() - Context.get_drop_cap_context().Length;
 
 	if (str_size < 0) str_size = 0;										// это если на буквы в буквице разные стили
 	if (str_start > store_str.length()) str_start = store_str.length(); // это если на буквы в буквице разные стили
 
-	str=store_str.substr(str_start, str_size);
+	str = store_str.substr(str_start, str_size);
 }
-void paragraph::drop_cap_docx_convert(oox::docx_conversion_context & Context)
+
+size_t paragraph::drop_cap_docx_convert(oox::docx_conversion_context & Context)
 {
-	if ( content_.empty()) return;
+	if ( content_.empty()) return 0;
+
+	size_t index = 0;
+
+	while(index < content_.size()) // могут быть track-change, ...
+	{
+		if (content_[index]->get_type() == typeTextText || 
+			content_[index]->get_type() == typeTextSpan)
+			break;
+		content_[index++]->docx_convert(Context); 
+	}
 
 	//в рассчет берутся только первые элементы !!! разные там break-и отменяют реэжим drop_cap!!- todooo сделать возможным множественным span
-	if ( content_[0]->get_type() == typeTextText)
+	if ( content_[index]->get_type() == typeTextText)
 	{
-		drop_cap_text_docx_convert(content_[0],Context);
+		drop_cap_text_docx_convert(content_[index], Context);
 	}
-	else if (content_[0]->get_type() == typeTextSpan)
+	else if (content_[index]->get_type() == typeTextSpan)
 	{
-		span* first_span_in_paragraph = dynamic_cast<span*>(content_[0].get());
+		span* first_span_in_paragraph = dynamic_cast<span*>(content_[index].get());
 		if (Context.get_drop_cap_context().FontSize < 1)
 		{
 			style_instance * styleInst = Context.root()->odf_context().styleContainer().style_by_name(first_span_in_paragraph->text_style_name_, style_family::Text,Context.process_headers_footers_);
@@ -350,19 +384,20 @@ void paragraph::drop_cap_docx_convert(oox::docx_conversion_context & Context)
 					if ((text_properties) && (text_properties->content().fo_font_size_))
 					{
 						Context.get_drop_cap_context().FontSize = styleContent->get_style_text_properties()->content().process_font_size(
-							text_properties->content().fo_font_size_, Context.get_styles_context().get_current_processed_style(),false,
+							text_properties->content().fo_font_size_, Context.get_styles_context().get_current_processed_style(),  false, //1);
 									 7.25 * (Context.get_drop_cap_context().Scale + (Context.get_drop_cap_context().Scale-1) * 0.7));
 					}
 				}
 			}
 		}
 		//в рассчет берутся только первые элементы !!! разные там break-и отменяют реэжим drop_cap!!
-		if ((first_span_in_paragraph->content_.size()>0) &&
+		if ((!first_span_in_paragraph->content_.empty()) &&
 			 (first_span_in_paragraph->content_[0]->get_type() == typeTextText))
 		{
-			drop_cap_text_docx_convert(first_span_in_paragraph->content_[0],Context);
+			drop_cap_text_docx_convert(first_span_in_paragraph->content_[0], Context);
 		}
 	}
+	return index;
 }
 void paragraph::docx_convert(oox::docx_conversion_context & Context)
 {
@@ -404,8 +439,8 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
     {
         // проверяем не сменит ли следующий параграф свойства страницы.
         // если да — устанавливаем контексту флаг на то что необходимо в конце текущего параграфа 
-        // распечатать свойства секции
-		//проверить ... не она ли основная - может быть прописан дубляж - и тогда разрыв нарисуется ненужный
+        // распечатать свойства раздела
+		//проверить ... не она ли текущая - может быть прописан дубляж - и тогда разрыв нарисуется ненужный
         const std::wstring & next_styleName				= next_par_->attrs_.text_style_name_;
         const _CP_OPT(std::wstring) next_masterPageName	= Context.root()->odf_context().styleContainer().master_page_name_by_name(next_styleName);
 
@@ -434,12 +469,17 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
 
 		is_empty = false;
     }    
-
+	std::wstringstream strm;
+	if (Context.process_page_properties(strm))
+	{
+		Context.get_section_context().dump_ = strm.str();
+	}
 	process_paragraph_drop_cap_attr(attrs_, Context);
 
+	size_t index = 0;
 	if (Context.get_drop_cap_context().state() == 2)//active
 	{
-		drop_cap_docx_convert(Context); 
+		index = drop_cap_docx_convert(Context); 
 		
 		Context.finish_run();
 		Context.finish_paragraph();		
@@ -453,7 +493,7 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
 
     Context.add_note_reference();
 
-  	for (size_t i = 0; i < content_.size(); i++)
+  	for (size_t i = index; i < content_.size(); i++)
 	{
 		if (Context.get_page_break())
 		{
@@ -495,14 +535,7 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
 	if (is_empty)
 		Context.output_stream() << emptyParagraphContent;
 
-
 	Context.finish_paragraph();
-
-	std::wstringstream strm;
-	if (Context.process_page_properties(strm))
-	{
-		Context.get_section_context().dump_ = strm.str();
-	}
 }
 
 void paragraph::xlsx_convert(oox::xlsx_conversion_context & Context)
@@ -1391,7 +1424,119 @@ void text_change_end::docx_convert(oox::docx_conversion_context & Context)
 {
 	Context.end_text_changes (*text_change_id_);
 }
+//---------------------------------------------------------------------------------------------------
+const wchar_t * text_variable_input::ns		= L"text";
+const wchar_t * text_variable_input::name	= L"variable-input";
+
+void text_variable_input::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"office:value-type",		office_value_type_);
+	CP_APPLY_ATTR(L"style:data-style-name",	style_data_style_name_);
+	CP_APPLY_ATTR(L"text:description",		text_description_);
+	CP_APPLY_ATTR(L"text:display",			text_display_);
+	CP_APPLY_ATTR(L"text:name",				text_name_);
+}
+void text_variable_input::add_text(const std::wstring & Text) 
+{
+    text_ = Text;
+}
+std::wostream & text_variable_input::text_to_stream(std::wostream & _Wostream) const
+{
+    _Wostream << xml::utils::replace_text_to_xml( text_ );
+    return _Wostream;
+}
+
+void text_variable_input::docx_convert(oox::docx_conversion_context & Context)
+{
+    std::wostream & strm = Context.output_stream();
+	Context.finish_run();
+	
+	strm << L"<w:r><w:fldChar w:fldCharType=\"begin\"/></w:r>";
+	strm << L"<w:r><w:instrText>ASK &quot;" << text_name_.get_value_or(L"") << L"&quot; " << text_description_.get_value_or(L"") << L" \\d ";
+	strm << text_;
+	strm << L"</w:instrText></w:r>";
+	strm << L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
+    strm << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
+
+	strm << L"<w:r><w:fldChar w:fldCharType=\"begin\"/></w:r>";
+	strm << L"<w:r><w:instrText>REF &quot;" << text_name_.get_value_or(L"") << L"&quot; </w:instrText></w:r>";
+	strm << L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
+	strm << L"<w:r><w:t>" << text_ << L"</w:t></w:r>";
+	strm << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
 
+}
+//---------------------------------------------------------------------------------------------------
+const wchar_t * text_variable_get::ns	= L"text";
+const wchar_t * text_variable_get::name	= L"variable-get";
+
+void text_variable_get::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"style:data-style-name",	style_data_style_name_);
+	CP_APPLY_ATTR(L"text:display",			text_display_);
+	CP_APPLY_ATTR(L"text:name",				text_name_);
+}
+void text_variable_get::docx_convert(oox::docx_conversion_context & Context)
+{
+
+}
+//---------------------------------------------------------------------------------------------------
+const wchar_t * text_variable_set::ns	= L"text";
+const wchar_t * text_variable_set::name	= L"variable-set";
+
+void text_variable_set::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"office:value-type",		office_value_type_);
+	CP_APPLY_ATTR(L"style:data-style-name",	style_data_style_name_);
+	CP_APPLY_ATTR(L"text:display",			text_display_);
+	CP_APPLY_ATTR(L"text:name",				text_name_);
+
+	CP_APPLY_ATTR(L"office:value",			office_value_);
+	CP_APPLY_ATTR(L"office:boolean-value",	office_boolean_value_);
+	CP_APPLY_ATTR(L"office:date-value",		office_date_value_);
+	CP_APPLY_ATTR(L"office:time-value",		office_time_value_);
+	CP_APPLY_ATTR(L"office:string-value",	office_string_value_);
+	CP_APPLY_ATTR(L"office:currency",		office_currency_);
+	CP_APPLY_ATTR(L"office:formula",		office_formula_);
+}
+void text_variable_set::docx_convert(oox::docx_conversion_context & Context)
+{
+
+}
+//---------------------------------------------------------------------------------------------------
+const wchar_t * text_variable_decl::ns		= L"text";
+const wchar_t * text_variable_decl::name	= L"variable-decl";
+
+void text_variable_decl::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"office:value-type",		office_value_type_);
+	CP_APPLY_ATTR(L"text:display",			text_display_);
+	CP_APPLY_ATTR(L"text:name",				text_name_);
+}
+void text_variable_decl::docx_convert(oox::docx_conversion_context & Context)
+{
+
+}
+//---------------------------------------------------------------------------------------------------
+const wchar_t * text_variable_decls::ns		= L"text";
+const wchar_t * text_variable_decls::name	= L"variable-decls";
+
+void text_variable_decls::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	if CP_CHECK_NAME(L"text", L"variable-decl")
+	{
+		CP_CREATE_ELEMENT(content_);
+	}
+	else
+	{
+	}
+}
+void text_variable_decls::docx_convert(oox::docx_conversion_context & Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+		content_[i]->docx_convert(Context);
+	}
+}
 }
 }
 }

ASCOfficeOdfFile/src/odf/text_elements.h

@@ -78,7 +78,7 @@ public:
     void xlsx_convert (oox::xlsx_conversion_context & Context) ;
     void pptx_convert (oox::pptx_conversion_context & Context) ;
 
-	void drop_cap_docx_convert(oox::docx_conversion_context & Context);
+	size_t drop_cap_docx_convert(oox::docx_conversion_context & Context);
 
     office_element_ptr_array	content_;
 private:
@@ -535,8 +535,6 @@ public:
 };
 CP_REGISTER_OFFICE_ELEMENT2(text_index_title);
 
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------------
 class text_unknown_base_change : public office_element_impl<text_unknown_base_change>
 {
@@ -717,8 +715,137 @@ public:
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 };
 CP_REGISTER_OFFICE_ELEMENT2(text_change_end);
+//-------------------------------------------------------------------------------------------------------------------
+//text:variable-input
 //---------------------------------------------------------------------------------------------------
+class text_variable_input : public office_element_impl<text_variable_input>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTextVariableInput;
+    CPDOCCORE_DEFINE_VISITABLE()
+    
+    void docx_convert(oox::docx_conversion_context & Context);
 
+    virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
+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_OPT(odf_types::office_value_type)	office_value_type_;
+	_CP_OPT(std::wstring)	style_data_style_name_;
+	_CP_OPT(std::wstring)	text_description_;
+	_CP_OPT(std::wstring)	text_display_;
+	_CP_OPT(std::wstring)	text_name_;
+
+    std::wstring			text_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_variable_input);
+//-------------------------------------------------------------------------------------------------------------------
+//text:variable-get
+//---------------------------------------------------------------------------------------------------
+class text_variable_get : public office_element_impl<text_variable_get>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTextVariableGet;
+    CPDOCCORE_DEFINE_VISITABLE()
+    
+    void docx_convert(oox::docx_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){}
+
+	_CP_OPT(std::wstring)	style_data_style_name_;
+	_CP_OPT(std::wstring)	text_display_;
+	_CP_OPT(std::wstring)	text_name_;
+
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_variable_get);
+//-------------------------------------------------------------------------------------------------------------------
+//text:variable-set
+//---------------------------------------------------------------------------------------------------
+class text_variable_set : public office_element_impl<text_variable_set>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTextVariableSet;
+    CPDOCCORE_DEFINE_VISITABLE()
+    
+    void docx_convert(oox::docx_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){}
+
+	_CP_OPT(odf_types::office_value_type)	office_value_type_;
+
+	_CP_OPT(std::wstring)	office_boolean_value_;
+	_CP_OPT(std::wstring)	office_date_value_;
+	_CP_OPT(std::wstring)	office_time_value_;
+	_CP_OPT(std::wstring)	office_string_value_;
+	_CP_OPT(std::wstring)	office_value_;
+	_CP_OPT(std::wstring)	office_currency_;
+	_CP_OPT(std::wstring)	office_formula_;
+	_CP_OPT(std::wstring)	style_data_style_name_;
+	_CP_OPT(std::wstring)	text_display_;
+	_CP_OPT(std::wstring)	text_name_;
+
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_variable_set);
+//---------------------------------------------------------------------------------------------------
+//text:variable-decl
+//---------------------------------------------------------------------------------------------------
+class text_variable_decl : public office_element_impl<text_variable_decl>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTextVariableDecl;
+    CPDOCCORE_DEFINE_VISITABLE()
+    
+    void docx_convert(oox::docx_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){}
+
+	_CP_OPT(odf_types::office_value_type)	office_value_type_;
+	_CP_OPT(std::wstring)	text_display_;
+	_CP_OPT(std::wstring)	text_name_;
+
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_variable_decl);
+//---------------------------------------------------------------------------------------------------
+//text:variable-decls
+//---------------------------------------------------------------------------------------------------
+class text_variable_decls : public office_element_impl<text_variable_decls>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTextVariableDecls;
+    CPDOCCORE_DEFINE_VISITABLE()
+    
+    void docx_convert(oox::docx_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);
+
+    office_element_ptr_array content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_variable_decls);
 }
 }
 }

ASCOfficeOdfFileW/OdfFileWTest/OdfFileWTest.cpp

@@ -32,17 +32,14 @@
 // ASCOfficeOdfFileWTest.cpp : Defines the entry point for the console application.
 //
 
+#include "../../Common/OfficeFileFormatChecker.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp> 
-
 #include <iostream>
 #include <string>
 
 #include "../../Common/DocxFormat/Source/Base/Base.h"
 #include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/common/File.h"
 
 #include "../source/Oox2OdfConverter/Oox2OdfConverter.h"
 
@@ -52,81 +49,31 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
-std::wstring DetectTypeDocument(const std::wstring & pathOOX)
+HRESULT convert_single(std::wstring srcFileName)
 {
-	std::wstring sRes;
+	COfficeFileFormatChecker fileChecker(srcFileName);
 
-	NSFile::CFileBinary file;
+	std::wstring dstPath = srcFileName;// + ....
 
-	std::wstring fileContentType = pathOOX + FILE_SEPARATOR_STR + L"[Content_Types].xml";
-
-	if (file.OpenFile(fileContentType) ==false) return sRes;
-
-	DWORD nBufferSize = min (file.GetFileSize(), 10000);
-	BYTE *pBuffer = new BYTE[nBufferSize];
-
-	file.ReadFile(pBuffer, nBufferSize, nBufferSize);
-	file.CloseFile();
-
-	if (pBuffer != NULL)
+	std::wstring type;
+	switch(fileChecker.nFileType)
 	{
+		case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX:
+		case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCM:		dstPath += L"-my.odt"; type = L"text";		break;
+		
+		case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX:
+		case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSM:	dstPath += L"-my.ods"; type = L"spreadsheet";	break;
+		
+		case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX:
+		case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTM:	dstPath += L"-my.odp"; type = L"presentation";	break;
 
-		const char *docxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
-		const char *dotxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml";
-		const char *docmFormatLine = "application/vnd.ms-word.document.macroEnabled.main+xml";
-		const char *dotmFormatLine = "application/vnd.ms-word.template.macroEnabledTemplate.main+xml";
-
-		const char *xlsxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml";
-		const char *xltxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml";
-		const char *xlsmFormatLine = "application/vnd.ms-excel.sheet.macroEnabled.main+xml";
-		const char *xltmFormatLine = "application/vnd.ms-excel.template.macroEnabled.main+xml";
-
-		const char *pptxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml";
-		const char *ppsxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml";
-		const char *potxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml";
-		const char *pptmFormatLine = "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml";
-		const char *ppsmFormatLine = "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml";
-		const char *potmFormatLine = "application/vnd.ms-powerpoint.template.macroEnabled.main+xml";
-
-        std::string strContentTypes((char*)pBuffer, nBufferSize);
-
-        int res = 0;
-        if ( (res = strContentTypes.find(docxFormatLine))>0 || (res = strContentTypes.find(dotxFormatLine))>0 ||
-            (res = strContentTypes.find(docmFormatLine))>0 || (res = strContentTypes.find(dotmFormatLine))>0)
-		{
-			sRes = L"text";
-		}
-
-        else if ((res = strContentTypes.find(xlsxFormatLine))>0 || (res = strContentTypes.find(xltxFormatLine))>0 ||
-            (res = strContentTypes.find(xlsmFormatLine))>0 || (res = strContentTypes.find(xltmFormatLine))>0)
-		{
-			sRes = L"spreadsheet";
-		}
-
-        else if ((res = strContentTypes.find(pptxFormatLine) > 0) || /*(res = strContentTypes.find(ppsxFormatLine))>0 ||*/
-            (res = strContentTypes.find(potxFormatLine))>0 || (res = strContentTypes.find(pptmFormatLine))>0 ||
-            (res = strContentTypes.find(ppsmFormatLine))>0 || (res = strContentTypes.find(potmFormatLine))>0 ||
-			(res = strContentTypes.find(ppsxFormatLine)) >0 )
-		{
-			sRes = L"presentation";
-		}
-
-		delete []pBuffer;
-		pBuffer = NULL;
-
+		default:
+			return S_FALSE;
 	}
-	return sRes;
-}
-
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	if (argc < 3) return 0;
 
+//------------------------------------------------------------------------------------------
 	HRESULT hr = S_OK;
-//////////////////////////////////////////////////////////////////////////
-	std::wstring srcFileName	= argv[1];
-	std::wstring dstPath		= argv[2];
+
 	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
 	
 	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
@@ -137,8 +84,6 @@ int _tmain(int argc, _TCHAR* argv[])
     if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
 		return S_FALSE;
 
-	std::wstring type = DetectTypeDocument(srcTempPath);
-	
 	Oox2Odf::Converter converter(srcTempPath, type, L"C:\\Windows\\Fonts", NULL);
 
 	converter.convert();
@@ -155,3 +100,32 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	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;
+}

ASCOfficeOdfFileW/OdfFileWTest/OdfFileWTest.vcproj

@@ -49,6 +49,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\OdfFileWriterTest.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -66,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="
Rpcrt4.lib"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMTD.lib"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -450,6 +451,14 @@
 				<File
 					RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalOptions="/bigobj"
+						/>
+					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>

ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp

@@ -140,7 +140,7 @@ void calcext_data_bar::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			calcext_data_bar_attr_.serialize(CP_GET_XML_NODE());
+			attr_.serialize(CP_GET_XML_NODE());
 
 			for (size_t i = 0; i < content_.size(); i++)
 			{
@@ -170,6 +170,7 @@ void calcext_color_scale::serialize(std::wostream & _Wostream)
         {   
 			for (size_t i = 0; i < content_.size(); i++)
 			{
+				if (!content_[i]) continue;
 				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
@@ -194,7 +195,7 @@ void calcext_icon_set::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			calcext_icon_set_attr_.serialize(CP_GET_XML_NODE());
+			attr_.serialize(CP_GET_XML_NODE());
 
 			for (size_t i = 0; i < content_.size(); i++)
 			{
@@ -206,8 +207,8 @@ void calcext_icon_set::serialize(std::wostream & _Wostream)
 	
 // calcext_formatting_entry
 //////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * calcext_formatting_entry::ns = L"calcext";
-const wchar_t * calcext_formatting_entry::name = L"formatting-entry";
+const wchar_t * calcext_formatting_entry::ns	= L"calcext";
+const wchar_t * calcext_formatting_entry::name	= L"formatting-entry";
 
 void calcext_formatting_entry::serialize(std::wostream & _Wostream)
 {
@@ -223,8 +224,8 @@ void calcext_formatting_entry::serialize(std::wostream & _Wostream)
 
 // calcext_color_scale_entry
 //////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * calcext_color_scale_entry::ns = L"calcext";
-const wchar_t * calcext_color_scale_entry::name = L"color_scale_entry";
+const wchar_t * calcext_color_scale_entry::ns	= L"calcext";
+const wchar_t * calcext_color_scale_entry::name = L"color-scale-entry";
 
 void calcext_color_scale_entry::serialize(std::wostream & _Wostream)
 {
@@ -240,7 +241,7 @@ void calcext_color_scale_entry::serialize(std::wostream & _Wostream)
 }
 // calcext_condition
 //////////////////////////////////////////////////////////////////////////////////////////////////
-const wchar_t * calcext_condition::ns = L"calcext";
+const wchar_t * calcext_condition::ns	= L"calcext";
 const wchar_t * calcext_condition::name = L"condition";
 
 void calcext_condition::serialize(std::wostream & _Wostream)
@@ -249,7 +250,7 @@ void calcext_condition::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			calcext_condition_attr_.serialize(CP_GET_XML_NODE());
+			attr_.serialize(CP_GET_XML_NODE());
 		}
 	}
 }
@@ -264,7 +265,7 @@ void calcext_date_is::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			calcext_date_is_attr_.serialize(CP_GET_XML_NODE());
+			attr_.serialize(CP_GET_XML_NODE());
 		}
 	}
 }

ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.h

@@ -88,7 +88,7 @@ public:
 };
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-/// \brief  calcext:color-scale-entry
+///  calcext:color-scale-entry
 class calcext_color_scale_entry : public office_element_impl<calcext_color_scale_entry>
 {
 public:
@@ -104,13 +104,13 @@ public:
 	virtual void serialize(std::wostream & _Wostream);
 
 	_CP_OPT(odf_types::color)			calcext_color_;
-	_CP_OPT(std::wstring)	calcext_value_;
+	_CP_OPT(std::wstring)				calcext_value_;
 	_CP_OPT(odf_types::calcext_type)	calcext_type_;
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_color_scale_entry);
 
-/// \brief  calcext:formatting-entry
+///  calcext:formatting-entry
 class calcext_formatting_entry : public office_element_impl<calcext_formatting_entry>
 {
 public:
@@ -125,13 +125,13 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 
-	_CP_OPT(std::wstring) calcext_value_;
-	_CP_OPT(odf_types::calcext_type) calcext_type_;
+	_CP_OPT(std::wstring)				calcext_value_;
+	_CP_OPT(odf_types::calcext_type)	calcext_type_;
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_formatting_entry);
 
-/// \brief  calcext:icon-set
+///  calcext:icon-set
 class calcext_icon_set : public office_element_impl<calcext_icon_set>
 {
 public:
@@ -146,15 +146,13 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 	
-	calcext_icon_set_attr calcext_icon_set_attr_;
-
-private:
-    office_element_ptr_array content_;//entries
+	calcext_icon_set_attr		attr_;
+    office_element_ptr_array	content_;//entries
 
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_icon_set);
 
-/// \brief  calcext:data-bar
+///  calcext:data-bar
 class calcext_data_bar: public office_element_impl<calcext_data_bar>
 {
 public:
@@ -169,14 +167,12 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 	
-	calcext_data_bar_attr calcext_data_bar_attr_;
-
-private:
-    office_element_ptr_array content_;//entries
+	calcext_data_bar_attr		attr_;
+    office_element_ptr_array	content_;//entries
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_data_bar)
 
-/// \brief  calcext:color-scale
+///  calcext:color-scale
 class calcext_color_scale: public office_element_impl<calcext_color_scale>
 {
 public:
@@ -191,12 +187,11 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 
-private:
-    office_element_ptr_array content_;//color_scale_entries
+    office_element_ptr_array content_;	//color_scale_entries
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_color_scale)
 
-/// \brief  calcext:date-is
+///  calcext:date-is
 class calcext_date_is: public office_element_impl<calcext_date_is>
 {
 public:
@@ -211,11 +206,11 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 
-	calcext_date_is_attr calcext_date_is_attr_;
+	calcext_date_is_attr attr_;
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_date_is)
 
-/// \brief  calcext:condition
+///  calcext:condition
 class calcext_condition: public office_element_impl<calcext_condition>
 {
 public:
@@ -230,11 +225,11 @@ public:
 
 	virtual void serialize(std::wostream & _Wostream);
 
-	calcext_condition_attr calcext_condition_attr_;
+	calcext_condition_attr attr_;
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_condition)
 
-/// \brief  calcext:conditional-format
+///  calcext:conditional-format
 class calcext_conditional_format: public office_element_impl<calcext_conditional_format>
 {
 public:
@@ -257,7 +252,7 @@ private:
 };
 CP_REGISTER_OFFICE_ELEMENT2(calcext_conditional_format)
 
-/// \brief  calcext:conditional-formats
+///  calcext:conditional-formats
 class calcext_conditional_formats: public office_element_impl<calcext_conditional_formats>
 {
 public:

ASCOfficeOdfFileW/source/OdfFormat/mediaitems.cpp

@@ -86,7 +86,7 @@ void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wst
 	
 	std::wstring input_path = oox_ref;
 
-#if defined (_WIN32) || defined(_WIN64) // + mac???
+#if defined (_WIN32) || defined(_WIN64) 
     boost::to_lower(input_path);
 #endif
 
@@ -100,7 +100,7 @@ void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wst
 			break;
 		}
 	}
-	if (output_path.length() < 1)
+	if (output_path.empty())
 	{
 		output_path = ( output_sub_path + output_fileName) ;
 		if ( type == typeImage)

ASCOfficeOdfFileW/source/OdfFormat/mediaitems_utils.cpp

@@ -68,8 +68,8 @@ std::wstring create_file_name(const std::wstring & uri, _mediaitems::Type type,
 {
  	std::wstring sExt;
 	
-	if (type == _mediaitems::typeOleObject &&
-		type == _mediaitems::typeObjectReplacement)
+	//if (type == _mediaitems::typeOleObject &&
+	//	type == _mediaitems::typeObjectReplacement)
 	{
 		int n = uri.rfind(L".");
 		if (n >= 0) sExt = uri.substr(n);

ASCOfficeOdfFileW/source/OdfFormat/object_package.cpp

@@ -39,7 +39,7 @@
 #include "../../../DesktopEditor/common/File.h"
 #include "../../../DesktopEditor/common/Directory.h"
 
-#include "../../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 
 namespace cpdoccore 
 {
@@ -151,13 +151,17 @@ namespace odf_writer
 					CP_XML_ATTR(L"xmlns:smil", L"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0");
 					CP_XML_ATTR(L"xmlns:anim", L"urn:oasis:names:tc:opendocument:xmlns:animation:1.0");
 					CP_XML_ATTR(L"xmlns:chartooo", L"http://openoffice.org/2010/chart");
-					CP_XML_ATTR(L"office:version",		L"1.2");		
+					CP_XML_ATTR(L"office:version", L"1.2");		
 		
 					CP_XML_NODE(L"office:meta")
 					{  
 						CP_XML_NODE(L"meta:generator")
 						{
-							CP_XML_STREAM() << L"ONLYOFFICE Online Editor";
+							CP_XML_STREAM() << L"ONLYOFFICE";
+#if defined(INTVER)
+							std::string s = VALUE2STR(INTVER);
+							CP_XML_STREAM() << L"/" << std::wstring (s.begin(), s.end() );
+#endif					
 						}
 						CP_XML_NODE(L"meta:initial-creator");
 						CP_XML_NODE(L"meta:creation-date");
@@ -180,8 +184,8 @@ namespace odf_writer
 
 		void media::write(const std::wstring & RootPath)
 		{
-			std::wstring path = RootPath + (folder_.empty() ? L"" : FILE_SEPARATOR_STR) + folder_;
-            NSDirectory::CreateDirectory(path);
+			OOX::CPath path (RootPath + (folder_.empty() ? L"" : FILE_SEPARATOR_STR) + folder_);
+            NSDirectory::CreateDirectory(path.GetPath());
 
 			std::vector< _mediaitems::item >  & items =  mediaitems_.items();
 			
@@ -189,9 +193,10 @@ namespace odf_writer
 			{
 				if (items[i].type == type_)
 				{
-					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].odf_ref;
+					OOX::CPath file_name_inp ( items[i].oox_ref);
+					OOX::CPath file_name_out ( RootPath + FILE_SEPARATOR_STR + items[i].odf_ref); //ref содержит уже folder_
 
-					NSFile::CFileBinary::Copy(items[i].oox_ref, file_name_out);
+					NSFile::CFileBinary::Copy(file_name_inp.GetPath(), file_name_out.GetPath());
 				}
 			}
 
@@ -206,7 +211,7 @@ namespace odf_writer
 		{
 			if (mediaitems.count_image > 0)
 			{
-				pictures_ = element_ptr( new media(mediaitems, L"Picture", 1) );
+				pictures_ = element_ptr( new media(mediaitems, L"Pictures", 1) );
 			}
 			if (mediaitems.count_media > 0)
 			{

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -125,7 +125,7 @@ namespace odf_writer
 class odf_chart_context::Impl
 {
 public:
-	Impl(odf_conversion_context *odf_context) :odf_context_(odf_context)
+	Impl(odf_conversion_context *odf_context) : odf_context_(odf_context)
     {	
 		styles_context_			= NULL;
 		current_series_count_	= 0;
@@ -151,6 +151,9 @@ public:
 	std::vector<office_element_ptr>			group_series_;
 	std::vector<unsigned int>				axis_group_series_;
 
+	_CP_OPT(int)							bar_overlap;
+	_CP_OPT(int)							bar_gap_width;
+
 	struct _range
 	{
 		_range(std::wstring &r, bool l, chart_series *s)	: label(l),		index_cash(-1), series(s), ref(r)	{}
@@ -277,6 +280,9 @@ void odf_chart_context::Impl::clear_current()
 	group_series_.clear();
 	data_cell_ranges_.clear();
 	cash_.clear();
+	
+	bar_gap_width	= boost::none;
+	bar_overlap		= boost::none;
 
 	current_series_count_	= 0;
 	local_table_reset_ref_	= false;
@@ -335,7 +341,7 @@ void odf_chart_context::start_chart(office_element_ptr & root)
 
 	root->add_child_element(chart_elm);
 //////////	
-	impl_->styles_context_->create_style(L"",style_family::Chart, true, false, -1);		
+	impl_->styles_context_->create_style(L"", style_family::Chart, true, false, -1);		
 	
 	office_element_ptr & style_elm = impl_->styles_context_->last_state()->get_office_element();
 	
@@ -427,8 +433,6 @@ void odf_chart_context::set_chart_bar_direction(int type)
 }
 void odf_chart_context::set_chart_bar_gap_width(std::wstring val)
 {
-	if (!impl_->current_level_.back().chart_properties_) return;
-	
 	int res = val.find(L"%");
 
 	bool percent=false;
@@ -438,21 +442,22 @@ void odf_chart_context::set_chart_bar_gap_width(std::wstring val)
 		percent=true;
 	}
 	double dVal = boost::lexical_cast<double>(val);
-	impl_->current_level_.back().chart_properties_->content_.chart_gap_width_ = (int)dVal;
+	
+	impl_->bar_gap_width = (int)dVal;
 }
 void odf_chart_context::set_chart_bar_overlap(std::wstring val)
 {
-	if (!impl_->current_level_.back().chart_properties_) return;
 	int res = val.find(L"%");
 
-	bool percent=false;
+	bool percent = false;
 	if (res > 0)
 	{
 		val = val.substr(0,res);
-		percent=true;
+		percent = true;
 	}
 	double dVal = boost::lexical_cast<double>(val);
-	impl_->current_level_.back().chart_properties_->content_.chart_overlap_ = (int)dVal;
+
+	impl_->bar_overlap = (int)dVal;
 }
 
 void odf_chart_context::set_chart_stock_candle_stick(bool val)
@@ -702,15 +707,17 @@ void odf_chart_context::end_group_series()
 
 	std::wstring axis_name;
 
-	bool presentZ = false;
 	long countX = 0;
 	long countY = 0;
+	long countZ = 0;
+	
 	for (size_t j = 0; j < impl_->axis_.size(); j++)
 	{
-		if (impl_->axis_[j].dimension ==1)		countX++;
-		else if (impl_->axis_[j].dimension ==3)	presentZ = true;
-		else countY++;
+			 if (impl_->axis_[j].dimension == 1)	countX++;
+		else if (impl_->axis_[j].dimension == 2)	countY++;
+		else if (impl_->axis_[j].dimension == 3)	countZ++;
 	}
+	
 	if (countX < 1 && countY > 1)
 	{
 		impl_->axis_[0].dimension == 1;
@@ -718,15 +725,15 @@ void odf_chart_context::end_group_series()
 		axis->chart_axis_attlist_.chart_dimension_ = L"x";
 		countY--;
 	}
-	if (presentZ == false && impl_->axis_group_series_.size() == 3 && (countY > 1 || countX > 1))
-	{
-		impl_->axis_.back().dimension == 3;
-		chart_axis *axis = dynamic_cast<chart_axis*>(impl_->axis_.back().elm.get());
-		axis->chart_axis_attlist_.chart_dimension_ = L"z";
-		countY--;
-	}
+	//if (countZ > 0 && impl_->axis_group_series_.size() == 3 && (countY > 1 || countX > 1))
+	//{
+	//	impl_->axis_.back().dimension == 3;
+	//	chart_axis *axis = dynamic_cast<chart_axis*>(impl_->axis_.back().elm.get());
+	//	axis->chart_axis_attlist_.chart_dimension_ = L"z";
+	//	countY--;
+	//}
 
-	for (size_t i=0; i < impl_->axis_group_series_.size(); i++)
+	for (size_t i = 0; i < impl_->axis_group_series_.size(); i++)
 	{
 		for (size_t j = 0; j < impl_->axis_.size(); j++)
 		{
@@ -740,7 +747,7 @@ void odf_chart_context::end_group_series()
 	}
 
 
-	for (size_t i =0; i < impl_->group_series_.size() && axis_name.length() > 0; i++)
+	for (size_t i = 0; i < impl_->group_series_.size() && axis_name.length() > 0; i++)
 	{
 		chart_series *series= dynamic_cast<chart_series*>(impl_->group_series_[i].get());
 		if (series)
@@ -796,7 +803,7 @@ void odf_chart_context::start_axis()
 	chart_axis *axis = dynamic_cast<chart_axis*>(elm.get());
 	if (axis == NULL)return;
 //////////	
-	impl_->styles_context_->create_style(L"",style_family::Chart, true, false, -1);		
+	impl_->styles_context_->create_style(L"", style_family::Chart, true, false, -1);		
 	
 	office_element_ptr & style_elm = impl_->styles_context_->last_state()->get_office_element();
 	
@@ -810,10 +817,19 @@ void odf_chart_context::start_axis()
 	}
 	start_element(elm, style_elm, style_name);
 
-	odf_axis_state axis_state={0,0,L"",elm};
+	odf_axis_state axis_state={0, 0, L"", elm};
 	impl_->axis_.push_back(axis_state);
 /////////////////////defaults
 	impl_->current_level_.back().chart_properties_->content_.chart_reverse_direction_ = false;
+	
+	if (impl_->bar_overlap)
+	{
+		impl_->current_level_.back().chart_properties_->content_.chart_overlap_ = impl_->bar_overlap.get();
+	}
+	if (impl_->bar_gap_width)
+	{
+		impl_->current_level_.back().chart_properties_->content_.chart_gap_width_ = impl_->bar_gap_width.get();
+	}
 }
 void odf_chart_context::start_grid(int type)
 {
@@ -826,7 +842,7 @@ void odf_chart_context::start_grid(int type)
 	if (type == 1) grid->chart_grid_attlist_.chart_class_ = L"major";
 	if (type == 2) grid->chart_grid_attlist_.chart_class_ = L"minor";
 
-	impl_->styles_context_->create_style(L"",style_family::Chart, true, false, -1);		
+	impl_->styles_context_->create_style(L"", style_family::Chart, true, false, -1);		
 	
 	office_element_ptr & style_elm = impl_->styles_context_->last_state()->get_office_element();
 	
@@ -850,7 +866,7 @@ void odf_chart_context::start_title()
 	chart_title *title = dynamic_cast<chart_title*>(chart_elm.get());
 	if (title == NULL)return;
 //////////	
-	impl_->styles_context_->create_style(L"",style_family::Chart, true, false, -1);		
+	impl_->styles_context_->create_style(L"", style_family::Chart, true, false, -1);		
 	
 	office_element_ptr & style_elm = impl_->styles_context_->last_state()->get_office_element();
 	
@@ -874,7 +890,7 @@ void odf_chart_context::start_plot_area()
 
 	plot_area->chart_plot_area_attlist_.chart_data_source_has_labels_ = L"both";
 //////////	
-	impl_->styles_context_->create_style(L"",style_family::Chart, true, false, -1);		
+	impl_->styles_context_->create_style(L"", style_family::Chart, true, false, -1);		
 	
 	office_element_ptr & style_elm = impl_->styles_context_->last_state()->get_office_element();
 	
@@ -911,23 +927,22 @@ void odf_chart_context::start_text()
 	impl_->odf_context_->start_text_context();
 	impl_->odf_context_->text_context()->set_styles_context(impl_->styles_context_);
 
-	style_text_properties *text_props = NULL;
-
 	style *style_ = dynamic_cast<style*>(impl_->current_chart_state_.elements_.back().style_elm.get());
 	if (style_)
 	{
-		impl_->current_level_.back().paragraph_properties_ = style_->content_.get_style_paragraph_properties();
-		impl_->current_level_.back().text_properties_ = style_->content_.get_style_text_properties();
+		impl_->current_level_.back().paragraph_properties_	= style_->content_.get_style_paragraph_properties();
+		impl_->current_level_.back().text_properties_		= style_->content_.get_style_text_properties();
 	}
 	
-	impl_->odf_context_->text_context()->set_single_object(true,impl_->current_level_.back().paragraph_properties_,impl_->current_level_.back().text_properties_);
+	impl_->odf_context_->text_context()->set_single_object(true, impl_->current_level_.back().paragraph_properties_, impl_->current_level_.back().text_properties_);
 }
 void odf_chart_context::end_text()
 {
-	odf_text_context * text_context_ = text_context();
-	if (text_context_ == NULL || impl_->current_level_.size() <1 )return;
+	odf_text_context *text_context_ = text_context();
+	
+	if (text_context_ == NULL || impl_->current_level_.size() < 1 )return;
 
-	for (size_t i=0; i< text_context_->text_elements_list_.size(); i++)
+	for (size_t i = 0; i < text_context_->text_elements_list_.size(); i++)
 	{
 		if (text_context_->text_elements_list_[i].level ==0)
 		{
@@ -945,6 +960,45 @@ void odf_chart_context::end_text()
 
 	impl_->odf_context_->end_text_context();
 }
+void odf_chart_context::set_textarea_vertical_align(int align)
+{
+	if (!impl_->current_level_.back().chart_properties_)return;
+	//switch(align)
+	//{
+	//case 0://SimpleTypes::textanchoringtypeB: 
+	//		impl_->current_graphic_properties->draw_textarea_vertical_align_ = odf_types::vertical_align(odf_types::vertical_align::Bottom);	break;
+	//case 1://SimpleTypes::textanchoringtypeCtr: 
+	//		impl_->current_graphic_properties->draw_textarea_vertical_align_ = odf_types::vertical_align(odf_types::vertical_align::Middle);	break;
+	//case 2://SimpleTypes::textanchoringtypeDist: 
+	//		impl_->current_graphic_properties->draw_textarea_vertical_align_ = odf_types::vertical_align(odf_types::vertical_align::Baseline);break;
+	//case 3://SimpleTypes::textanchoringtypeJust: 
+	//		impl_->current_graphic_properties->draw_textarea_vertical_align_ = odf_types::vertical_align(odf_types::vertical_align::Justify);	break;
+	//case 4://SimpleTypes::textanchoringtypeT: 
+	//		impl_->current_graphic_properties->draw_textarea_vertical_align_ = odf_types::vertical_align(odf_types::vertical_align::Top);		break;
+	//}
+}
+void odf_chart_context::set_textarea_rotation(double val)
+{
+	if (!impl_->current_level_.back().chart_properties_)return;
+	if (val < 0.001 && val > -0.001) return;
+	if (val < -360 || val > 360) return;
+
+	if (val < 0) val += 360;
+	val = 360 - val;
+
+	impl_->current_level_.back().chart_properties_->content_.common_rotation_angle_attlist_.style_rotation_angle_ = (unsigned int)val;
+}
+
+void odf_chart_context::set_textarea_padding(_CP_OPT(double) & left, _CP_OPT(double) & top, _CP_OPT(double) & right, _CP_OPT(double) & bottom)//in pt
+{
+	if (!impl_->current_level_.back().chart_properties_)return;
+
+	//if (left)	impl_->current_graphic_properties->common_padding_attlist_.fo_padding_left_		= length(*left,	length::pt);
+	//if (top)	impl_->current_graphic_properties->common_padding_attlist_.fo_padding_top_		= length(*top,	length::pt);
+	//if (right)	impl_->current_graphic_properties->common_padding_attlist_.fo_padding_right_	= length(*right,length::pt);
+	//if (bottom)	impl_->current_graphic_properties->common_padding_attlist_.fo_padding_bottom_	= length(*bottom,length::pt);
+}
+
 void odf_chart_context::start_floor()
 {
 	office_element_ptr elm;
@@ -1478,6 +1532,13 @@ void odf_chart_context::set_series_pie_explosion(int val)//или точка с
 
 	impl_->current_level_.back().chart_properties_->content_.chart_pie_offset_ = val;	
 }
+void odf_chart_context::set_series_pie_bubble(bool val)
+{
+	if (!impl_->current_level_.back().chart_properties_)return;
+	
+	impl_->current_level_.back().chart_properties_->content_.chart_pie_bubble_ = val;	
+	
+}
 //void odf_chart_context::set_cash(std::wstring format, std::vector<double> &data_double)
 //{
 //	if (data_double.size() <1 || impl_->data_cell_ranges_.size() < 1) return;

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.h

@@ -89,6 +89,7 @@ public:
 					long get_count_data_points_series();
 
 					void set_series_pie_explosion(int val);
+					void set_series_pie_bubble(bool val);
 				void end_series();
 		void end_group_series();
 		
@@ -136,6 +137,10 @@ public:
 		void start_text();
 		void end_text();
 
+		void set_textarea_vertical_align(int align);
+		void set_textarea_padding		(_CP_OPT(double) & left, _CP_OPT(double) & top, _CP_OPT(double) & right, _CP_OPT(double) & bottom);//in pt
+		void set_textarea_rotation		(double val);
+
 		void add_domain(std::wstring formula);
 		void add_categories(std::wstring formula, office_element_ptr & axis);
 

ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.cpp

@@ -177,7 +177,7 @@ void odf_conversion_context::start_chart()
 	create_object();
 	create_element(L"office", L"chart", objects_.back().content, this, true);
 
-	chart_context_.set_styles_context(styles_context());
+	chart_context_.set_styles_context(odf_conversion_context::styles_context());
 	chart_context_.start_chart(get_current_object_element());
 }
 void odf_conversion_context::start_spreadsheet()

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -2101,6 +2101,36 @@ void odf_drawing_context::set_line_dash_preset(int style)
 			impl_->current_graphic_properties->draw_stroke_=line_style(line_style::Solid);	 break;
 	}
 }
+void odf_drawing_context::set_paragraph_properties(style_paragraph_properties *paragraph_properties)
+{
+	if (impl_->current_drawing_state_.elements_.empty()) return;
+
+	if (!impl_->current_paragraph_properties)
+	{
+		draw_base* draw = dynamic_cast<draw_base*>(impl_->current_drawing_state_.elements_[0].elm.get());
+		if (draw)
+		{
+			if(!draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_)
+			{
+				impl_->styles_context_->create_style(L"", style_family::Paragraph, true, false, -1);		
+			
+				office_element_ptr & style_shape_elm = impl_->styles_context_->last_state()->get_office_element();
+				style* style_ = dynamic_cast<style*>(style_shape_elm.get());
+				if (style_)
+				{
+					impl_->current_paragraph_properties = style_->content_.get_style_paragraph_properties();
+					draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_ = style_->style_name_;
+				}
+			}
+			else
+			{
+				//??? find by name
+			}
+		}
+	}
+	if (impl_->current_paragraph_properties)
+		impl_->current_paragraph_properties ->apply_from(paragraph_properties);
+}
 
 void odf_drawing_context::set_textarea_vertical_align(int align)
 {
@@ -2136,6 +2166,18 @@ void odf_drawing_context::set_textarea_fit_to_size(bool val)
 	impl_->current_graphic_properties->draw_fit_to_size_ = val;
 }
 
+void odf_drawing_context::set_textarea_rotation(double val)
+{
+	odf_style_state_ptr style_state = impl_->styles_context_->last_state(style_family::Paragraph);
+	if (style_state)
+	{
+		impl_->current_text_properties = style_state->get_text_properties();
+	}
+
+	if (!impl_->current_text_properties) return;
+
+	impl_->current_text_properties->content_.style_text_rotation_angle_ = (int)val;
+}
 
 void odf_drawing_context::set_textarea_font(std::wstring & latin, std::wstring & cs, std::wstring & ea)
 {
@@ -2249,36 +2291,6 @@ void odf_drawing_context::set_textarea_writing_mode(int mode)
 		}
 	}
 }
-void odf_drawing_context::set_paragraph_properties(style_paragraph_properties *paragraph_properties)
-{
-	if (impl_->current_drawing_state_.elements_.empty()) return;
-
-	if (!impl_->current_paragraph_properties)
-	{
-		draw_base* draw = dynamic_cast<draw_base*>(impl_->current_drawing_state_.elements_[0].elm.get());
-		if (draw)
-		{
-			if(!draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_)
-			{
-				impl_->styles_context_->create_style(L"", style_family::Paragraph, true, false, -1);		
-			
-				office_element_ptr & style_shape_elm = impl_->styles_context_->last_state()->get_office_element();
-				style* style_ = dynamic_cast<style*>(style_shape_elm.get());
-				if (style_)
-				{
-					impl_->current_paragraph_properties = style_->content_.get_style_paragraph_properties();
-					draw->common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_text_style_name_ = style_->style_name_;
-				}
-			}
-			else
-			{
-				//??? find by name
-			}
-		}
-	}
-	if (impl_->current_paragraph_properties)
-		impl_->current_paragraph_properties ->apply_from(paragraph_properties);
-}
 void odf_drawing_context::set_textarea_padding(_CP_OPT(double) & left, _CP_OPT(double) & top, _CP_OPT(double) & right, _CP_OPT(double) & bottom)//in pt
 {
 	if (!impl_->current_graphic_properties)return;

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h

@@ -231,6 +231,7 @@ public:
 	void set_textarea_fontcolor		(std::wstring hexColor);
 	void set_textarea_font			(std::wstring & latin, std::wstring & cs, std::wstring & ea);
 	void set_textarea_fit_to_size	(bool val);
+	void set_textarea_rotation		(double val);
 
 	void set_placeholder_id			(std::wstring val);
 	void set_placeholder_type		(int val);

ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp

@@ -482,14 +482,12 @@ void odf_page_layout_context::set_page_size(_CP_OPT(length) width, _CP_OPT(lengt
 
 	if (width)
 	{
-		props->attlist_.fo_page_width_ = 
-												length(width->get_value_unit(length::cm), length::cm);
+		props->attlist_.fo_page_width_ = length(width->get_value_unit(length::cm), length::cm);
 
 		current_page_width_ = width->get_value_unit(length::pt);
 	}
 	if (height)
-		props->attlist_.fo_page_height_ = 
-												length(height->get_value_unit(length::cm),length::cm);
+		props->attlist_.fo_page_height_ = length(height->get_value_unit(length::cm), length::cm);
 }
 void odf_page_layout_context::set_page_number_format(_CP_OPT(int) & type, _CP_OPT(int) & start)
 {

ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp

@@ -39,6 +39,7 @@
 #include "styles.h"
 
 #include "style_paragraph_properties.h"
+#include "style_text_properties.h"
 
 #include <iostream>
 
@@ -62,7 +63,17 @@ void calc_paragraph_properties_content(std::vector<style_paragraph_properties*>
             result->apply_from(parProps[i]->content_);
     }
 }
+void calc_text_properties_content(std::vector<style_text_properties*> & textProps, text_format_properties_content * result)
+{
+	if (result == NULL)return;
+    if (textProps.empty()) return;
 
+    for (int i = (int)textProps.size() - 1; i >= 0; i--)
+    {
+        if (textProps[i])
+            result->apply_from(textProps[i]->content_);
+    }
+}
 odf_style_context::odf_style_context()
 {    
 	//memset(style_family_counts_,0,sizeof(style_family_counts_)); 
@@ -199,7 +210,7 @@ std::wstring odf_style_context::find_odf_style_name(int oox_id_style, style_fami
 }
 //office_element_ptr odf_style_context::find_odf_style(int oox_id_style, style_family::type family, bool root, _CP_OPT(bool) automatic)
 //{
-//	//for (std::list<odf_style_state>::iterator it = style_state_list_.begin(); it != style_state_list_.end(); it++)
+//	//for (std::list<odf_style_state>::iterator it = style_state_list_.begin(); it != style_state_list_.end(); ++it)
 //	for (size_t i=0;i<style_state_list_.size(); i++)
 //	{
 //		if (style_state_list_[i]->odf_style_)
@@ -424,12 +435,29 @@ office_element_ptr & odf_style_context::add_or_find(std::wstring name, style_fam
 	
 	return style_state_list_.back()->get_office_element();
 }
+void odf_style_context::calc_text_properties(std::wstring style_name, odf_types::style_family::type family, text_format_properties_content * result)
+{
+    std::vector<style_text_properties*> textProps;
+	
+	while (!style_name.empty())
+    {
+		style *style_ = NULL;
+		if (!find_odf_style(style_name, family, style_) || !style_)break;
+
+       if (style_text_properties * textProp = style_->content_.get_style_text_properties())
+			textProps.push_back(textProp);
+        		
+	   style_name = style_->style_parent_style_name_ ? *style_->style_parent_style_name_ : L"";
+
+    }   
+	calc_text_properties_content(textProps, result);
+}
 
 void odf_style_context::calc_paragraph_properties(std::wstring style_name, style_family::type family, paragraph_format_properties * result)
 {
     std::vector<style_paragraph_properties*> parProps;
 	
-	while (style_name.length()>0)
+	while (!style_name.empty())
     {
 		style *style_ = NULL;
 		if (!find_odf_style(style_name, family, style_) || !style_)break;

ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.h

@@ -52,6 +52,7 @@ typedef shared_ptr<odf_style_context>::Type odf_style_context_ptr;
 
 class style;
 class paragraph_format_properties;
+class text_format_properties_content;
 
 class odf_style_context
 {
@@ -94,7 +95,7 @@ public:
 
 //////////////////////////////////////////////////////////////////////
 	void calc_paragraph_properties(std::wstring style_name, odf_types::style_family::type family, paragraph_format_properties * result);
-
+	void calc_text_properties(std::wstring style_name, odf_types::style_family::type family, text_format_properties_content * result);
 //////////////////////////////////////////////////////////////////////
 	std::wstring find_odf_style_name (int oox_id_style, odf_types::style_family::type family, bool root, bool automatic);//xlsx only
 	bool		 find_odf_style_state(int oox_id_style, odf_types::style_family::type family, odf_style_state_ptr & state, bool root, bool automatic);//xlsx only

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.cpp

@@ -100,6 +100,7 @@ public:
 	Impl(odf_conversion_context *odf_context) :odf_context_(odf_context)
     {	
 		default_column_width = -1;
+		optimal_column_width = false;
 	} 
 
 	odf_table_state & current_table()	{return tables_.back();}
@@ -107,13 +108,21 @@ public:
 
 	void start_table(odf_table_state & state) {tables_.push_back(state);}
 
-	void end_table() {if (tables_.size() > 0) tables_.pop_back(); default_column_width = -1; default_cell_properties = L"";}
+	void end_table() 
+	{
+		if (tables_.size() > 0) tables_.pop_back(); 
+		
+		default_column_width	= -1;  // todo .. in level ???
+		default_cell_properties = L""; 
+		optimal_column_width	= false;
+	}
 
 	odf_style_context	* styles_context() {return odf_context_->styles_context();}
 
 	odf_conversion_context *odf_context_; 
 
-	double default_column_width;
+	double	default_column_width;
+	bool	optimal_column_width;
 	std::wstring default_cell_properties; // для предустановки ..
 
 private:
@@ -307,6 +316,10 @@ void odf_table_context::set_default_column_width(double width)
 {
 	impl_->default_column_width = width;
 }
+void odf_table_context::set_optimal_column_width(bool val)
+{
+	impl_->optimal_column_width = val;
+}
 void odf_table_context::set_column_optimal(bool val)
 {
 	if (impl_->empty()) return;
@@ -362,7 +375,11 @@ void odf_table_context::set_column_width(double width)
 	{
 		properties->style_table_column_properties_attlist_.style_column_width_ = length(length(width,length::pt).get_value_unit(length::cm),length::cm);
 		//properties->style_table_column_properties_attlist_.style_rel_column_width_ = length(length(width,length::pt).get_value_unit(length::cm),length::cm);
-		//properties->style_table_column_properties_attlist_.style_use_optimal_column_width_ = false;
+
+		if (impl_->optimal_column_width)
+		{
+			properties->style_table_column_properties_attlist_.style_use_optimal_column_width_ = true;
+		}
 
 		impl_->current_table().table_width += width;
 	}
@@ -370,7 +387,7 @@ void odf_table_context::set_column_width(double width)
 	{
 		properties->style_table_column_properties_attlist_.style_use_optimal_column_width_ = true;
 
-		if (impl_->default_column_width >=0)
+		if (impl_->default_column_width >= 0)
 		{
 			properties->style_table_column_properties_attlist_.style_column_width_ = length(length(impl_->default_column_width,length::pt).get_value_unit(length::cm),length::cm);
 			//properties->style_table_column_properties_attlist_.style_rel_column_width_ = length(length(impl_->current_table().table_width,length::pt).get_value_unit(length::cm),length::cm);

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.h

@@ -66,6 +66,7 @@ public:
 
 	void start_table(office_element_ptr &elm, bool styled = false);
 		void set_default_column_width(double width);
+		void set_optimal_column_width(bool val);
 		void change_current_column_width(double width);
 	void end_table();
 	

ASCOfficeOdfFileW/source/OdfFormat/odf_text_context.cpp

@@ -54,10 +54,10 @@ namespace cpdoccore {
 namespace odf_writer
 {
 
-odf_text_context::odf_text_context(odf_conversion_context *odf_context)
+odf_text_context::odf_text_context(odf_conversion_context *odf_context, odf_style_context *styles_context)
 {
 	odf_context_				= odf_context;
-	styles_context_				= odf_context->styles_context();
+	styles_context_				= styles_context;
 	
 	single_paragraph_			= false;
 	paragraph_properties_		= NULL;

ASCOfficeOdfFileW/source/OdfFormat/odf_text_context.h

@@ -53,7 +53,7 @@ class style_text_properties;
 class odf_text_context: boost::noncopyable
 {
 public:
-	odf_text_context	(odf_conversion_context *odf_context);
+	odf_text_context	(odf_conversion_context *odf_context, odf_style_context *styles_context);
     ~odf_text_context	();
 public:
  	odf_style_context*		get_styles_context();//для embedded