v5.0.7

ASCOfficeDocFile/Common/FormatUtils.h

@@ -501,7 +501,7 @@ namespace DocFileFormat
     
 			facet.widen((char*)bytes, (char*)bytes + size, &result[0]);
 			
-			for (size_t i=0; i < result.length(); i++)
+			for (long i=0; i < result.length(); i++)
 			{
 				STLCollection->push_back(result[i]);
 			}
@@ -536,7 +536,7 @@ namespace DocFileFormat
 					delete [] pStrUtf16;
 					return GetSTLCollectionFromLocale(STLCollection, bytes,size);
 				}
-				for (unsigned int i = 0; i < nLength; i++)
+				for (long i=0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf16[i]);
 				}
@@ -566,7 +566,7 @@ namespace DocFileFormat
 					delete [] pStrUtf32;
 					return GetSTLCollectionFromLocale(STLCollection, bytes, size);
 				}
-				for (unsigned int i = 0; i < nLength; i++)
+				for (long i=0; i < nLength; i++)
 				{
 					STLCollection->push_back(pStrUtf32[i]);
 				}
@@ -652,7 +652,7 @@ namespace DocFileFormat
 				NSUnicodeConverter::CUnicodeConverter oConverter;
 				std::wstring unicode_string = oConverter.toUnicode((char*)bytes, size, sCodePage.c_str());
 			
-				for (size_t i = 0; i < unicode_string.size(); i++)
+				for (long i=0; i < unicode_string.size(); i++)
 				{
 					STLCollection->push_back(unicode_string[i]);
 				}

ASCOfficeDocFile/Common/XmlTools.h

@@ -393,7 +393,7 @@ namespace XMLTools
 			else
 			{
 				std::string s(m_str.begin(), m_str.end());
-				file.WriteFile((unsigned char*)s.c_str(), (DWORD)s.length());
+				file.WriteFile((unsigned char*)s.c_str(), s.length());
 			}
 			file.CloseFile();
 			return true;

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -321,7 +321,7 @@ namespace DocFileFormat
 
 			case sprmCFtcBi :
 				{//default from FontTable
-					size_t nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
+					SHORT nIndex	=	FormatUtils::BytesToUInt16 (iter->Arguments, 0, iter->argumentsSize);
 					if( nIndex < _doc->FontTable->Data.size() )
 					{
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
@@ -373,7 +373,7 @@ namespace DocFileFormat
 			case sprmOldCFtc:
 			case sprmCRgFtc0:
 				{	// font family
-					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
+					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 					
 					if( nIndex < _doc->FontTable->Data.size() )
 					{
@@ -388,8 +388,7 @@ namespace DocFileFormat
 
 			case sprmCRgFtc1:
 				{
-					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-
+					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 					if( nIndex >= 0 && nIndex < _doc->FontTable->Data.size() )
 					{
                         XMLTools::XMLAttribute* eastAsia = new XMLTools::XMLAttribute( L"w:eastAsia" );
@@ -404,8 +403,7 @@ namespace DocFileFormat
 
 			case sprmCRgFtc2:
 				{
-					size_t nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
-
+					int nIndex = FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize );
 					if( nIndex>=0 && nIndex < _doc->FontTable->Data.size() )
 					{
                         XMLTools::XMLAttribute* ansi = new XMLTools::XMLAttribute( L"w:hAnsi" );

ASCOfficeDocFile/DocDocxConverter/ContentTypes.h

@@ -69,7 +69,6 @@ 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 WordprocessingMLContentTypes

ASCOfficeDocFile/DocDocxConverter/ConversionContext.h

@@ -47,17 +47,30 @@ 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,16 +63,8 @@ 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)
 		{
@@ -115,6 +107,14 @@ 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/DocumentMapping.cpp

@@ -88,7 +88,7 @@ namespace DocFileFormat
 	int DocumentMapping::getCurrentSection(int cp)
 	{
 		//if cp is the last char of a section, the next section will start at cp +1
-		size_t current = 0;
+		int current = 0;
 
 		for (std::vector<int>::iterator iter = m_document->SectionPlex->CharacterPositions.begin() + 1; iter != m_document->SectionPlex->CharacterPositions.end(); ++iter)
 		{
@@ -107,7 +107,7 @@ namespace DocFileFormat
 	{
 		if ( !m_document->ListPlex ) return -1;
 
-		for (size_t i = 1; i < m_document->ListPlex->CharacterPositions.size(); i++)
+		for (int i = 1; i < m_document->ListPlex->CharacterPositions.size(); i++)
 		{
 			if ((fc >= m_document->ListPlex->CharacterPositions[i-1]) && (fc_end <= m_document->ListPlex->CharacterPositions[i]))
 			{
@@ -382,7 +382,7 @@ namespace DocFileFormat
 	int DocumentMapping::writeRun (std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp)
 	{
 		int cp			= initialCp;
-		int result_cp	= cp + (int)chars->size();
+		int result_cp	= cp + chars->size();
 
 		if ((_skipRuns <= 0) && (chars->size() > 0))
 		{
@@ -559,12 +559,12 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteString(elem.GetXMLString());
 			}
 			else if (TextMark::FieldBeginMark == code)
-			{//todooo в отдельный mapping
+			{
 				int cpFieldStart = initialCp + i;
 				int cpFieldEnd = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 				
 				std::wstring f;
-				if (cpFieldEnd < (int)m_document->Text->size())
+				if (cpFieldEnd < m_document->Text->size())
 					f = std::wstring( ( m_document->Text->begin() + cpFieldStart ), ( m_document->Text->begin() + cpFieldEnd + 1 ) );
 
                 std::wstring EMBED		( L" EMBED" );
@@ -599,38 +599,20 @@ namespace DocFileFormat
 			
 				if ( bFORM )
 				{
-					std::wstring FORMTEXT		( L" FORMTEXT" );
-					std::wstring FORMCHECKBOX	( L" FORMCHECKBOX" );
-					std::wstring FORMDROPDOWN	( L" FORMDROPDOWN" );
-					
-					m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
+                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar" , true );
                     m_pXmlWriter->WriteAttribute( L"w:fldCharType" , L"begin" );
                     m_pXmlWriter->WriteNodeEnd( L"", true, false );
 
-					bool bFORMTEXT		= search( f.begin(), f.end(), FORMTEXT.begin(),		FORMTEXT.end())	!= f.end();
-					bool bFORMCHECKBOX	= search( f.begin(), f.end(), FORMCHECKBOX.begin(),	FORMCHECKBOX.end())	!= f.end();
-					bool bFORMDROPDOWN	= search( f.begin(), f.end(), FORMDROPDOWN.begin(),	FORMDROPDOWN.end())	!= f.end();
+					int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
 
-					if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
+					/*if (cpPic < cpFieldEnd)
 					{
-						int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
-						if (cpPic < cpFieldEnd)
-						{
-							int fcPic = m_document->FindFileCharPos( cpPic );
-							std::list<CharacterPropertyExceptions*>* chpxs	= m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
-
-							if (chpxs)
-							{
-								CharacterPropertyExceptions* chpxSep = chpxs->front();
-								
-								FormFieldData ffdata (2, chpxSep, m_document->DataStream, false);
-								FormFieldDataMapping data_mapping(m_pXmlWriter, m_context, _caller);
-								ffdata.Convert(&data_mapping);
-								
-								RELEASEOBJECT( chpxs );
-							}
-						}
-					}
+					int fcPic = _doc.PieceTable.FileCharacterPositions[cpPic];
+					CharacterPropertyExceptions chpxPic = _doc.GetCharacterPropertyExceptions(fcPic, fcPic + 1)[0];
+					NilPicfAndBinData npbd = new NilPicfAndBinData(chpxPic, _doc.DataStream);
+					FormFieldData ffdata = new FormFieldData(npbd.binData);
+					ffdata.Convert(new FormFieldDataMapping(m_pXmlWriter));
+					}*/
 
                     m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
 
@@ -678,11 +660,11 @@ namespace DocFileFormat
 							
 							if (search( f1.begin(),	f1.end(), PAGEREF.begin(), PAGEREF.end()) != f1.end())
 							{
-								int d = (int)f1.find(PAGEREF);
+								int d = f1.find(PAGEREF);
 
 								_writeWebHidden = true;
 								std::wstring _writeTocLink =f1.substr(d + 9);
-                                d = (int)_writeTocLink.find(L" ");
+                                d = _writeTocLink.find(L" ");
 								_writeTocLink = _writeTocLink.substr(0, d);
 								
                                 _writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
@@ -833,8 +815,7 @@ namespace DocFileFormat
 						text.clear();
 					}
 					_writeInstrText = false;
-					
-                    XMLTools::XMLElement elem( L"w:fldChar" );
+					XMLTools::XMLElement elem( L"w:fldChar" );
                     elem.AppendAttribute( L"w:fldCharType", L"end" );
 
 					m_pXmlWriter->WriteString( elem.GetXMLString());
@@ -1201,8 +1182,7 @@ namespace DocFileFormat
 		TableInfo tai( papx );
 
 		//build the table grid
-		std::vector<short> grid, grid_write;
-		buildTableGrid( cp, nestingLevel, grid, grid_write );
+		std::vector<short>* grid = buildTableGrid( cp, nestingLevel );
 
 		//find first row end
 		int fcRowEnd = findRowEndFc( cp, nestingLevel );
@@ -1213,7 +1193,7 @@ namespace DocFileFormat
         m_pXmlWriter->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, &grid, &grid_write );
+		TablePropertiesMapping *tpMapping = new TablePropertiesMapping( m_pXmlWriter, m_document->Styles, grid );
 
 		row1Tapx.Convert( tpMapping );
 
@@ -1226,7 +1206,7 @@ namespace DocFileFormat
 			//only convert the cells with the given nesting level
 			while ( tai.iTap == nestingLevel )
 			{
-				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
+				cp = writeTableRow( cp, grid, nestingLevel );
 				//?fc = m_document->FindFileCharPos(cp );
 				fc = m_document->m_PieceTable->FileCharacterPositions->operator []( cp );
 				papx = findValidPapx( fc );
@@ -1239,7 +1219,7 @@ namespace DocFileFormat
 			//convert until the end of table is reached
 			while ( tai.fInTable )
 			{
-				cp = writeTableRow( cp, &grid, &grid_write, nestingLevel );
+				cp = writeTableRow( cp, grid, nestingLevel );
 				fc = m_document->FindFileCharPos( cp );
 
 				papx = findValidPapx( fc );
@@ -1250,16 +1230,18 @@ namespace DocFileFormat
 		//close w:tbl
         m_pXmlWriter->WriteNodeEnd( L"w:tbl" );
 
+		RELEASEOBJECT( grid );
+
 		return cp;
 	}
 
 	// Builds a list that contains the width of the several columns of the table.
-	bool DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write)
+	std::vector<short>* DocumentMapping::buildTableGrid(int initialCp, unsigned int nestingLevel)
 	{
 		ParagraphPropertyExceptions* backup = _lastValidPapx;
 
 		std::vector<short> boundaries;
-		std::vector<short> boundaries_all;
+		std::vector<short>* grid = new std::vector<short>();
 		
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1276,43 +1258,25 @@ namespace DocFileFormat
 			for ( std::list<SinglePropertyModifier>::iterator iter = papx->grpprl->begin(); iter != papx->grpprl->end(); iter++ )
 			{
 				//find the tDef SPRM
-				DWORD code = iter->OpCode;
-
-				switch(iter->OpCode)
-				{
-				case sprmTDefTable:
-				case sprmOldTDefTable:
+				if ( iter->OpCode == sprmTDefTable ||  iter->OpCode == sprmOldTDefTable)
 				{
 					unsigned char itcMac = iter->Arguments[0];
 
-						while(boundaries.size() < itcMac + 1)
-							boundaries.push_back(-0x7fff);
-
-						short boundary0 = -0x7fff;
-						for (unsigned char i = 0; i < itcMac; i++)
+					for (int i = 0; i < itcMac; i++)
 					{
 						short boundary1 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( i * 2 ), iter->argumentsSize );
-							short boundary2 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( ( i + 1 ) * 2 ), iter->argumentsSize );
 
-							if (boundary2 - boundary1 > 1 && boundary1 - boundary0 > 1)
+						if ( find( boundaries.begin(), boundaries.end(), boundary1 ) == boundaries.end() )
 						{
-								if ( boundaries[i] == -0x7fff || boundaries[i+1] == -0x7fff)
-								{
-									boundaries[i]	= boundary1;
-									boundaries[i+1]	= boundary2;
-								}
-							}
-							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary1 ) == boundaries_all.end() )
-							{
-								boundaries_all.push_back( boundary1 );
+							boundaries.push_back( boundary1 );
 						}
 
-							if ( find( boundaries_all.begin(), boundaries_all.end(), boundary2 ) == boundaries_all.end() )
+						short boundary2 = FormatUtils::BytesToInt16( iter->Arguments, 1 + ( ( i + 1 ) * 2 ), iter->argumentsSize );
+
+						if ( find( boundaries.begin(), boundaries.end(), boundary2 ) == boundaries.end() )
 						{
-								boundaries_all.push_back( boundary2 );
+							boundaries.push_back( boundary2 );
 						}
-							boundary0 = boundary1;
-						}break;
 					}
 				}
 			}
@@ -1328,25 +1292,19 @@ namespace DocFileFormat
 		}
 
 		//build the grid based on the boundaries
-		sort( boundaries_all.begin(), boundaries_all.end() );
+		sort( boundaries.begin(), boundaries.end() );
 
 		if ( !boundaries.empty() )
 		{
-			for ( size_t i = 0; i < ( boundaries.size() - 1 ); i++ )
+			for ( unsigned int i = 0; i < ( boundaries.size() - 1 ); i++ )
 			{
-				grid_write.push_back(  boundaries[i + 1] - boundaries[i] );
-			}
-		}
-		if ( !boundaries_all.empty() )
-		{
-			for ( size_t i = 0; i < ( boundaries_all.size() - 1 ); i++ )
-			{
-				grid.push_back( boundaries_all[i + 1] - boundaries_all[i] );
+				grid->push_back( boundaries[i + 1] - boundaries[i] );
 			}
 		}
+
 		_lastValidPapx = backup;
 
-		return true;
+		return grid;
 	}
 
 	// Finds the FC of the next row end mark.
@@ -1466,7 +1424,7 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table row that starts at the given cp value and ends at the next row end mark
-	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel)
+	int DocumentMapping::writeTableRow(int initialCp, std::vector<short>* grid, unsigned int nestingLevel)
 	{
 		int cp = initialCp;
 		int fc = m_document->FindFileCharPos( cp );
@@ -1496,7 +1454,7 @@ namespace DocFileFormat
 			//Write until the first "inner trailer paragraph" is reached
 			while ( !( ( m_document->Text->at( cp ) == TextMark::ParagraphEnd ) && ( tai.fInnerTtp ) ) && tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1513,7 +1471,7 @@ namespace DocFileFormat
 			while ( !( ( m_document->Text->at( cp ) == TextMark::CellOrRowMark ) && ( tai.fTtp ) ) 
 				&& tai.fInTable )
 			{
-				cp = writeTableCell( cp, &tapx, grid, grid_write, gridIndex, cellIndex, nestingLevel );
+				cp = writeTableCell( cp, &tapx, grid, gridIndex, cellIndex, nestingLevel );
 				cellIndex++;
 
 				//each cell has it's own PAPX
@@ -1536,15 +1494,18 @@ namespace DocFileFormat
 	}
 
 	/// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
+	int DocumentMapping::writeTableCell(int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel )  
 	{
 		int cp = initialCp;
-		int cpCellEnd	= findCellEndCp( initialCp, nestingLevel );
 
 		//start w:tc
         m_pXmlWriter->WriteNodeBegin( L"w:tc" );
 
-		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( m_pXmlWriter, grid, grid_write, gridIndex, cellIndex );
+		//find cell end
+		int cpCellEnd = findCellEndCp( initialCp, nestingLevel );
+
+		//convert the properties
+		TableCellPropertiesMapping* tcpMapping = new TableCellPropertiesMapping( m_pXmlWriter, grid, gridIndex, cellIndex );
 
 		if ( tapx != NULL )
 		{

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -48,8 +48,6 @@
 #include "OleObjectMapping.h"
 #include "ConversionContext.h"
 #include "IMapping.h"
-#include "FormFieldData.h"
-#include "FormFieldDataMapping.h"
 
 namespace DocFileFormat
 {
@@ -110,15 +108,15 @@ namespace DocFileFormat
 	// Writes the table starts at the given cp value
 		int writeTable		( int initialCp, unsigned int nestingLevel );
 	// Builds a list that contains the width of the several columns of the table.
-		bool buildTableGrid( int initialCp, unsigned int nestingLevel, std::vector<short>& grid, std::vector<short>& grid_write );
+		std::vector<short>* buildTableGrid( int initialCp, unsigned int nestingLevel );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, int& rowEndCp, unsigned int nestingLevel );
 	// Finds the FC of the next row end mark.
 		int findRowEndFc		( int initialCp, unsigned int nestingLevel );
 	// Writes the table row that starts at the given cp value and ends at the next row end mark
-		int writeTableRow		( int initialCp, std::vector<short>* grid, std::vector<short>* grid_write, unsigned int nestingLevel );
+		int writeTableRow		( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
 	// Writes the table cell that starts at the given cp value and ends at the next cell end mark
-		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, std::vector<short>* grid_write, int& gridIndex, int cellIndex, unsigned int nestingLevel );
+		int writeTableCell		( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
 		int findCellEndCp		( int initialCp, unsigned int nestingLevel );
 		
 		bool writeBookmarks		( int cp );

ASCOfficeDocFile/DocDocxConverter/FontFamilyName.h

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

ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp

@@ -34,30 +34,32 @@
 
 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 );
 
-		_ctx->_docx->RegisterFontTable();
+		this->_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++ )
@@ -138,6 +140,6 @@ namespace DocFileFormat
 
         m_pXmlWriter->WriteNodeEnd( L"w:fonts");
 
-		_ctx->_docx->FontTableXML = m_pXmlWriter->GetXmlString() ;
+		this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
 	}
 }

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -1,170 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include "FormFieldData.h"
-#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
-
-namespace DocFileFormat
-{
-std::wstring readXstz(VirtualStreamReader *reader)
-{
-	if (!reader) return L"";
-
-	unsigned short flags, cch, chTerm;
-
-	cch = reader->ReadUInt16();
-
-	std::wstring ret;
-
-	if (cch > 0)
-	{
-		std::shared_ptr<unsigned char>data = std::shared_ptr<unsigned char>(reader->ReadBytes(cch * 2, true));	
-#if defined(_WIN32) || defined(_WIN64)
-        ret = std::wstring((wchar_t*)data.get(), cch );
-#else
-        ret = convertUtf16ToWString((UTF16*)data.get(), cch );
-#endif
-	}
-	chTerm  = reader->ReadUInt16();
-
-	return ret;
-};
-void FormFieldData::_HFD::read(VirtualStreamReader *reader)
-{
-	if (!reader) return;
-}
-void FormFieldData::_FFData::read(VirtualStreamReader *reader)
-{
-	if (!reader) return;
-
-	bExist = true;
-	
-	unsigned short flags;
-
-	version		= reader->ReadUInt32();
-	flags		= reader->ReadUInt16();
-
-	iType		= GETBITS(flags, 0, 1);
-	iRes		= GETBITS(flags, 2, 6);
-	fOwnHelp	= GETBIT(flags, 7);
-	fOwnStat	= GETBIT(flags, 8);
-	fProt		= GETBIT(flags, 9);
-	iSize		= GETBIT(flags, 10);
-	iTypeTxt	= GETBITS(flags, 11, 13);
-	fRecalc		= GETBIT(flags, 14);
-	fHasListBox = GETBIT(flags, 15);
-
-	cch_field	= reader->ReadUInt16();
-	hps			= reader->ReadUInt16();
-
-	xstzName	= readXstz(reader);
-	xstzTextDef	= readXstz(reader);
-	
-	wDef = reader->ReadUInt16();
-	
-	xstzTextFormat	= readXstz(reader);
-	xstzHelpText	= readXstz(reader);
-	xstzStatText	= readXstz(reader);
-	xstzEntryMcr	= readXstz(reader);
-	xstzExitMcr		= readXstz(reader);
-}
-FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, bool bOlderVersion_ )
-{
-	binary_data_size = 0;
-
-	if (!chpx) return;
-
-	int fc = -1;
-	bool bNilPICFAndBinData = false;
-
-	for ( std::list<SinglePropertyModifier>::iterator iter = chpx->grpprl->begin(); iter != chpx->grpprl->end(); iter++ )
-	{
-		switch ( iter->OpCode)
-		{
-			case sprmCFSpec:
-			{
-			}
-			break;
-			case sprmCFFldVanish:
-			{
-			}
-			break;
-			case sprmCPicLocation:
-			{
-				fc = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
-			}
-			break;
-			case sprmCRsidText:
-			{
-				rsid = FormatUtils::IntToFormattedWideString(FormatUtils::BytesToInt32(iter->Arguments, 0, iter->argumentsSize), L"%08x");
-			}
-			break;
-			case sprmCFData:
-			{
-				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
-			}
-			break;
-		}
-	}
-
-	if (fc >= 0 && bNilPICFAndBinData)
-	{
-		VirtualStreamReader reader(stream, fc, bOlderVersion_);
-
-		int sz_stream = reader.GetSize();
-
-		int lcb = reader.ReadUInt32();
-		int cbHeader = reader.ReadUInt16();
-
-		if (cbHeader != 0x44) return;
-
-		//ignored
-		reader.ReadBytes(62, false);
-
-		switch(type)
-		{
-		case 1:
-			HFD.read(&reader);
-		case 2:
-			FFData.read(&reader);
-			break;
-		default:
-			binary_data_size = lcb - cbHeader;
-			binary_data = std::shared_ptr<unsigned char>(reader.ReadBytes(binary_data_size, true));
-			break;
-		}
-	}
-}
-
-
-}

ASCOfficeDocFile/DocDocxConverter/FormFieldData.h

@@ -1,126 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include "IVisitable.h"
-#include "CharacterPropertyExceptions.h"
-#include "StructuredStorageReader.h"
-#include "VirtualStreamReader.h"
-
-namespace DocFileFormat
-{
-	class FormFieldData : public IVisitable
-	{
- 	public:
-
-		struct _HFD
-		{
-			bool bExist = false;
-
-			bool fNew = false;
-			bool fNoHist = false;
-			bool fImageMap = false;
-			bool fLocation = false;
-			bool fTooltip = false;
-
-			std::wstring clsid;
-			
-			_UINT32	streamVersion = 0;
-			bool	hlstmfHasMoniker = false;
-			bool	hlstmfIsAbsolute = false;
-			bool	hlstmfSiteGaveDisplayName = false;
-			bool	hlstmfHasLocationStr = false;
-			bool	hlstmfHasDisplayName = false;
-			bool	hlstmfHasGUID = false;
-			bool	hlstmfHasCreationTime = false;
-			bool	hlstmfHasFrameName = false;
-			bool	hlstmfMonikerSavedAsStr = false;
-			bool	hlstmfAbsFromGetdataRel = false;
-
-			std::wstring displayName;
-			std::wstring targetFrameName;
-			std::wstring moniker;
-
-			std::wstring	oleMoniker_clsid;
-			std::wstring	oleMoniker_data;
-			std::wstring	location;
-
-			std::wstring	guid;
-			_UINT64			fileTime = 0;
-
-			void read(VirtualStreamReader* reader);
-		};
-		struct _FFData
-		{
-			bool		bExist = false;
-			_UINT32		version = 0;
-			
-			unsigned char	iType = 0;
-			unsigned char	iRes = 0;
-			bool			fOwnHelp = false;
-			bool			fOwnStat = false;
-			bool			fProt = false;
-			bool			iSize = false;
-			unsigned char	iTypeTxt = 0;
-			bool			fRecalc = false;
-			bool			fHasListBox = false;
-			
-			unsigned short	cch_field = 0;
-			unsigned short	hps = 0;
-			std::wstring	xstzName;
-			std::wstring	xstzTextDef;
-			unsigned short	wDef = 0;
-			std::wstring	xstzTextFormat;
-			std::wstring	xstzHelpText;
-			std::wstring	xstzStatText;
-			std::wstring	xstzEntryMcr;
-			std::wstring	xstzExitMcr;
-
-			//STTB			hsttbDropList;
-			void read(VirtualStreamReader* reader);
-		};
-		FormFieldData( int type, const CharacterPropertyExceptions* chpx, POLE::Stream* stream, bool bOlderVersion );
-		virtual ~FormFieldData() {}
-	private:
-		friend class FormFieldDataMapping;  
-
-		std::wstring name;
-		std::wstring rsid;
-
-		_FFData FFData;
-		_HFD	HFD;
-
-		std::shared_ptr<unsigned char> binary_data;
-		int binary_data_size;
-
-};
-}

ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h

@@ -1,87 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include "ConversionContext.h"
-#include "FormFieldData.h"
-
-#include "AbstractOpenXmlMapping.h"
-#include "IMapping.h"
-
-namespace DocFileFormat
-{
-	class FormFieldDataMapping: public AbstractOpenXmlMapping, public IMapping
-	{
-	public:
-		FormFieldDataMapping(XMLTools::CStringXmlWriter* writer, ConversionContext* context, IMapping* caller) 
-																		: AbstractOpenXmlMapping(writer), m_context(NULL),_caller(NULL)
-		{
-			m_context	=	context;
-			_caller		=	caller;
-		}
-
-		virtual void Apply(IVisitable* visited)
-		{
-			FormFieldData* ffData = static_cast<FormFieldData*>(visited);
-
-			if ( ffData == NULL ) return;
-
-			if (ffData->FFData.bExist)
-			{
-                m_pXmlWriter->WriteNodeBegin( L"w:ffData");
-
-					m_pXmlWriter->WriteNodeBegin( L"w:name", true);
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzName);
-					m_pXmlWriter->WriteNodeEnd(L"w:name", true, true );
-					
-					m_pXmlWriter->WriteNodeBegin( L"w:calcOnExit", true);
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.fRecalc);
-					m_pXmlWriter->WriteNodeEnd(L"w:calcOnExit", true, true );
-					
-					m_pXmlWriter->WriteNodeBegin( L"w:textInput");
-						
-						m_pXmlWriter->WriteNodeBegin( L"w:maxLength", true);
-							m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.cch_field);
-						m_pXmlWriter->WriteNodeEnd(L"w:maxLength", true, true );
-
-					m_pXmlWriter->WriteNodeEnd( L"w:textInput" );
-
-                m_pXmlWriter->WriteNodeEnd( L"w:ffData" );
-			}
-		}
-
-
-	private:  
-		ConversionContext*	m_context;
-		IMapping*			_caller;
-	};
-}

ASCOfficeDocFile/DocDocxConverter/IVisitable.h

@@ -34,7 +34,6 @@
 #include "IMapping.h"
 
 #define GETBITS(from, numL, numH) ((from & (((1 << (numH - numL + 1)) - 1) << numL)) >> numL)
-#define GETBIT(from, num) ((from & (1 << num)) != 0)
 
 namespace DocFileFormat
 {

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -38,8 +38,8 @@ namespace DocFileFormat
 	{
 		if (m_context)
 		{
-			m_document		=	m_context->_doc;
-			m_xmldocument	=	m_context->_docx;
+			m_document		=	m_context->GetDocument();
+			m_xmldocument	=	m_context->GetXmlDocument();
 		}
 	}
 
@@ -582,7 +582,7 @@ namespace DocFileFormat
 // The style id is used for a reverse reference. 
 // It can happen that the reference points to the wrong style.
 
-		if (styleIndex != ListData::ISTD_NIL && styleIndex < m_document->Styles->Styles->size())
+		if (styleIndex != ListData::ISTD_NIL)
 		{
             m_pXmlWriter->WriteNodeBegin( L"w:pStyle", TRUE );
             m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(StyleSheetMapping::MakeStyleId(m_document->Styles->Styles->at(styleIndex))));

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/BlipStoreEntry.h

@@ -110,11 +110,6 @@ 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		= new BYTE[lCompressSize];
-			m_lMetaFileSize = lCompressSize;
-			memcpy(m_pMetaFile, pCompress, lCompressSize);
+			m_pMetaFile		= pCompress;
+			m_lMetaFileSize = lUncompressSize;
 		}
 		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,8 +340,6 @@ typedef enum _BlipCompression
 
 			if (typeCode == 0xf01b)
 			{
-				oMetaFile.m_sExtension	= L".wmf";
-				
 				WmfPlaceableFileHeader oWmfHeader = {};
 				oMetaHeader.ToWMFHeader(&oWmfHeader);
 				
@@ -351,12 +349,24 @@ 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/OfficeDrawing/ShapeOptions.h

@@ -597,12 +597,16 @@ namespace DocFileFormat
 
 		virtual ~ShapeOptions()
 		{
+			//for (std::vector<OptionEntry>::iterator iter = Options.begin(); iter != Options.end(); ++iter)
+			//	RELEASEARRAYOBJECTS( iter->opComplex );
 		}
 
 		ShapeOptions (IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance) : Record (_reader, size, typeCode, version, instance)
 		{
 			long pos = Reader->GetPosition();
 
+			//instance is the count of properties stored in this record
+
 			//parse the flags and the simple values
 			for (unsigned int i = 0; i < instance; ++i)
 			{
@@ -617,7 +621,9 @@ namespace DocFileFormat
 				Options.push_back( entry );
 			}
 
-			//parse the complex values & sorted by pid
+			//parse the complex values
+			//these values are stored directly at the end  
+			//of the OptionEntry arry, sorted by pid
 			for (unsigned int i = 0; i < instance; ++i)
 			{
 				if (Options[i]->fComplex && Options[i]->op > 0)

ASCOfficeDocFile/DocDocxConverter/OleObject.cpp

@@ -46,35 +46,35 @@ OleObject::OleObject( const CharacterPropertyExceptions* chpx, StructuredStorage
 	  
 	HRESULT res = S_OK;
 	
-	POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, L"ObjectPool");
+	POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, "ObjectPool");
 
 	if (ObjectPoolStorage)
 	{
 		ObjectId = getOleEntryName( chpx );
 		
-		std::wstring sObjectId( ObjectId.begin(), ObjectId.end() );
+		std::string sObjectId( ObjectId.begin(), ObjectId.end() );
 		{		
-			std::wstring name = L"ObjectPool/" + sObjectId + L"/";
-			processOleStream(  name + L"Ole"  );
+			std::string name = "ObjectPool/" + sObjectId + "/";
+			processOleStream(  name + "Ole"  );
 
 			if ( bLinked )
 			{
-			  processLinkInfoStream( name +  L"LinkInfo"  );
+			  processLinkInfoStream( name +  "LinkInfo"  );
 			}
 			else
 			{
-			  processCompObjStream(  name +  L"CompObj"  );
+			  processCompObjStream(  name +  "CompObj"  );
 			}
 			
-			processPICStream(  name +  L"PIC"  );
+			processPICStream(  name +  "PIC"  );
 
-			processEquationNativeStream(  name +  L"Equation Native"  );
+			processEquationNativeStream(  name +  "Equation Native"  );
 		}
 		delete  ObjectPoolStorage;
 	}
 }
 
-void OleObject::processLinkInfoStream( const std::wstring& linkStream )
+void OleObject::processLinkInfoStream( const std::string& linkStream )
 {
 	try
 	{
@@ -125,7 +125,7 @@ void OleObject::processLinkInfoStream( const std::wstring& linkStream )
 	}
 }
       
-void OleObject::processEquationNativeStream( const std::wstring& eqStream )
+void OleObject::processEquationNativeStream( const std::string& eqStream )
 {
 	try
 	{
@@ -156,7 +156,7 @@ void OleObject::processEquationNativeStream( const std::wstring& eqStream )
 	}
 }
 
-void OleObject::processPICStream( const std::wstring& picStream )
+void OleObject::processPICStream( const std::string& picStream )
 {
 	try
 	{
@@ -191,7 +191,7 @@ void OleObject::processPICStream( const std::wstring& picStream )
 	}
 }
 
-void OleObject::processCompObjStream( const std::wstring& compStream )
+void OleObject::processCompObjStream( const std::string& compStream )
 {
 	try
 	{
@@ -206,11 +206,11 @@ void OleObject::processCompObjStream( const std::wstring& compStream )
 			//skip the CompObjHeader
 			reader.ReadBytes( 28, false );
 
-			unsigned int sz_obj = reader.GetSize() - reader.GetPosition();
+			int sz_obj = reader.GetSize() - reader.GetPosition();
 
 			if (sz_obj > 4)
 			{
-				UserType = reader.ReadLengthPrefixedAnsiString(sz_obj);
+				UserType		= reader.ReadLengthPrefixedAnsiString(sz_obj);
 
 				sz_obj = reader.GetSize() - reader.GetPosition();
 				if (sz_obj > 4)
@@ -218,7 +218,7 @@ void OleObject::processCompObjStream( const std::wstring& compStream )
 
 				sz_obj = reader.GetSize() - reader.GetPosition();
 				if (sz_obj > 4)
-					Program = reader.ReadLengthPrefixedAnsiString(sz_obj);
+					Program			= reader.ReadLengthPrefixedAnsiString(sz_obj);
 			}
 			delete pCompStream;
 		}
@@ -228,7 +228,7 @@ void OleObject::processCompObjStream( const std::wstring& compStream )
 	}
 }
 
-void OleObject::processOleStream( const std::wstring& oleStreamName )
+void OleObject::processOleStream( const std::string& oleStreamName )
 {
 	try
 	{

ASCOfficeDocFile/DocDocxConverter/OleObject.h

@@ -74,11 +74,11 @@ namespace DocFileFormat
 	private:
 		POLE::Storage	*oleStorage;
 	  
-		void processLinkInfoStream		( const std::wstring& linkStream );      
-		void processEquationNativeStream( const std::wstring& eqStream );
-		void processPICStream			( const std::wstring& picStream );
-		void processCompObjStream		( const std::wstring& compStream );
-		void processOleStream			( const std::wstring& oleStreamName );
+		void processLinkInfoStream		( const std::string& linkStream );      
+		void processEquationNativeStream( const std::string& eqStream );
+		void processPICStream			( const std::string& picStream );
+		void processCompObjStream		( const std::string& compStream );
+		void processOleStream			( const std::string& oleStreamName );
 
 		std::wstring getOleEntryName	( const CharacterPropertyExceptions* chpx );
 };

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -43,7 +43,6 @@
 #include "MainDocumentMapping.h"
 #include "OleObjectMapping.h"
 #include "VMLPictureMapping.h"
-#include "FormFieldDataMapping.h"
 
 #include "../../DesktopEditor/common/File.h"
 #include "../../DesktopEditor/common/Directory.h"
@@ -137,17 +136,15 @@ namespace DocFileFormat
 	{
 		NSFile::CFileBinary file;
 		file.CreateFileW(fileName);
-		file.WriteFile((BYTE*)data.c_str(), (_UINT32)data.size());
+		file.WriteFile((BYTE*)data.c_str(), data.size());
 		file.CloseFile();
 		return S_OK;
 	}
 	HRESULT OpenXmlPackage::SaveOLEObject( const std::wstring& fileName, const OleObjectFileStructure& oleObjectFileStructure )
 	{
-		if (docFile == NULL) return S_FALSE;
-
 		POLE::Storage *storageOut = new POLE::Storage(fileName.c_str());
-		if (storageOut == NULL) return S_FALSE;
 		
+		if (storageOut == NULL || docFile == NULL) return S_FALSE;
 		if (storageOut->open(true, true)==false)
 		{	
 			delete storageOut;
@@ -157,19 +154,20 @@ namespace DocFileFormat
 		POLE::Storage *storageInp = docFile->GetStorage()->GetStorage();
 
 		{
-			POLE::Stream* oleStorage = new POLE::Stream(storageInp, oleObjectFileStructure.objectID);
+			std::string id(oleObjectFileStructure.objectID.begin(),oleObjectFileStructure.objectID.end());
+
+			POLE::Stream* oleStorage = new POLE::Stream(storageInp, id);
 
 			if (oleStorage)
 			{
-				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)
+				std::string path = "ObjectPool/" + id;
+				std::list<std::string> entries = storageInp->entries(path);
+				for (std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++)
 				{
-					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + L"/"+ (*it));
+					POLE::Stream *stream_inp = new POLE::Stream(storageInp, path + "/"+ (*it));
 					if (stream_inp == NULL)continue;
 
-					POLE::uint64 size = stream_inp->size();
+					int size = stream_inp->size();
 					
 					POLE::Stream *stream_out = new POLE::Stream(storageOut, *it, true, size);
 

ASCOfficeDocFile/DocDocxConverter/ParagraphPropertiesMapping.cpp

@@ -154,7 +154,7 @@ namespace DocFileFormat
 
 				case sprmPFBiDi:
 				{
-					bool val = iter->argumentsSize > 0 ? (iter->Arguments[0] != 0) : true;
+					bool val = iter->argumentsSize > 0 ? iter->Arguments[0] : true;
                     appendFlagElement( _pPr, *iter, L"bidi", val);
 					_isBidi = val;
 				}break;			
@@ -427,7 +427,7 @@ namespace DocFileFormat
 					if (m_document->listTable)
 					{
 						m_document->listTable->appendNumbering(  desc );
-						short numId = static_cast<short>(m_document->listTable->listNumbering.size());
+						short numId = m_document->listTable->listNumbering.size();
                         appendValueElement( &numPr, L"numId", numId, true );
 					}
 				}break;
@@ -485,7 +485,7 @@ namespace DocFileFormat
 				{
                     XMLTools::XMLElement tabs( L"w:tabs" );
 
-					unsigned int pos = 0;
+					int pos = 0;
 
 					//read the removed tabs
 					unsigned char itbdDelMax = iter->Arguments[pos];

ASCOfficeDocFile/DocDocxConverter/RevisionData.cpp

@@ -40,13 +40,19 @@ namespace DocFileFormat
 		RELEASEOBJECT( Changes );
 	}
 
+	/*========================================================================================================*/
+
 	RevisionData::RevisionData():
 	Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
 	{
 		this->Changes = new std::list<SinglePropertyModifier>();
 	}
 
-	RevisionData::RevisionData( CharacterPropertyExceptions* chpx ) : Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
+	/*========================================================================================================*/
+
+	/// Collects the revision data of a CHPX
+	RevisionData::RevisionData( CharacterPropertyExceptions* chpx ):
+	Dttm(), Isbt(0), Type(NoRevision), Changes(NULL), RsidDel(0), RsidProp(0), Rsid(0)
 	{
 		bool collectRevisionData = true;
 		this->Changes = new std::list<SinglePropertyModifier>();

ASCOfficeDocFile/DocDocxConverter/SprmTDefTable.h

@@ -41,7 +41,7 @@ namespace DocFileFormat
 	{
 		TC80()
 		{
-			wWidth = horzMerge =0;
+			horzMerge = wWidth = 0;
 			
 			textFlow	=	Global::lrTb;
 			vertMerge	=	Global::fvmClear;
@@ -95,14 +95,13 @@ namespace DocFileFormat
 			int pointer = 1;
 
 			// rgdxaCenter
+
 			for (int i = 0; i < numberOfColumns + 1; ++i)
 			{
-				int pos = FormatUtils::BytesToInt16(bytes, pointer, size);
-				rgdxaCenter.push_back(pos);
+				rgdxaCenter.push_back(FormatUtils::BytesToInt16(bytes, pointer, size));
 				pointer += 2;
 			}
 
-
 			// rgTc80
 
 			for (int i = 0; i < numberOfColumns; ++i)

ASCOfficeDocFile/DocDocxConverter/StringTable.h

@@ -41,7 +41,6 @@ namespace DocFileFormat
 {
 	template<class T> class StringTable: public IVisitable
 	{
-		friend class WordDocument;
 		friend class CharacterPropertiesMapping;
 		friend class FontTableMapping;
 		friend class StyleSheetMapping;	
@@ -82,7 +81,7 @@ namespace DocFileFormat
 			}
 		}
 
-		ByteStructure* operator [] ( size_t index ) const
+		ByteStructure* operator [] ( unsigned int index ) const
 		{
 			if ( index < this->Data.size() )
 			{

ASCOfficeDocFile/DocDocxConverter/StructuredStorageReader.h

@@ -61,18 +61,18 @@ namespace DocFileFormat
 			}
 			return false;
 		}
-		bool isDirectory( const std::wstring& name )
+		bool isDirectory( const std::string& name )
 		{
 			if (!m_pStorage) return false;
 			
 			return m_pStorage->isDirectory(name);
 		}
 
-		bool GetStream (const std::wstring & path, POLE::Stream** ppStream)
+		bool GetStream (const char *path, POLE::Stream** ppStream)
 		{
-			if (( m_pStorage != NULL ) && ( !path.empty() ))
+			if (( m_pStorage != NULL ) && ( path != NULL ))
 			{
-				*ppStream = new POLE::Stream(m_pStorage, path.c_str());
+				*ppStream = new POLE::Stream(m_pStorage, path);
 			}
 			if ((*ppStream)  && ((*ppStream)->size() > 0)) 
 				return true;
@@ -85,15 +85,15 @@ namespace DocFileFormat
 			return m_pStorage;
 		}
 	
-		void copy( int indent, std::wstring path, POLE::Storage * storageOut, bool withRoot = true)
+		void copy( int indent, std::string path, POLE::Storage * storageOut, bool withRoot = true)
 		{
-			std::list<std::wstring> entries, entries_sort;
-			entries = m_pStorage->entries_with_prefix( path );
+			std::list<std::string> entries, entries_sort;
+			entries = m_pStorage->entries( path );
 			
-			for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
+			for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
 			{
-				std::wstring name = *it;
-				std::wstring fullname = path + name;
+				std::string name = *it;
+				std::string fullname = path + name;
 		       
 				if( m_pStorage->isDirectory( fullname ) )
 				{
@@ -104,15 +104,15 @@ 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::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); it++ )
 			{
-				std::wstring name = *it;
-				std::wstring fullname = path + name;
+				std::string name = *it;
+				std::string fullname = path + name;
 		       
 				if( m_pStorage->isDirectory( fullname ) )
 				{
-					copy( indent + 1, fullname + L"/", storageOut, withRoot );
+					copy( indent + 1, fullname + "/", storageOut, withRoot );
 				}
 				else
 				{
@@ -122,17 +122,17 @@ namespace DocFileFormat
 		}
 
 	private:
-		void copy_stream(std::wstring streamName, POLE::Storage * storageOut, bool withRoot = true)
+		void copy_stream(std::string streamName, POLE::Storage * storageOut, bool withRoot = true)
 		{
 			POLE::Stream *stream = new POLE::Stream(m_pStorage, streamName);
 			if (!stream) return;
 
 			stream->seek(0);
-			POLE::int64 size_stream = stream->size();
+			int size_stream = stream->size();
 
 			if (withRoot == false)
 			{
-				int pos = (int)streamName.find(L"/");
+				int pos = streamName.find("/");
 				if (pos >= 0)
 					streamName = streamName.substr(pos + 1);
 			}

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -35,13 +35,13 @@
 
 namespace DocFileFormat
 {
-	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex) : 
+	TableCellPropertiesMapping::TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* tableGrid, int gridIndex, int cellIndex) : 
 										PropertiesMapping(pWriter)
 	{
 		_width		=	0;
 
 		_gridIndex	=	gridIndex;
-		_grid		=	grid;
+		_grid		=	tableGrid;
 		_cellIndex	=	cellIndex;
 
 		_brcTop		=	NULL;
@@ -75,8 +75,6 @@ namespace DocFileFormat
 		TablePropertyExceptions* tapx	=	static_cast<TablePropertyExceptions*>(visited);
 		int nComputedCellWidth			=	0;
 
-		_gridSpan = 1;
-
 		std::list<SinglePropertyModifier>::const_reverse_iterator rend = tapx->grpprl->rend();
 		for (std::list<SinglePropertyModifier>::const_reverse_iterator iter = tapx->grpprl->rbegin(); iter != rend; ++iter)
 		{
@@ -89,7 +87,7 @@ namespace DocFileFormat
 					int cc = tdef.numberOfColumns;
 
 					_tGrid = tdef.rgdxaCenter;
-                    _tcDef = tdef.rgTc80[(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1)];	
+                    _tcDef = tdef.rgTc80[(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1)];	// NOTE: fix for crash
 
                     appendValueElement( _tcPr, L"textDirection", FormatUtils::MapValueToWideString( _tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ), false );
 
@@ -113,19 +111,13 @@ namespace DocFileFormat
 					{
                         appendValueElement( _tcPr, L"noWrap", L"", true );
 					}
-					int ind = (std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1);
-					int ind1 = ind; 
-					while (ind1 < tdef.rgdxaCenter.size() - 1)
-					{
-						int sz = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind1 ] ;
-						if (sz > 1)
-							break;
-						ind1++;
-					}
-					nComputedCellWidth = tdef.rgdxaCenter[ ind1 + 1] - tdef.rgdxaCenter[ ind ] ;	
+
+                    nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)(std::min)(_cellIndex,  (int)tdef.rgTc80.size() - 1) + 1] -
+                        tdef.rgdxaCenter[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)] );	// NOTE: fix for crash
 
 					if (!IsTableBordersDefined(tapx->grpprl))
-					{
+					{											//borders
+
 						RELEASEOBJECT(_brcTop);
 						_brcTop = new BorderCode(*_tcDef.brcTop);
 
@@ -142,7 +134,8 @@ namespace DocFileFormat
 				break;
 
 				case sprmTCellPadding:
-				{
+				{							//margins
+
 					unsigned char first		=	iter->Arguments[0];
 					unsigned char lim		=	iter->Arguments[1];
 					unsigned char ftsMargin	=	iter->Arguments[3];
@@ -172,6 +165,7 @@ namespace DocFileFormat
 					}
 				}
 				break;
+
 				case sprmTDefTableShd80:
 				{
 					if (!tapx->IsSkipShading97())	// если такой операнд единственный то учитываем его, иначе скипаем его
@@ -276,23 +270,24 @@ namespace DocFileFormat
 			}
 		}
 
-		XMLTools::XMLElement    tcW     ( L"w:tcW" );
-		
+		//width
+        XMLTools::XMLElement    tcW     ( L"w:tcW" );
+        XMLTools::XMLAttribute  tcWType ( L"w:type", FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) );
+        XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width ) );
 
-		XMLTools::XMLAttribute  tcWVal  ( L"w:w", FormatUtils::IntToWideString( _width > 1 ? _width : nComputedCellWidth) );
-		XMLTools::XMLAttribute  tcWType ( L"w:type",  _width > 1 ? FormatUtils::MapValueToWideString( _ftsWidth, &Global::CellWidthTypeMap[0][0], 4, 5 ) : L"dxa" );
-
-		tcW.AppendAttribute( tcWType );
+        tcW.AppendAttribute( tcWType );
 		tcW.AppendAttribute( tcWVal );
 		_tcPr->AppendChild( tcW );
 
+		//grid span
+		_gridSpan = 1;
 
 		if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
 		{
 			//check the number of merged cells
 			int w = _grid->at( _gridIndex );
 
-			for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
+			for ( unsigned int i = _gridIndex + 1; i < _grid->size(); i++ )
 			{
 				_gridSpan++;
 

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 	public:	
 
 		virtual ~TableCellPropertiesMapping();
-		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* grid, const std::vector<short>* grid_write, int gridIndex, int cellIndex);
+		TableCellPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, const std::vector<short>* tableGrid, int gridIndex, int cellIndex);
 		virtual void Apply( IVisitable* visited );
 	
 		inline int GetGridSpan() const
@@ -71,7 +71,9 @@ namespace DocFileFormat
 		void apppendCellShading (unsigned char* sprmArg, int size, int cellIndex);
 		bool IsTableBordersDefined (const std::list<SinglePropertyModifier>* grpprl) const;
 		bool IsTableCellWidthDefined (const std::list<SinglePropertyModifier>* grpprl) const;
-		
+	
+	private: 
+	
 		int _gridIndex;
 		int _cellIndex;
 		
@@ -91,6 +93,7 @@ namespace DocFileFormat
 		BorderCode* _brcRight;
 		BorderCode* _brcBottom;
 
-		int		_gridSpan;
+		/// The grind span of this cell
+		int _gridSpan;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp

@@ -106,7 +106,7 @@ namespace DocFileFormat
 		cellElements.clear();
 	}
 
-	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int nCellIndex)
+	void TableCell::Convert(IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int nCellIndex)
 	{
 		if (NULL != mapping)
 		{
@@ -116,14 +116,14 @@ namespace DocFileFormat
 		ParagraphPropertyExceptions* papxBackup = documentMapping->_lastValidPapx;
 		SectionPropertyExceptions* sepxBackup	= documentMapping->_lastValidSepx;
 
-	//find cell end
+		//start w:tc
+        documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
+
+		//find cell end
 		int cpCellEnd = documentMapping->findCellEndCp(cp, depth);
 
-	//start w:tc
-		documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
-		
-	//convert the properties
-		TableCellPropertiesMapping tcpMapping(documentMapping->GetXMLWriter(), grid, grid_write, gridIndex, nCellIndex);
+		//convert the properties
+		TableCellPropertiesMapping tcpMapping(documentMapping->GetXMLWriter(), grid, gridIndex, nCellIndex);
 
 		if ( tapx != NULL )
 		{
@@ -140,7 +140,7 @@ namespace DocFileFormat
 			(*iter)->Convert( mapping );
 		}
 
-	//end w:tc
+		//end w:tc
         documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tc" );
 	}
 
@@ -193,7 +193,7 @@ namespace DocFileFormat
 		cells.clear();
 	}
 
-	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write)
+	void TableRow::Convert(IMapping* mapping, const std::vector<short>* grid)
 	{
 		if ( mapping != NULL )
 		{
@@ -234,7 +234,7 @@ namespace DocFileFormat
 			{
 				for ( std::list<TableCell>::iterator iter = cells.begin(); iter != cells.end(); iter++ )
 				{
-					iter->Convert( mapping, &tapx, grid, grid_write, gridIndex, nCellIndex++);
+					iter->Convert( mapping, &tapx, grid, gridIndex, nCellIndex++ );
 				}
 			}
 
@@ -516,8 +516,7 @@ namespace DocFileFormat
 		SectionPropertyExceptions* sepxBackup	=	documentMapping->_lastValidSepx;
 
 		//build the table grid
-		std::vector<short> grid, grid_write;
-		documentMapping->buildTableGrid( cpStart, depth, grid, grid_write );
+		std::vector<short>* grid = documentMapping->buildTableGrid( cpStart, depth );
 
 		//find first row end
 		int fcRowEnd = documentMapping->findRowEndFc( cpStart, depth );
@@ -530,7 +529,7 @@ namespace DocFileFormat
         documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tbl" );
 
 		//Convert it
-		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, &grid, &grid_write );
+		TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, grid );
 
 		row1Tapx.Convert( &tpMapping );
 
@@ -539,12 +538,13 @@ namespace DocFileFormat
 
 		for ( std::list<TableRow>::iterator iter = rows.begin(); iter != rows.end(); iter++ )
 		{
-			iter->Convert( mapping, &grid, &grid_write );  
+			iter->Convert( mapping, grid );  
 		}
 
 		//close w:tbl
         documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tbl" );
 
+		RELEASEOBJECT( grid );
 	}
 
 }

ASCOfficeDocFile/DocDocxConverter/TableMapping.h

@@ -58,7 +58,7 @@ namespace DocFileFormat
 		void AddItem( const ITableCellElement& _tableCellElement );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, const std::vector<short>* grid_write, int& gridIndex, int cellIndex );
+		void Convert( IMapping* mapping, TablePropertyExceptions* tapx, const std::vector<short>* grid, int& gridIndex, int cellIndex );
 		~TableCell();
 
 	private:
@@ -81,7 +81,7 @@ namespace DocFileFormat
 		void AddCell( const TableCell& _tableCell );
 		bool IsEmpty() const;
 		void Clear();
-		void Convert( IMapping* mapping, const std::vector<short>* grid, const std::vector<short>* grid_write );
+		void Convert( IMapping* mapping, const std::vector<short>* grid );
 		~TableRow();
 
 	private:

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -34,13 +34,15 @@
 
 namespace DocFileFormat
 {
-	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded ):
-			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(grid), _grid_write(grid_write),
-			brcLeft(NULL), brcTop(NULL), brcBottom(NULL), brcRight(NULL), brcHorz(NULL), brcVert(NULL), _styles(styles),
+	TablePropertiesMapping::TablePropertiesMapping (XMLTools::CStringXmlWriter* pWriter, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded ):
+			PropertiesMapping(pWriter), _tblPr(NULL), _tblGrid(NULL), _tblBorders(NULL), _grid(NULL),
+			brcLeft(NULL), brcTop(NULL), brcBottom(NULL), brcRight(NULL), brcHorz(NULL), brcVert(NULL), _styles(NULL),
 			_isTableStyleNeeded(isTableStyleNeeded)
 {
+	_styles		= styles;
     _tblPr		= new XMLTools::XMLElement( L"w:tblPr");
     _tblBorders = new XMLTools::XMLElement( L"w:tblBorders");
+	_grid		= grid;
 }
 TablePropertiesMapping::~TablePropertiesMapping()
 {
@@ -72,9 +74,6 @@ namespace DocFileFormat
 		short marginLeft	= 0;
 		short marginRight	= 0;
 
-		BYTE itcFirst		= 0;
-		BYTE itcLim			= 0;
-
 		for ( std::list<SinglePropertyModifier>::iterator iter = tapx->grpprl->begin(); iter != tapx->grpprl->end(); iter++ )
 		{
 			switch( iter->OpCode )
@@ -121,15 +120,7 @@ namespace DocFileFormat
 					_tblPr->AppendChild( tblW );
 				}
 				break;
-				case sprmTMerge:
-				{
-					itcFirst = iter->Arguments[0];
-					itcLim = iter->Arguments[1];
-				}break;
-				case sprmTSplit:
-				{
 
-				}break;
 				case sprmOldTJc:
 				case sprmTJc:
 				case sprmTJcRow:
@@ -153,7 +144,7 @@ namespace DocFileFormat
 
 					if ( _isTableStyleNeeded )
 					{
-						size_t ind = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
+						int ind = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
 						
 						std::wstring id = ind < _styles->Styles->size() ? StyleSheetMapping::MakeStyleId( _styles->Styles->at( ind ) ) : L"";
 
@@ -495,7 +486,7 @@ namespace DocFileFormat
 			bWriteGridCol = true;
 		else
 		{
-			for ( size_t i = 0, nSize = _grid_write->size(); i < nSize; i++ )
+			for ( unsigned int i = 0, nSize = _grid->size(); i < nSize; i++ )
 			{
 				if(_grid->at(i) % DocFileFormat::gc_nZeroWidth != 0)
 				{
@@ -506,10 +497,10 @@ namespace DocFileFormat
 		}
 		if(true == bWriteGridCol)
 		{
-			for ( size_t i = 0; i < _grid_write->size(); i++ )		
+			for ( unsigned int i = 0; i < _grid->size(); i++ )		
 			{
                 XMLTools::XMLElement gridCol( L"w:gridCol");
-                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid_write->at( i ) ) );
+                XMLTools::XMLAttribute gridColW( L"w:w", FormatUtils::IntToWideString( _grid->at( i ) ) );
 				gridCol.AppendAttribute( gridColW );
 				_tblGrid->AppendChild( gridCol );
 			}

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.h

@@ -71,7 +71,7 @@ namespace DocFileFormat
 	class TablePropertiesMapping: public PropertiesMapping, public IMapping
 	{
 	public:
-		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, std::vector<short>* grid_write, bool isTableStyleNeeded = true );
+		TablePropertiesMapping( XMLTools::CStringXmlWriter* writer, StyleSheet* styles, std::vector<short>* grid, bool isTableStyleNeeded = true );
 		virtual ~TablePropertiesMapping();
 		void Apply( IVisitable* visited );
 
@@ -83,7 +83,6 @@ namespace DocFileFormat
 		
 		StyleSheet* _styles;
 		std::vector<short>* _grid;
-		std::vector<short>* _grid_write;
 		
 		BorderCode* brcLeft;
 		BorderCode* brcTop;

ASCOfficeDocFile/DocDocxConverter/TablePropertyExceptions.h

@@ -62,9 +62,8 @@ namespace DocFileFormat
 
 			for (std::list<SinglePropertyModifier>::iterator oSpmIter = papx->grpprl->begin(); oSpmIter != papx->grpprl->end(); ++oSpmIter)
 			{
-				if (oSpmIter->OpCode == sprmTDefTableShd	|| 
-					oSpmIter->OpCode == sprmTDefTableShd2nd || 
-					oSpmIter->OpCode == sprmTDefTableShd3rd)
+				if (oSpmIter->OpCode == sprmTDefTableShd	|| oSpmIter->OpCode == sprmTDefTableShd2nd || 
+					oSpmIter->OpCode == sprmTDefTableShd2nd || oSpmIter->OpCode == sprmTDefTableShd3rd)
 				{
 					m_bSkipShading97 = TRUE;
 				}

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -156,35 +156,33 @@ namespace DocFileFormat
 		file.CloseFile();
 
 		OOX::CPath path(sTempXmlFile);
-		OOX::CDocument docEmbedded(NULL, path, path);
+		OOX::CDocument docEmbedded(path, path);
 
 		bool res = false;
-        for (std::vector<OOX::WritingElement*>::iterator it = docEmbedded.m_arrItems.begin(); it != docEmbedded.m_arrItems.end(); ++it)
+		for (int i = 0 ; i < docEmbedded.m_arrItems.size(); i++)
 		{
-			if ((*it)->getType() == OOX::et_w_p)
+			if (docEmbedded.m_arrItems[i]->getType() == OOX::et_w_p)
 			{
-				OOX::Logic::CParagraph *paragraph = dynamic_cast<OOX::Logic::CParagraph *>(*it);
+				OOX::Logic::CParagraph *paragraph = dynamic_cast<OOX::Logic::CParagraph *>(docEmbedded.m_arrItems[i]);
 
-                for (std::vector<OOX::WritingElement*>::iterator		jt = paragraph->m_arrItems.begin();
-													(paragraph) && (jt != paragraph->m_arrItems.end()); jt++)
+				for (int j = 0; (paragraph) && (j < paragraph->m_arrItems.size()); j++)
 				{
-					if ((*jt)->getType() == OOX::et_m_oMath)
+					if (paragraph->m_arrItems[j]->getType() == OOX::et_m_oMath)
 					{
 						res = true;
-                        newXmlString = (*jt)->toXML();
+                        newXmlString = paragraph->m_arrItems[j]->toXML();
 						break;
 					}
-					else if ((*jt)->getType() == OOX::et_m_oMathPara)
+					else if (paragraph->m_arrItems[j]->getType() == OOX::et_m_oMathPara)
 					{
-						OOX::Logic::COMathPara *mathPara = dynamic_cast<OOX::Logic::COMathPara *>(*jt);
+						OOX::Logic::COMathPara *mathPara = dynamic_cast<OOX::Logic::COMathPara *>(paragraph->m_arrItems[j]);
 						
-                        for (std::vector<OOX::WritingElement*>::iterator kt = mathPara->m_arrItems.begin();
-														(mathPara) && (kt != mathPara->m_arrItems.end()); kt++)
+						for (int k = 0; (mathPara) && (k < mathPara->m_arrItems.size()); k++)
 						{
-							if ((*kt)->getType() == OOX::et_m_oMath)
+							if (mathPara->m_arrItems[k]->getType() == OOX::et_m_oMath)
 							{
 								res = true;
-                                newXmlString = (*kt)->toXML();
+                                newXmlString = mathPara->m_arrItems[k]->toXML();
 								break;
 							}
 						}
@@ -500,7 +498,6 @@ namespace DocFileFormat
 			{
 				case Global::msoblipEMF:
 				case Global::msoblipWMF:
-				case Global::msoblipPICT:
 				{
 					MetafilePictBlip* metaBlip = static_cast<MetafilePictBlip*>(oBlipEntry->Blip);
 					if (metaBlip)
@@ -568,9 +565,6 @@ namespace DocFileFormat
 		case Global::msoblipWMF:
 			return std::wstring(L".wmf");
 
-		case Global::msoblipPICT:
-			return std::wstring(L".pcz");
-
 		default:
 			return std::wstring(L".png");
 		}
@@ -605,9 +599,6 @@ 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

@@ -746,7 +746,7 @@ namespace DocFileFormat
 
 					text = FormatUtils::XmlEncode(text);
 
-					if (std::wstring::npos != text.find(L"\n"))
+					if (0 <= text.find(L"\n"))
 					{
 						m_textpath.AppendText(text);
 					}
@@ -756,7 +756,7 @@ namespace DocFileFormat
 			case gtextFont:
 				{
 					std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex.get(), (iter->op)/2);
-					size_t i = font.size();
+					int i = font.size();
 					while (i > 0)
 					{
 						if (font[i-1] != 0) break;
@@ -1287,7 +1287,6 @@ 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));
@@ -1374,9 +1373,6 @@ namespace DocFileFormat
 			case Global::msoblipWMF:
 				return std::wstring( L".wmf" );
 
-			case Global::msoblipPICT:
-				return std::wstring( L".pcz" );
-
 			default:
 				return std::wstring( L".png" );
 		}
@@ -1969,7 +1965,7 @@ namespace DocFileFormat
         {
             int index = (DWORD)val - 0x80000000;
 		
-			if (index >= 0 && index < (int)m_arrGuides.size())
+			if (index >= 0 && index < m_arrGuides.size())
 			{
 				new_val = m_arrGuides[index].param3;
 			}
@@ -2136,7 +2132,7 @@ namespace DocFileFormat
 	
 	void VMLShapeMapping::ApplyPrimitives(DrawingPrimitives * primitives)
 	{
-		size_t index = 0;
+		int index = 0;
 
 		while(true)
 		{
@@ -2148,7 +2144,7 @@ namespace DocFileFormat
 
 	static int currentTextBoxIndex = 1;
 	
-	size_t VMLShapeMapping::ApplyPrimitive(DrawingPrimitives * primitives, size_t index)
+	int VMLShapeMapping::ApplyPrimitive(DrawingPrimitives * primitives, int index)
 	{
 		if (!primitives) return index++;
 		if (index >= primitives->size()) return index++;
@@ -2247,11 +2243,11 @@ namespace DocFileFormat
 			{
 				//strStyle += L"left:"		+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
 				//strStyle += L"top:"		+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
-				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( (int)w.ToPoints()) + L"pt;";
-				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( (int)h.ToPoints()) + L"pt;";
+				strStyle +=	L"width:"		+ FormatUtils::IntToWideString( w.ToPoints()) + L"pt;";
+				strStyle +=	L"height:"		+ FormatUtils::IntToWideString( h.ToPoints()) + L"pt;";
 
-				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( (int)x.ToPoints()) + L"pt;";
-				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( (int)y.ToPoints()) + L"pt;";
+				strStyle += L"margin-left:"	+ FormatUtils::IntToWideString( x.ToPoints()) + L"pt;";
+				strStyle +=	L"margin-top:"	+ FormatUtils::IntToWideString( y.ToPoints()) + L"pt;";
 
 				std::wstring xMargin;
 				std::wstring yMargin;

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -73,7 +73,7 @@ namespace DocFileFormat
 	private:
 
 		void ApplyPrimitives	(DrawingPrimitives	* primitives );
-		size_t  ApplyPrimitive	(DrawingPrimitives	* primitives, size_t index);
+		int  ApplyPrimitive		(DrawingPrimitives	* primitives, int index);
 
 		void WritePrimitiveProps(DrawingPrimitive	* primitive, bool root);
 

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -134,7 +134,7 @@ public:
 			if (position + count > stream->size())
 			{
 				if (position > stream->size())	count = 0;
-				else							count = (unsigned int)(stream->size() - position);
+				else							count = stream->size() - position;
 			}
 			rdBytes = new unsigned char[count];
 		}
@@ -152,7 +152,7 @@ public:
 
 	virtual unsigned long GetPosition() const
 	{
-		return (unsigned long)this->position;
+		return this->position;
 	}
 
 	virtual unsigned long GetSize() const
@@ -161,7 +161,7 @@ public:
 
 		if ( stream != NULL )
 		{
-			size = (unsigned long)stream->size();
+			size = stream->size();
 		}
 
 		return size;
@@ -246,7 +246,7 @@ public:
 	/// The string must have the following structure:
 	/// unsigned char 1-4: Character count (cch)
 	/// unsigned char 5-cch+4:   ANSI characters terminated by \0
-	std::wstring ReadLengthPrefixedAnsiString(unsigned int max_size)
+	std::wstring ReadLengthPrefixedAnsiString(int max_size)
 	{
 		std::wstring result;
 
@@ -257,8 +257,8 @@ public:
 		if (cch > max_size)
 		{
 			//error ... skip to 0
-			unsigned int pos_orinal = GetPosition();
-			unsigned int pos = 0;
+			int pos_orinal = GetPosition();
+			int pos = 0;
 		
 			stringBytes = ReadBytes( max_size, true );
 

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -40,45 +40,8 @@
 #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), 
@@ -92,15 +55,12 @@ 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;
-		
-		bDocumentCodePage	= false;
-		nDocumentCodePage	= ENCODING_WINDOWS_1250;
+		m_pStorage			=	NULL;
+		officeArtContent	=	NULL;
+		bOlderVersion		=	false;
 	}
 
 	WordDocument::~WordDocument()
@@ -135,7 +95,7 @@ namespace DocFileFormat
             return AVS_ERROR_FILEFORMAT;
 		}
 //-----------------------------------------------------------------------------------------------------------------
-		if (m_pStorage->GetStream (L"WordDocument", &WordDocumentStream) == false)
+		if (m_pStorage->GetStream ("WordDocument", &WordDocumentStream) == false)
 		{
 			Clear();
             return AVS_ERROR_FILEFORMAT;
@@ -161,16 +121,16 @@ namespace DocFileFormat
 
 		if (FIB->m_FibBase.fWhichTblStm)
 		{
-			if (!m_pStorage->GetStream (L"1Table", &TableStream))
+			if (!m_pStorage->GetStream ("1Table", &TableStream))
 			{
-				res	=	m_pStorage->GetStream (L"0Table", &TableStream);
+				res	=	m_pStorage->GetStream ("0Table", &TableStream);
 			}
 		}
 		else
 		{
-			if (!m_pStorage->GetStream (L"0Table", &TableStream))
+			if (!m_pStorage->GetStream ("0Table", &TableStream))
 			{
-				res	=	m_pStorage->GetStream (L"1Table", &TableStream);
+				res	=	m_pStorage->GetStream ("1Table", &TableStream);
 			}
 		}
 
@@ -216,8 +176,10 @@ namespace DocFileFormat
 		POLE::Stream			* Summary		= NULL;
 		POLE::Stream			* DocSummary	= NULL;
 		
-		m_pStorage->GetStream (L"SummaryInformation",			&Summary);
-		m_pStorage->GetStream (L"DocumentSummaryInformation",	&DocSummary);
+		m_pStorage->GetStream ("SummaryInformation",			&Summary);
+		m_pStorage->GetStream ("DocumentSummaryInformation",	&DocSummary);
+
+		document_code_page = ENCODING_WINDOWS_1250;
 		
 		if ((Summary) && (Summary->size() > 0))
 		{
@@ -226,10 +188,7 @@ namespace DocFileFormat
 			int document_code_page1 = summary_info.GetCodePage(); //from software last open 
 			
 			if (document_code_page1 > 0)
-			{
-				nDocumentCodePage = document_code_page1;		
-				bDocumentCodePage = true;
-			}
+				document_code_page = document_code_page1;		
 		}
 		if ((DocSummary) && (DocSummary->size() > 0))
 		{
@@ -238,22 +197,16 @@ namespace DocFileFormat
 			int document_code_page2 = doc_summary_info.GetCodePage();
 
 			if (document_code_page2 > 0)
-			{
-				nDocumentCodePage = document_code_page2;
-				bDocumentCodePage = true;
-			}
+				document_code_page = document_code_page2;
 		}
 		if (!bOlderVersion)
-		{
-			nDocumentCodePage = ENCODING_UTF16;
-			bDocumentCodePage = true;
-		}
+			document_code_page = ENCODING_UTF16;
 
-		FIB->m_CodePage =  nDocumentCodePage;
+		FIB->m_CodePage =  document_code_page;
 //-------------------------------------------------------------------------------------------------
 		try
 		{
-			m_pStorage->GetStream (L"Data", &DataStream);
+			m_pStorage->GetStream ("Data", &DataStream);
 		}
 		catch (...)
 		{
@@ -263,7 +216,7 @@ namespace DocFileFormat
 		if (TableStream->size() < 1 && bOlderVersion)
 		{
 			RELEASEOBJECT(TableStream);
-			m_pStorage->GetStream (L"WordDocument", &TableStream);
+			m_pStorage->GetStream ("WordDocument", &TableStream);
 		}
 
 		RevisionAuthorTable	=	new StringTable<WideString>		(TableStream, FIB->m_FibWord97.fcSttbfRMark,		FIB->m_FibWord97.lcbSttbfRMark,			bOlderVersion);
@@ -400,31 +353,6 @@ 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)
 		{
@@ -443,7 +371,7 @@ namespace DocFileFormat
 			WordDocumentStream->read (bytes, cb);
 
 			Text = new std::vector<wchar_t>();
-			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, nDocumentCodePage);
+			FormatUtils::GetSTLCollectionFromBytes<std::vector<wchar_t> >(Text, bytes, cb, document_code_page);
 
 			RELEASEARRAYOBJECTS(bytes);
 		}
@@ -555,11 +483,11 @@ namespace DocFileFormat
 			delete storageOut;
 			return false;
 		}
-		DecryptStream( 0, L"/", storageIn, storageOut, Decryptor);
+		DecryptStream( 0, "/", storageIn, storageOut, Decryptor);
 
 		//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)) 
 		//	{
@@ -586,60 +514,59 @@ namespace DocFileFormat
 		
 		m_pStorage->SetFile(m_sTempDecryptFileName.c_str());
 		
-		if (m_pStorage->GetStream (L"WordDocument", &WordDocumentStream) == false) return false;
+		if (m_pStorage->GetStream ("WordDocument", &WordDocumentStream) == false) return false;
 
 		if (FIB->m_FibBase.fWhichTblStm)
 		{
-			if (!m_pStorage->GetStream (L"1Table", &TableStream))	m_pStorage->GetStream (L"0Table", &TableStream);
+			if (!m_pStorage->GetStream ("1Table", &TableStream))	m_pStorage->GetStream ("0Table", &TableStream);
 		}
 		else
 		{
-			if (!m_pStorage->GetStream (L"0Table", &TableStream))	m_pStorage->GetStream (L"1Table", &TableStream);
+			if (!m_pStorage->GetStream ("0Table", &TableStream))	m_pStorage->GetStream ("1Table", &TableStream);
 		}
 		return true;
 	}
-	void WordDocument::DecryptStream( int level, std::wstring path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
+	void WordDocument::DecryptStream( int level, std::string path, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
 	{
-		std::list<std::wstring> entries, entries_files, entries_dir;
-		entries = storageIn->entries_with_prefix( path );
+		std::list<std::string> entries, entries_sort;
+		entries = storageIn->entries( path );
 		
-		for( std::list<std::wstring>::iterator it = entries.begin(); it != entries.end(); ++it )
+		for( std::list<std::string>::iterator it = entries.begin(); it != entries.end(); it++ )
 		{
-			std::wstring name = *it;
-			std::wstring fullname = path + name;
+			std::string name = *it;
+			std::string fullname = path + name;
 	       
 			if( storageIn->isDirectory( fullname ) )
 			{
-				entries_dir.push_back(name);
+				entries_sort.push_back(name);
 			}
 			else
 			{
-				entries_files.push_front(name);
+				entries_sort.push_front(name);
 			}
 		}	    
-		for( std::list<std::wstring>::iterator it = entries_dir.begin(); it != entries_dir.end(); ++it )
+		for( std::list<std::string>::iterator it = entries_sort.begin(); it != entries_sort.end(); ++it )
 		{
-			std::wstring fullname = path + *it;
+			std::string name = *it;
+			std::string fullname = path + name;
 	       
-			DecryptStream( level + 1, fullname + L"/", storageIn, storageOut, Decryptor );
-
+			if( storageIn->isDirectory( fullname ) )
+			{
+				DecryptStream( level + 1, fullname + "/", storageIn, storageOut, Decryptor );
+			}
+			else
+			{
+				DecryptStream(fullname, storageIn, storageOut, Decryptor );
+			}
 		}    
-	//if (bSortFiles)
-		entries_files.sort();
-
-		for( std::list<std::wstring>::iterator it = entries_files.begin(); it != entries_files.end(); ++it )
-		{
-			std::wstring fullname = path + *it;
-			DecryptStream(fullname, storageIn, storageOut, Decryptor );
-		}  
 	}
-	bool WordDocument::DecryptStream(std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
+	bool WordDocument::DecryptStream(std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor)
 	{
 		POLE::Stream *stream = new POLE::Stream(storageIn, streamName);
 		if (!stream) return false;
 
 		stream->seek(0);
-		POLE::uint64 size_stream = stream->size();
+		int size_stream = stream->size();
 		
 		POLE::Stream *streamNew = new POLE::Stream(storageOut, streamName, true, size_stream);
 		if (!streamNew) return false;
@@ -650,7 +577,7 @@ namespace DocFileFormat
 		unsigned char* data_store = NULL;
 		int size_data_store = 0;		
 		
-		if ( std::wstring::npos != streamName.find(L"WordDocument") )
+		if ( std::wstring::npos != streamName.find("WordDocument") )
 		{
 			size_data_store = 68;
 			data_store = new unsigned char[size_data_store];
@@ -659,10 +586,8 @@ namespace DocFileFormat
 		if (data_store)
 			memcpy(data_store, data_stream, size_data_store);
 
-		size_t			size_block	= 0x200;
-		unsigned long	block		= 0;
-
-		for (POLE::uint64 pos = 0; pos < size_stream; pos += size_block, block++)
+		int size_block = 0x200;
+		for (int pos = 0, block = 0 ; pos < size_stream; pos += size_block, block++)
 		{
 			if (pos + size_block > size_stream)
 				size_block = size_stream - pos;

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -69,6 +69,7 @@ namespace DocFileFormat
 {
 	class WordDocument: public IVisitable
 	{
+		/*Mapping classes with direct access to the Word Document.*/
 		friend class FootnotesMapping;
 		friend class EndnotesMapping;
         friend class CommentsMapping;
@@ -97,8 +98,7 @@ namespace DocFileFormat
 		long LoadDocument (const std::wstring & fileName, const std::wstring & password);
 
 		bool	bOlderVersion;
-		int		nDocumentCodePage;
-		bool	bDocumentCodePage;
+		int		document_code_page;
 		
 		inline StructuredStorageReader* GetStorage() const
 		{
@@ -107,8 +107,8 @@ namespace DocFileFormat
 	private:
 		bool DecryptOfficeFile	(CRYPT::Decryptor* Decryptor);
 		
-		bool DecryptStream		(std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
-		void DecryptStream		(int level, std::wstring streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
+		bool DecryptStream		(std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
+		void DecryptStream		(int level, std::string streamName, POLE::Storage * storageIn, POLE::Storage * storageOut, CRYPT::Decryptor* Decryptor);
 		
 		inline OfficeArtContent* GetOfficeArt ()
 		{

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -71,7 +71,7 @@ namespace ImageHelper
 		__BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
 		if (!header) return result;
 
-		result = Global::msoblipDIB;
+		result == Global::msoblipDIB;
 
 		if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40)
 		{
@@ -185,7 +185,7 @@ namespace DocFileFormat
 		std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
 		NSDirectory::CreateDirectory( pathWord );
 
-		if (bMacros && docFile->GetStorage()->isDirectory(L"Macros"))
+		if (bMacros && docFile->GetStorage()->isDirectory("Macros"))
 		{
 			std::wstring sVbaProjectFile = pathWord + FILE_SEPARATOR_STR + L"vbaProject.bin";
 
@@ -193,7 +193,7 @@ namespace DocFileFormat
 
 			if ((storageVbaProject) && (storageVbaProject->open(true, true)))
 			{			
-				docFile->GetStorage()->copy(0, L"Macros/", storageVbaProject, false);
+				docFile->GetStorage()->copy(0, "Macros/", storageVbaProject, false);
 
 				storageVbaProject->close();
 				delete storageVbaProject;

ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro

@@ -94,7 +94,6 @@ SOURCES += \
     ../../DocDocxConverter/VMLShapeTypeMapping.cpp \
     ../../DocDocxConverter/WordDocument.cpp \
     ../../DocDocxConverter/WordprocessingDocument.cpp \
-    ../../DocDocxConverter/FormFieldData.cpp \
     ../../DocDocxConverter/OfficeDrawing/Record.cpp \
     ../../DocDocxConverter/OfficeDrawing/RecordFactory.cpp \
     ../../DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp

ASCOfficeDocFile/DocFormatLib/Linux/docformatlib_converter.cpp

@@ -74,7 +74,6 @@
 #include "../../DocDocxConverter/VMLShapeTypeMapping.cpp"
 #include "../../DocDocxConverter/WordDocument.cpp"
 #include "../../DocDocxConverter/WordprocessingDocument.cpp"
-#include "../../DocDocxConverter/FormFieldData.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/Record.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/RecordFactory.cpp"
 #include "../../DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp"

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj

@@ -47,7 +47,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -479,14 +479,6 @@
 				RelativePath="..\..\DocDocxConverter\FormattedDiskPagePAPX.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FormFieldData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FormFieldData.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\Global.h"
 				>
@@ -1098,10 +1090,6 @@
 					RelativePath="..\..\DocDocxConverter\FootnotesMapping.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\DocDocxConverter\FormFieldDataMapping.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\DocDocxConverter\HeaderMapping.cpp"
 					>

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -39,7 +39,6 @@
 
 #pragma comment(lib,"Shell32.lib")	
 #pragma comment(lib,"Advapi32.lib")
-#pragma comment(lib,"Rpcrt4.lib")
 
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -48,7 +48,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Urlmon.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				IgnoreEmbeddedIDL="true"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -392,14 +392,6 @@
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalOptions="/bigobj"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<File
@@ -450,10 +442,6 @@
 			RelativePath="..\..\Common\OfficeFileFormatChecker2.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\Common\3dParty\pole\pole.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

@@ -55,9 +55,7 @@ namespace Writers
 			oFile.CreateFileW(filePath.GetPath());			
                 oFile.WriteStringUTF8( std::wstring(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>")));
                 oFile.WriteStringUTF8( std::wstring(_T("<w:document \
-xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
-xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
+xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
 xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
 xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
 xmlns:v=\"urn:schemas-microsoft-com:vml\" \

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -60,44 +60,10 @@ namespace Writers
         std::wstring			rId;
 		SimpleTypes::EHdrFtr	eType;
 	};
-    static  std::wstring g_string_hdr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-<w:hdr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
-xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
-xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
-xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
-xmlns:v=\"urn:schemas-microsoft-com:vml\" \
-xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
-xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
-xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
-xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
-xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
-xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
-xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
-xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
-xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
-xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
-mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_hdr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:hdr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_hdr_End = _T("</w:hdr>");
 
-    static  std::wstring g_string_ftr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-<w:ftr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
-xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
-xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
-xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
-xmlns:v=\"urn:schemas-microsoft-com:vml\" \
-xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
-xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
-xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
-xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
-xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
-xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
-xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
-xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
-xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
-xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
-mc:Ignorable=\"w14 wp14\">");
+    static  std::wstring g_string_ftr_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:ftr xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">");
     static  std::wstring g_string_ftr_End = _T("</w:ftr>");
 
     static  std::wstring g_string_footnotes_Start = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:footnotes xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" mc:Ignorable=\"w14 wp14\">");

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -355,13 +355,10 @@ class Tab
 public:
 	BYTE Val;
 	double Pos;
-	BYTE Leader;
-	bool bLeader;
 	Tab()
 	{
 		Val = shd_Nil;
 		Pos = 0;
-		bLeader = false;
 	}
 };
 class Tabs
@@ -372,7 +369,7 @@ public:
 class rPr
 {
 private:
-    boost::unordered_map<std::wstring, int>& m_mapFonts;
+    std::map<std::wstring, int>& m_mapFonts;
 public:
 	bool Bold;
 	bool Italic;
@@ -445,7 +442,7 @@ public:
 
 	bool bDoNotWriteNullProp;
 public:
-    rPr(boost::unordered_map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
+    rPr(std::map<std::wstring, int>& mapFonts) : m_mapFonts(mapFonts)
 	{
 		Reset();
 
@@ -1700,7 +1697,7 @@ public:
             std::vector<std::wstring> arSplit;
             boost::algorithm::split(arSplit, pComment->UserName, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
 
-            for (size_t i = 0; i < arSplit.size(); i++)
+            for (int i = 0; i < arSplit.size(); i++)
             {
                 sInitials += arSplit[i][0];
             }
@@ -1736,7 +1733,7 @@ public:
 
             bool bFirst = true;
 			int nPrevIndex = 0;
-            for (int i = 0; i < (int)sText.length(); i++)
+            for(size_t i = 0; i < sText.length(); i++)
 			{
                 wchar_t cToken = sText[i];
 				if('\n' == cToken)
@@ -1787,8 +1784,8 @@ w15:paraIdParent=\"" + pComment->m_sParaIdParent + L"\" w15:done=\"" + sDone + L
 };
 class CComments
 {
-    boost::unordered_map<int, CComment*>          m_mapComments;
-    boost::unordered_map<std::wstring, CComment*> m_mapAuthors;
+	std::map<int, CComment*> m_mapComments;
+    std::map<std::wstring, CComment*> m_mapAuthors;
 public:
 	IdCounter m_oFormatIdCounter;
 	IdCounter m_oParaIdCounter;
@@ -1798,7 +1795,7 @@ public:
 	}
 	~CComments()
 	{
-        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
 			delete it->second;
 		}
@@ -1822,7 +1819,7 @@ public:
 	CComment* get(int nInd)
 	{
 		CComment* pRes = NULL;
-        boost::unordered_map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
+		std::map<int, CComment*>::const_iterator pair = m_mapComments.find(nInd);
 		if(m_mapComments.end() != pair)
 			pRes = pair->second;
 		return pRes;
@@ -1834,7 +1831,7 @@ public:
     std::wstring writeContent()
 	{
         std::wstring sRes;
-        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContent));
 		}
@@ -1843,7 +1840,7 @@ public:
     std::wstring writeContentExt()
 	{
         std::wstring sRes;
-        for (boost::unordered_map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
+		for (std::map<int, CComment*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 		{
             sRes += (it->second->writeTemplates(CComment::writeContentExt));
 		}
@@ -1852,7 +1849,7 @@ public:
     std::wstring writePeople()
 	{
         std::wstring sRes;
-        for (boost::unordered_map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
+        for (std::map<std::wstring, CComment*>::const_iterator it = m_mapAuthors.begin(); it != m_mapAuthors.end(); ++it)
 		{
             sRes += (it->second->writePeople(it->second));
 		}
@@ -2340,7 +2337,7 @@ public:
 	{
         return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty();
 	}
-	std::wstring Write()
+    std::wstring Write(bool bBandSize, bool bLayout)
 	{
         std::wstring sRes;
         sRes += L"<w:tblPr>";
@@ -2364,8 +2361,13 @@ public:
             sRes += (TableBorders);
         if(false == Shd.empty())
             sRes += (Shd);
-		if(false == Layout.empty())
-			sRes += (Layout);
+		if(bLayout)
+		{
+            if(false == Layout.empty())
+                sRes += (Layout);
+			else if(g_nCurFormatVersion < 4)
+                sRes += L"<w:tblLayout w:type=\"fixed\"/>";
+		}
         if(false == TableCellMar.empty())
             sRes += (TableCellMar);
         if(false == Look.empty())
@@ -2753,7 +2755,7 @@ public:
 				}
 				if(NULL != tblPr)
 				{
-					pCStringWriter->WriteString(tblPr->Write());
+					pCStringWriter->WriteString(tblPr->Write(false, true));
 				}
                 if(NULL != tblGridChange)
                 {

ASCOfficeDocxFile2/BinReader/Readers.cpp

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -37,17 +37,7 @@
 
 #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"
@@ -71,13 +61,6 @@ enum ETblStyleOverrideType
 	tblstyleoverridetypeSwCell     = 11,
 	tblstyleoverridetypeWholeTable = 12
 };
-
-struct RowHeight
-{
-	unsigned char	HRule	= 0;
-	long			nHeight	= 0;
-};
-
 class SdtWraper
 {
 public:
@@ -302,7 +285,7 @@ public:
 	}
 
     int Read ();
-};
+ };
 
 class Binary_HdrFtrTableReader : public Binary_CommonReader<Binary_HdrFtrTableReader>
 {
@@ -844,23 +827,7 @@ public:
                             case g_tabtype_clear:   sVal = L"clear";   break;
                             default:                sVal = L"left";    break;
 						}
-						pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"");
-						if (oTab.bLeader)
-						{
-							std::wstring sLeader;
-							switch(oTab.Leader)
-							{
-							case SimpleTypes::tabtlcDot        : sLeader = (L"dot");break;
-							case SimpleTypes::tabtlcHeavy      : sLeader = (L"heavy");break;
-							case SimpleTypes::tabtlcHyphen     : sLeader = (L"hyphen");break;
-							case SimpleTypes::tabtlcMiddleDot  : sLeader = (L"middleDot");break;
-							case SimpleTypes::tabtlcNone       : sLeader = (L"none");break;
-							case SimpleTypes::tabtlcUnderscore : sLeader = (L"underscore");break;
-							default                : sLeader = (L"none");break;
-							}
-							pCStringWriter->WriteString(L" w:leader=\"" + sLeader + L"\"");
-						}
-						pCStringWriter->WriteString(L"/>");
+                        pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
 					}
                     pCStringWriter->WriteString(std::wstring(L"</w:tabs>"));
 				}				
@@ -918,11 +885,6 @@ public:
 				pCStringWriter->WriteString(oSectPr.Write());
                 pCStringWriter->WriteString(std::wstring(_T("</w:sectPr>")));
             }break;
-		case c_oSerProp_pPrType::outlineLvl:
-			{
-				long outlineLvl = m_oBufferedStream.GetLong();
-				pCStringWriter->WriteString(L"<w:outlineLvl w:val=\"" + std::to_wstring(outlineLvl) + L"\"/>");
-			}break;
 		default:
 			res = c_oSerConstants::ReadUnknown;
 			break;
@@ -1041,11 +1003,6 @@ public:
 			poTabItem->Val = m_oBufferedStream.GetUChar();
 		else if(c_oSerProp_pPrType::Tab_Item_Pos == type)
 			poTabItem->Pos = m_oBufferedStream.GetDouble();
-		else if(c_oSerProp_pPrType::Tab_Item_Leader == type)
-		{
-			poTabItem->bLeader = true;
-			poTabItem->Leader = m_oBufferedStream.GetUChar();
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -2128,17 +2085,7 @@ public:
 		}
 		else if( c_oSerProp_rowPrType::Height == type )
 		{
-			RowHeight val;
-			res = Read2(length, &Binary_tblPrReader::ReadHeight, this, &val);
-           
-			pCStringWriter->WriteString(L"<w:trHeight w:val=\"" + std::to_wstring(val.nHeight) + L"\"");
-			
-			switch (val.HRule)
-			{
-				case 1: pCStringWriter->WriteString(L" w:hRule=\"auto\"");	break;
-				case 2: pCStringWriter->WriteString(L" w:hRule=\"exact\"");	break;
-			}
-			pCStringWriter->WriteString(L"/>");
+			res = Read2(length, &Binary_tblPrReader::ReadHeight, this, poResult);
 		}
 		else if( c_oSerProp_rowPrType::TableHeader == type )
 		{
@@ -2207,17 +2154,17 @@ public:
 	int ReadHeight(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
-
-		RowHeight* pHeight = static_cast<RowHeight*>(poResult);
-		
-		if( c_oSerProp_rowPrType::Height_Rule == type )
+		XmlUtils::CStringWriter* pCStringWriter = static_cast<XmlUtils::CStringWriter*>(poResult);
+		/*if( c_oSerProp_rowPrType::Height_Rule == type )
 		{
-			pHeight->HRule = m_oBufferedStream.GetUChar();
+		Height.HRule = this.stream.GetUChar();
 		}
-		else if( c_oSerProp_rowPrType::Height_Value == type )
+		else */if( c_oSerProp_rowPrType::Height_Value == type )
 		{
 			double dHeight = m_oBufferedStream.GetDouble();
-			pHeight->nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight);
+			long nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight);
+
+            pCStringWriter->WriteString(L"<w:trHeight w:val=\"" + std::to_wstring(nHeight) + L"\"/>");
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -2853,7 +2800,7 @@ public:
 		{
 			CWiterTblPr oWiterTblPr;
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
-			odocStyle->TablePr = oWiterTblPr.Write();
+			odocStyle->TablePr = oWiterTblPr.Write(true, false);
 		}
 		else if(c_oSer_sts::Style_RowPr == type)
 		{
@@ -2949,7 +2896,7 @@ public:
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
 
             if(false == oWiterTblPr.IsEmpty())
-				ptblStylePr->Writer.WriteString(oWiterTblPr.Write());
+				ptblStylePr->Writer.WriteString(oWiterTblPr.Write(false, false));
 		}
 		else if(c_oSerProp_tblStylePrType::TrPr == type)
 		{
@@ -2991,7 +2938,7 @@ public:
 	int Read()
 	{
 		return ReadTable(&Binary_OtherTableReader::ReadOtherContent, this);
-	}
+	};
 	int ReadOtherContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -3001,7 +2948,7 @@ public:
 		}
 		else if(c_oSerOtherTableTypes::DocxTheme == type)
 		{
-			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme(NULL);
+			smart_ptr<PPTX::Theme> pTheme = new PPTX::Theme();
 			pTheme->fromPPTY(&m_oBufferedStream);
 			NSBinPptxRW::CXmlWriter xmlWriter;
 			pTheme->toXmlWriter(&xmlWriter);
@@ -3010,7 +2957,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	}
+	};
 	int ReadImageMapContent(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -3053,7 +3000,7 @@ public:
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
-	}
+	};
 };
 class Binary_CommentsTableReader : public Binary_CommonReader<Binary_CommentsTableReader>
 {
@@ -3761,18 +3708,6 @@ public:
             res = Read2(length, &Binary_DocumentTableReader::Read_Background, this, &oBackground);
             m_oDocumentWriter.m_oBackground.WriteString(oBackground.Write());
         }
-		else if ( c_oSerParType::BookmarkStart == type )
-		{
-			OOX::Logic::CBookmarkStart oBookmarkStart;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
-			m_oDocumentWriter.m_oContent.WriteString(oBookmarkStart.toXML());
-		}
-		else if ( c_oSerParType::BookmarkEnd == type )
-		{
-			OOX::Logic::CBookmarkEnd oBookmarkEnd;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
-			m_oDocumentWriter.m_oContent.WriteString(oBookmarkEnd.toXML());
-		}
 		else if(c_oSerParType::JsaProject == type)
 		{
 			BYTE* pData = m_oBufferedStream.GetPointer(length);
@@ -3926,18 +3861,6 @@ public:
 			SdtWraper oSdt(1);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
-		else if ( c_oSerParType::BookmarkStart == type )
-		{
-			OOX::Logic::CBookmarkStart oBookmarkStart;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
-			m_oDocumentWriter.m_oContent.WriteString(oBookmarkStart.toXML());
-		}
-		else if ( c_oSerParType::BookmarkEnd == type )
-		{
-			OOX::Logic::CBookmarkEnd oBookmarkEnd;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
-			m_oDocumentWriter.m_oContent.WriteString(oBookmarkEnd.toXML());
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -4095,19 +4018,6 @@ public:
 			res = c_oSerConstants::ReadUnknown;
 		return res;
 	}
-	int ReadFldChar(BYTE type, long length, void* poResult)
-	{
-		int res = c_oSerConstants::ReadOk;
-		OOX::Logic::CFldChar* pFldChar = static_cast<OOX::Logic::CFldChar*>(poResult);
-		if ( c_oSer_FldSimpleType::CharType == type )
-		{
-			pFldChar->m_oFldCharType.Init();
-			pFldChar->m_oFldCharType->SetValue((SimpleTypes::EFldCharType)m_oBufferedStream.GetUChar());
-		}
-		else
-			res = c_oSerConstants::ReadUnknown;
-		return res;
-	}
 	int ReadFldSimple(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
@@ -4333,57 +4243,6 @@ public:
 			res = c_oSerConstants::ReadUnknown;
 		return res;
 	}
-	int ReadBookmarkStart(BYTE type, long length, void* poResult)
-	{
-		int res = c_oSerConstants::ReadOk;
-		OOX::Logic::CBookmarkStart* pBookmarkStart = static_cast<OOX::Logic::CBookmarkStart*>(poResult);
-		if ( c_oSerBookmark::Id == type )
-		{
-			pBookmarkStart->m_oId.Init();
-			pBookmarkStart->m_oId->SetValue(m_oBufferedStream.GetLong());
-		}
-		else if ( c_oSerBookmark::Name == type )
-		{
-			pBookmarkStart->m_sName.Init();
-			pBookmarkStart->m_sName->append(m_oBufferedStream.GetString3(length));
-		}
-		else if ( c_oSerBookmark::DisplacedByCustomXml == type )
-		{
-			pBookmarkStart->m_oDisplacedByCustomXml.Init();
-			pBookmarkStart->m_oDisplacedByCustomXml->SetValue((SimpleTypes::EDisplacedByCustomXml)m_oBufferedStream.GetUChar());
-		}
-		else if ( c_oSerBookmark::ColFirst == type )
-		{
-			pBookmarkStart->m_oColFirst.Init();
-			pBookmarkStart->m_oColFirst->SetValue(m_oBufferedStream.GetLong());
-		}
-		else if ( c_oSerBookmark::ColLast == type )
-		{
-			pBookmarkStart->m_oColLast.Init();
-			pBookmarkStart->m_oColLast->SetValue(m_oBufferedStream.GetLong());
-		}
-		else
-			res = c_oSerConstants::ReadUnknown;
-		return res;
-	}
-	int ReadBookmarkEnd(BYTE type, long length, void* poResult)
-	{
-		int res = c_oSerConstants::ReadOk;
-		OOX::Logic::CBookmarkEnd* pBookmarkEnd = static_cast<OOX::Logic::CBookmarkEnd*>(poResult);
-		if ( c_oSerBookmark::Id == type )
-		{
-			pBookmarkEnd->m_oId.Init();
-			pBookmarkEnd->m_oId->SetValue(m_oBufferedStream.GetLong());
-		}
-		else if ( c_oSerBookmark::DisplacedByCustomXml == type )
-		{
-			pBookmarkEnd->m_oDisplacedByCustomXml.Init();
-			pBookmarkEnd->m_oDisplacedByCustomXml->SetValue((SimpleTypes::EDisplacedByCustomXml)m_oBufferedStream.GetUChar());
-		}
-		else
-			res = c_oSerConstants::ReadUnknown;
-		return res;
-	}
 
 	int ReadHyperlink(BYTE type, long length, void* poResult)
 	{		
@@ -4577,18 +4436,6 @@ public:
 			res = Read1(length, &Binary_DocumentTableReader::ReadMathSSup, this, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:sSup>")));
 		}
-		else if ( c_oSer_OMathContentType::BookmarkStart == type )
-		{
-			OOX::Logic::CBookmarkStart oBookmarkStart;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
-			GetRunStringWriter().WriteString(oBookmarkStart.toXML());
-		}
-		else if ( c_oSer_OMathContentType::BookmarkEnd == type )
-		{
-			OOX::Logic::CBookmarkEnd oBookmarkEnd;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
-			GetRunStringWriter().WriteString(oBookmarkEnd.toXML());
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -6797,7 +6644,7 @@ public:
 			//сбрасываем Shd
             oBinary_tblPrReader.m_sCurTableShd.clear();
 		}
-		else if(c_oSerRunType::fldstart_deprecated == type)
+		else if(c_oSerRunType::fldstart == type)
 		{
             std::wstring sField(m_oBufferedStream.GetString3(length));
 			sField = XmlUtils::EncodeXmlString(sField);
@@ -6811,7 +6658,7 @@ public:
 				m_oCur_rPr.Write(&GetRunStringWriter());
             GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"separate\"/>")));
 		}
-		else if(c_oSerRunType::fldend_deprecated == type)
+		else if(c_oSerRunType::fldend == type)
 		{
             GetRunStringWriter().WriteString(std::wstring(_T("<w:fldChar w:fldCharType=\"end\"/>")));
 		}
@@ -6860,28 +6707,6 @@ public:
 			res = Read1(length, &Binary_DocumentTableReader::ReadEndnoteRef, this, &oEndnoteRef);
 			GetRunStringWriter().WriteString(oEndnoteRef.toXML());
 		}
-		else if ( c_oSerRunType::fldChar == type)
-		{
-			OOX::Logic::CFldChar oFldChar;
-			res = Read1(length, &Binary_DocumentTableReader::ReadFldChar, this, &oFldChar);
-			GetRunStringWriter().WriteString(oFldChar.toXML());
-		}
-		else if ( c_oSerRunType::instrText == type)
-		{
-			GetRunStringWriter().WriteString(std::wstring(_T("<w:instrText xml:space=\"preserve\">")));
-			std::wstring sText(m_oBufferedStream.GetString3(length));
-			sText = XmlUtils::EncodeXmlString(sText);
-			GetRunStringWriter().WriteString(sText);
-			GetRunStringWriter().WriteString(std::wstring(_T("</w:instrText>")));
-		}
-		else if ( c_oSerRunType::delInstrText == type)
-		{
-			GetRunStringWriter().WriteString(std::wstring(_T("<w:delInstrText xml:space=\"preserve\">")));
-			std::wstring sText(m_oBufferedStream.GetString3(length));
-			sText = XmlUtils::EncodeXmlString(sText);
-			GetRunStringWriter().WriteString(sText);
-			GetRunStringWriter().WriteString(std::wstring(_T("</w:delInstrText>")));
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -6980,7 +6805,7 @@ public:
 		{
 			CWiterTblPr oWiterTblPr;
 			oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
-			pCStringWriter->WriteString(oWiterTblPr.Write());
+			pCStringWriter->WriteString(oWiterTblPr.Write(false, true));
 		}
 		else if( c_oSerDocTableType::tblGrid == type )
 		{
@@ -7052,18 +6877,6 @@ public:
 			SdtWraper oSdt(2);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
-		else if (c_oSerDocTableType::BookmarkStart == type)
-		{
-			OOX::Logic::CBookmarkStart oBookmarkStart;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
-			pCStringWriter->WriteString(oBookmarkStart.toXML());
-		}
-		else if (c_oSerDocTableType::BookmarkEnd == type)
-		{
-			OOX::Logic::CBookmarkEnd oBookmarkEnd;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
-			pCStringWriter->WriteString(oBookmarkEnd.toXML());
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -7101,18 +6914,6 @@ public:
 			SdtWraper oSdt(3);
 			res = Read1(length, &Binary_DocumentTableReader::ReadSdt, this, &oSdt);
 		}
-		else if (c_oSerDocTableType::BookmarkStart == type)
-		{
-			OOX::Logic::CBookmarkStart oBookmarkStart;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkStart, this, &oBookmarkStart);
-			pCStringWriter->WriteString(oBookmarkStart.toXML());
-		}
-		else if (c_oSerDocTableType::BookmarkEnd == type)
-		{
-			OOX::Logic::CBookmarkEnd oBookmarkEnd;
-			res = Read1(length, &Binary_DocumentTableReader::ReadBookmarkEnd, this, &oBookmarkEnd);
-			pCStringWriter->WriteString(oBookmarkEnd.toXML());
-		}
 		else
 			res = c_oSerConstants::ReadUnknown;
 		return res;
@@ -7268,7 +7069,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(NULL);
+				OOX::Spreadsheet::CChartSpace* pChartSpace = new OOX::Spreadsheet::CChartSpace();
 				oBinaryChartReader.ReadCT_ChartSpace(length, &pChartSpace->m_oChartSpace);
 
 				//save xlsx

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

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

@@ -344,9 +344,7 @@ extern int g_nCurFormatVersion;
 		FramePr = 30,
 		SectPr = 31,
 		numPr_Ins =  32,
-		pPrChange = 33,
-		outlineLvl = 34,
-		Tab_Item_Leader = 35
+		pPrChange = 33
 	};}
 	namespace c_oSerProp_rPrType{enum c_oSerProp_rPrType
 	{
@@ -477,10 +475,7 @@ extern int g_nCurFormatVersion;
 		MoveFromRangeEnd = 19,
 		MoveToRangeStart = 20,
 		MoveToRangeEnd = 21,
-		JsaProject = 22,
-		BookmarkStart = 23,
-		BookmarkEnd = 24
-
+		JsaProject = 22
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{
@@ -495,9 +490,7 @@ extern int g_nCurFormatVersion;
 		Cell_Pr =  7,
 		Cell_Content =  8,
 		tblGridChange = 9,
-		Sdt = 10,
-		BookmarkStart = 11,
-		BookmarkEnd = 12
+		Sdt = 10
 	};}
 	namespace c_oSerRunType{enum c_oSerRunType
 	{
@@ -510,8 +503,8 @@ extern int g_nCurFormatVersion;
 		image = 6,
 		table = 7,
 		Content = 8,
-		fldstart_deprecated = 9,
-		fldend_deprecated = 10,
+		fldstart = 9,
+		fldend = 10,
 		CommentReference = 11,
 		pptxDrawing = 12,
         object = 14,
@@ -528,10 +521,7 @@ extern int g_nCurFormatVersion;
 		endnoteRef = 25,
 		footnoteReference = 26,
 		endnoteReference = 27,
-		arPr = 28,
-		fldChar = 29,
-		instrText = 30,
-		delInstrText = 31
+		arPr = 28
 	};}
 	namespace c_oSerVbaProjectTypes{enum c_oSerVbaProjectType
 	{
@@ -906,9 +896,7 @@ extern int g_nCurFormatVersion;
 		Ins = 62,
 		Del = 63,
 		columnbreak = 64,
-		ARPr = 65,
-		BookmarkStart = 66,
-		BookmarkEnd = 67
+		ARPr = 65
 	};}
 	namespace c_oSer_FramePrType{ enum c_oSer_FramePrType
 	{		
@@ -941,8 +929,7 @@ extern int g_nCurFormatVersion;
 	{
 		Content = 0,
 		Instr = 1,
-		FFData = 2,
-		CharType = 3
+		FFData = 2
 	};}
 	namespace c_oSer_ColorThemeType{ enum c_oSer_ColorThemeType
 	{
@@ -1113,14 +1100,6 @@ extern int g_nCurFormatVersion;
 		Name = 6,
 		UserId = 7
 	};}
-	namespace c_oSerBookmark{enum c_oSerBookmark
-	{
-		Id = 0,
-		Name = 1,
-		DisplacedByCustomXml = 2,
-		ColFirst = 3,
-		ColLast = 4
-	};}
 }
 
 #endif	// #ifndef DOCX_BIN_READER_WRITER_DEFINES

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -32,12 +32,7 @@
 #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";
@@ -132,11 +127,10 @@ 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;
 			}
@@ -146,34 +140,28 @@ namespace BinXlsxRW{
 	void ChartWriter::toXlsx(OOX::Spreadsheet::CXlsx& oXlsx)
 	{
 		std::vector<std::wstring> aSharedStrings;
-		
-		oXlsx.CreateWorkbook();
-		oXlsx.m_pWorkbook->m_oSheets.Init();
-
+		//Sheet
+		OOX::Spreadsheet::CWorkbook* pWorkbook = oXlsx.CreateWorkbook();
+		pWorkbook->m_oSheets.Init();
+		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets = oXlsx.GetWorksheets();
 		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;
-			
-			//find or generate black worksheet
-			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(oXlsx.m_arWorksheets, oXlsx.m_mapWorksheets, sSheetName);
-			//fill data to worksheet
+			OOX::Spreadsheet::CWorksheet* pWorksheet = toXlsxGetSheet(mapWorksheets, sSheetName);
 			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 = oXlsx.m_pWorkbook->Add(oWorksheetFile);
+			const OOX::RId oRId = pWorkbook->Add(oWorksheetFile);
 			pSheet->m_oRid.Init();
 			pSheet->m_oRid->SetValue(oRId.get());
-			
-			oXlsx.m_pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
+			pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
+			mapWorksheets[pSheet->m_oName.get()] = pWorksheet;
 
 			if(NULL == pFirstWorksheet)
 			{
@@ -182,7 +170,7 @@ namespace BinXlsxRW{
 		}
 
 		//SharedStrings
-		oXlsx.CreateSharedStrings();
+		OOX::Spreadsheet::CSharedStrings* pSharedStrings = oXlsx.CreateSharedStrings();
 		for(size_t i = 0; i < aSharedStrings.size(); ++i)
 		{
 			OOX::Spreadsheet::CText* pText = new OOX::Spreadsheet::CText();
@@ -194,35 +182,33 @@ namespace BinXlsxRW{
 			}
 			OOX::Spreadsheet::CSi* pSi = new OOX::Spreadsheet::CSi();
 			pSi->m_arrItems.push_back(pText);
-			oXlsx.m_pSharedStrings->AddSi(pSi);
+			pSharedStrings->m_arrItems.push_back(pSi);
 		}
-		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);
+		pSharedStrings->m_oCount.Init();
+		pSharedStrings->m_oCount->SetValue(pSharedStrings->m_arrItems.size());
+		pSharedStrings->m_oUniqueCount.Init();
+		pSharedStrings->m_oUniqueCount->SetValue(pSharedStrings->m_arrItems.size());
 		//Styles
-		oXlsx.CreateStyles();
-		oXlsx.m_pStyles->m_oCellXfs.Init();
+		OOX::Spreadsheet::CStyles* pStyles = oXlsx.CreateStyles();
+		pStyles->m_oCellXfs.Init();
 		for(size_t i = 0; i < m_aXfs.size(); ++i)
 		{
-			oXlsx.m_pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
+			pStyles->m_oCellXfs->m_arrItems.push_back(m_aXfs[i]);
 		}
-		oXlsx.m_pStyles->m_oNumFmts.Init();
-
-        for (boost::unordered_map<std::wstring, int>::iterator it = m_mapFormats.begin(); it != m_mapFormats.end(); ++it)
+		pStyles->m_oNumFmts.Init();
+		for (std::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);
-			oXlsx.m_pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
+			pStyles->m_oNumFmts->m_arrItems.push_back(pNumFmt);
 		}
-		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());
-		
+		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());
 		OOX::Spreadsheet::CDxf* pDxf = new OOX::Spreadsheet::CDxf();
 		pDxf->m_oBorder.Init();
 		pDxf->m_oBorder->m_oStart.Init();
@@ -249,16 +235,15 @@ 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);
-		
-		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());
+		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());
 		//Table
 		//todo table в случае нескольких sheet или если серии разнесены по sheet
 		if(m_aTableNames.size() > 0)
 		{
-			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile(NULL);
+			OOX::Spreadsheet::CTableFile* pTable = new OOX::Spreadsheet::CTableFile();
 			pTable->m_oTable.Init();
 			pTable->m_oTable->m_oDisplayName.Init();
 			pTable->m_oTable->m_oDisplayName->append(L"Table1");
@@ -301,11 +286,9 @@ 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();
@@ -475,22 +458,18 @@ 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)
 					{
@@ -503,14 +482,13 @@ namespace BinXlsxRW{
 			}
 		}
 	}
-	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* ChartWriter::toXlsxGetSheet(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 pFind = mapWorksheets.find(sName);
-
-        if (pFind == mapWorksheets.end())
+		std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>::const_iterator it = mapWorksheets.find(sName);
+		if (it == mapWorksheets.end())
 		{
-			pWorksheet = new OOX::Spreadsheet::CWorksheet(NULL);
+			pWorksheet = new OOX::Spreadsheet::CWorksheet();
 			pWorksheet->m_oSheetFormatPr.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight.Init();
 			pWorksheet->m_oSheetFormatPr->m_oDefaultRowHeight->SetValue(15);
@@ -530,48 +508,39 @@ namespace BinXlsxRW{
 			pWorksheet->m_oPageMargins->m_oFooter->FromInches(0.3);
 
 			mapWorksheets[sName] = pWorksheet;
-			arWorksheets.push_back(pWorksheet);
 		}
 		else
 		{
-			pWorksheet = pFind->second;
+			pWorksheet = it->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())
 				{
@@ -619,24 +588,22 @@ 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
@@ -655,12 +622,10 @@ 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();
-
-            boost::unordered_map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
+			std::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,9 +33,8 @@
 #define CHART_WRITER
 
 #include <string>
-#include <vector>
 #include <map>
-#include <boost/unordered_map.hpp>
+#include <vector>
 
 namespace OOX
 {
@@ -60,26 +59,22 @@ namespace BinXlsxRW {
 	class ChartWriter
 	{
 	public:
-        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;
+		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;
 		int m_nCol1;
 		int m_nRow2;
 		int m_nCol2;
-
-        ChartWriter();
+	public:
+		ChartWriter();
 		~ChartWriter();
 		void toXlsx(OOX::Spreadsheet::CXlsx& oXlsx);
 		void parseChart(const OOX::Spreadsheet::CT_Chart* pChart);
-
-    private:
-		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(std::vector<OOX::Spreadsheet::CWorksheet*>& arWorksheets, std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>& mapWorksheets, const std::wstring& sName);
+	private:
+		OOX::Spreadsheet::CWorksheet* toXlsxGetSheet(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,9 +39,6 @@
 #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()
@@ -50,7 +47,7 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
 	m_pCurFileWriter	= NULL;
 
 	m_bIsNoBase64Save	= false;
-	m_bIsNoBase64		= false;
+	m_bIsNoBase64	= false;
 	m_bSaveChartAsImg	= false;
 }
 BinDocxRW::CDocxSerializer::~CDocxSerializer()
@@ -98,7 +95,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 	oDrawingConverter.SetMainDocument(this);
 
     oDrawingConverter.SetDstPath(pathMain.GetDirectory() + FILE_SEPARATOR_STR + L"word");
-	oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
+    oDrawingConverter.SetMediaDstPath(pathMedia.GetPath());
 	
 	m_pParamsWriter = new ParamsWriter(&oBufferedStream, &fp, &oDrawingConverter, pEmbeddedFontsManager);
 
@@ -268,10 +265,10 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 			
 			if (NULL != pData)
 			{
-				oDrawingConverter.SetMainDocument(this);
+				oDrawingConverter.SetMainDocument(this);                
                 oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"word");
 
-				oDrawingConverter.SetMediaDstPath(sMediaPath);
+                oDrawingConverter.SetMediaDstPath(sMediaPath);
 				oDrawingConverter.SetEmbedDstPath(sEmbedPath);
 				
 				m_pCurFileWriter = new Writers::FileWriter(sDstPath, m_sFontDir, false, nVersion, m_bSaveChartAsImg, &oDrawingConverter, sThemePath);
@@ -295,7 +292,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				
                 OOX::CPath DocProps = std::wstring(_T("docProps"));
 
-				OOX::CApp* pApp = new OOX::CApp(NULL);
+				OOX::CApp* pApp = new OOX::CApp();
 				if (pApp)
 				{
 					pApp->SetApplication(_T("OnlyOffice"));
@@ -309,7 +306,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(NULL);
+				OOX::CCore* pCore = new OOX::CCore();
 				if (pCore)
 				{
 					pCore->SetCreator(_T(""));

ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp

@@ -33,12 +33,6 @@
 
 #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,7 +42,6 @@
 #include "ChartWriter.h"
 
 #include "../BinReader/DefaultThemeWriter.h"
-//#include "../../Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h"
 
 namespace BinXlsxRW{
 	int g_nCurFormatVersion = 0;
@@ -89,12 +88,12 @@ namespace BinXlsxRW{
 	{
         std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
 
-		NSBinPptxRW::CDrawingConverter oDrawingConverter;
+        NSBinPptxRW::CDrawingConverter oDrawingConverter;
 		
         oDrawingConverter.SetDstPath(sDstPath + FILE_SEPARATOR_STR + L"xl");
         oDrawingConverter.SetSrcPath(strFileInDir, 2);
 
-		oDrawingConverter.SetMediaDstPath(sMediaDir);
+        oDrawingConverter.SetMediaDstPath(sMediaDir);
 		oDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
@@ -169,7 +168,7 @@ namespace BinXlsxRW{
 
 	//todo theme path
 		BinXlsxRW::SaveParams			oSaveParams(sThemePath, m_pExternalDrawingConverter->GetContentTypes());
-		OOX::Spreadsheet::CChartSpace	oChartSpace(NULL);
+		OOX::Spreadsheet::CChartSpace	oChartSpace;
 		BinXlsxRW::BinaryChartReader	oBinaryChartReader(*pReader, oSaveParams, m_pExternalDrawingConverter);
 		
 		oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -314,7 +314,7 @@
 		17E17ED41AC453F800BEA2EA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Ascensio System SIA";
 			};
 			buildConfigurationList = 17E17ED71AC453F800BEA2EA /* Build configuration list for PBXProject "ASCOfficeDocxFile2Lib" */;
@@ -402,7 +402,6 @@
 				EXECUTABLE_PREFIX = lib;
 				GCC_ENABLE_CPP_EXCEPTIONS = YES;
 				GCC_ENABLE_CPP_RTTI = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
 					_UNICODE,
@@ -442,21 +441,13 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -464,7 +455,6 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -477,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -493,21 +483,13 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -515,14 +497,13 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -47,7 +47,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -68,7 +68,6 @@
 				ShowProgress="0"
 				Version=""
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -357,10 +356,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 				>

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/CPHash.h

@@ -1,57 +1,55 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-#include "CachedDiskHeader.h"
-#include <Binary/CFRecord.h>
-
-namespace XLS
-{
-
-BiffStructurePtr CachedDiskHeader::clone()
-{
-	return BiffStructurePtr(new CachedDiskHeader(*this));
-}
-
-void CachedDiskHeader::load(CFRecord& record)
-{	
-	record >> cbdxfHdrDisk;	
-
-	if (cbdxfHdrDisk > 0)
-	{
-		rgHdrDisk.size = cbdxfHdrDisk;
-		rgHdrDisk.load(record);
-	}
-	record >> strStyleName;	
-}
-
-} // namespace XLS
-
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "../../include/cpdoccore/CPOptional.h"
+
+namespace boost 
+{
+	template< class T > struct hash;
+}
+
+namespace cpdoccore {
+
+template <class T>
+std::size_t hash_value(typename optional<T>::Type const & val)
+{
+    if (val)
+    {
+        boost::hash<T>(*val);        
+    }
+    else
+        return 0;
+}
+
+}
+

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/include/cpdoccore/xml/attributes.h

@@ -154,7 +154,7 @@ namespace cpdoccore
 			if (val)
 			{
                 std::wstring tmp = *val;
-				tmp = XmlUtils::GetLower(tmp);
+				XmlUtils::GetLower(tmp);
                 return  optional<bool>::Type((tmp == xml_char_value_type::trueVal));
 			}
 			else

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -555,6 +555,7 @@ HEADERS += \
     ../src/docx/xlsx_xf.h \
     ../include/logging.h \
     ../include/cpdoccore/CPColorUtils.h \
+    ../include/cpdoccore/CPHash.h \
     ../include/cpdoccore/CPNoncopyable.h \
     ../include/cpdoccore/CPOptional.h \
     ../include/cpdoccore/CPScopedPtr.h \

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -732,38 +732,16 @@ 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)//from page layout
+void docx_conversion_context::process_section(std::wostream & strm, odf_reader::style_columns * columns)
 {
 	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_)
+		if ((columns->fo_column_count_) && (*columns->fo_column_count_ > 1))
 		{
 			count_columns =  *columns->fo_column_count_;
 		}
@@ -772,63 +750,44 @@ void docx_conversion_context::process_section(std::wostream & strm, odf_reader::
 			if (columns_sep->style_style_ != _T("none"))
 				sep_columns = true;
 		}
-
-		if (!columns->style_columns_.empty())
+	}
+	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())
 		{
-			double page_width = 0;
-			const odf_reader::page_layout_instance * pp = root()->odf_context().pageLayoutContainer().page_layout_first();
-			if (pp)
+			if (odf_reader::style_section_properties * sectPr = content->get_style_section_properties())
 			{
-				odf_reader::style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
-				if (attr_page.fo_page_width_)
+				if (odf_reader::style_columns * columns = dynamic_cast<odf_reader::style_columns *>( sectPr->style_columns_.get() ))
 				{
-					page_width = attr_page.fo_page_width_->get_value_unit(odf_types::length::pt);
+					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;
+					}
 				}
-				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));
+				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();				
+		}
 	}
+
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"w:cols")
 		{
-			CP_XML_ATTR(L"w:equalWidth", width_space.empty());
+			CP_XML_ATTR(L"w:equalWidth", L"true");
 			CP_XML_ATTR(L"w:num", count_columns);
 			CP_XML_ATTR(L"w:sep", sep_columns);
-			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));	
-				}
-			}
+			CP_XML_ATTR(L"w:space",0);
 		}
 	}
 }
@@ -887,18 +846,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())
 		{		
@@ -1361,7 +1320,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;
 
@@ -1454,7 +1413,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/docx_conversion_context.h

@@ -224,9 +224,8 @@ public:
 	bool & get_use_image_replace()
 	{
 		bool res = false;
-		if (!frames_.empty())	return frames_.back().use_image_replace;
-		else
-			throw;
+		if (frames_.size()>0)	return frames_.back().use_image_replace;
+		else					return res;
 	}
 
 	std::wstring & get_text_stream_shape()

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -48,19 +48,13 @@ _CP_PTR(oox_axis_content) oox_axis_content::create(int type)
 
 oox_axis_content::oox_axis_content(int type/*,std::wstring name*/)
 {
-	if (type == 0)
-	{
-		id_  = 0;
-	}
-	else
-	{
-		id_  = abs((long)this);
-	}
-	type_ = type;
+    //id_ = abs((int)*((_UINT32*)this));
+    id_ = abs((long)this);
+	type_=type;		//dimension
 }
 void oox_axis_content::oox_serialize(std::wostream & _Wostream)
 {
-	if (id_ < 1 )return; //not activate, blank axis
+	if (id_ <0 )return;//not activate
  
 	CP_XML_WRITER(_Wostream)
     {

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

@@ -153,7 +153,7 @@ void oox_chart_context::serialize(std::wostream & strm)
 				}	
 				CP_XML_NODE(L"c:dispBlanksAs")
 				{
-					CP_XML_ATTR(L"val", plot_area_.current_chart_->dispBlanksAs_);
+					CP_XML_ATTR(L"val", L"zero");
 				}
 				CP_XML_NODE(L"c:showDLblsOverMax")
 				{

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::legend & l)
+	void set_legend(odf_reader::chart::simple & l)
 	{
 		reset_fill(l.fill_);
 		legend_.content_= l;

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

@@ -32,7 +32,7 @@
 
 
 #include <boost/functional.hpp>
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "oox_chart_legend.h"
@@ -52,9 +52,10 @@ 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", content_.position);
+				CP_XML_ATTR(L"val", "r");//  "b" | "l" |  "r" |  "t"// == bottom left right top
 
 			}
             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::legend content_;  
+	odf_reader::chart::simple content_;  
 private:
 	
 	cpdoccore::oox::oox_layout layout_;	//layout (Layout) §21.2.2.88

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -250,7 +250,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 									CP_XML_CONTENT(values_[i].numRef_.formula);
 							}
 						
-							if (values_[i].numRef_.num_cache_count > 0)
+							if (values_[i].numRef_.num_cache_count>0)
 							{
 								CP_XML_NODE(L"c:numCache")
 								{

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

@@ -30,7 +30,7 @@
  *
  */
 #include <boost/functional.hpp>
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "oox_chart_shape.h"

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

@@ -31,7 +31,7 @@
  */
 
 
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "oox_data_labels.h"
@@ -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_layout.cpp

@@ -32,7 +32,7 @@
 
 #include "oox_layout.h"
 #include <boost/functional.hpp>
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 

ASCOfficeOdfFile/src/docx/oox_plot_area.cpp

@@ -31,10 +31,10 @@
  */
 
 #include "oox_plot_area.h"
-
-#include <cpdoccore/CPOptional.h>
+#include <boost/foreach.hpp>
+#include <boost/functional.hpp>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-
 #include "../odf/style_text_properties.h"
 
 #include "oox_chart_shape.h"
@@ -90,7 +90,7 @@ void oox_plot_area::add_chart(int type)
 
 void oox_plot_area::add_axis(int type, odf_reader::chart::axis & content)
 {
-	oox_axis_content_ptr ax = oox_axis_content::create(type);
+	oox_axis_content_ptr ax=oox_axis_content::create(type);
 	ax->content_ = content;
 
 	axis_.push_back(ax);
@@ -98,25 +98,21 @@ void oox_plot_area::add_axis(int type, odf_reader::chart::axis & content)
 
 void oox_plot_area::reset_cross_axis()//обязательно после всех добавлений
 {
-	for (size_t i = 0; i < axis_.size(); i++)
+	BOOST_FOREACH(oox_axis_content_ptr const & ax, axis_)
 	{
-		for (size_t j = 0; j < charts_.size(); j++)
+		BOOST_FOREACH(oox_chart_ptr const & ch, charts_)
 		{
-			charts_[j]->add_axis(axis_[i]->get_Id());		
+			ch->add_axis(ax->get_Id());		
 		}
 	}
 	
-	for (size_t i = 0; i < axis_.size(); i++)
-	{		
-		int curr_id = axis_[i]->get_Id();
-
-		if (curr_id < 1) continue;
-
-		for (size_t j = 0; j < axis_.size(); j++)
-		{	
-			if (axis_[j]->get_Id() == curr_id)continue;
-			
-			axis_[j]->add_CrossedId(curr_id);
+	BOOST_FOREACH(oox_axis_content_ptr const & a, axis_)
+	{
+		int curr_id = a->get_Id();
+		BOOST_FOREACH(oox_axis_content_ptr const & b, axis_)
+		{
+			if (b->get_Id()==curr_id)continue;
+			b->add_CrossedId(curr_id);
 		}
 	}
 }
@@ -134,18 +130,18 @@ void oox_plot_area::oox_serialize(std::wostream & _Wostream)
 			//CP_XML_NODE(L"c:layout"){}
 			bool axisPresent = true;
 			
-			for (size_t i = 0; i < charts_.size(); i++)
-			{		
-				charts_[i]->oox_serialize(CP_XML_STREAM());
+			BOOST_FOREACH(oox_chart_ptr const & ch, charts_)
+			{
+				ch->oox_serialize(CP_XML_STREAM());
 
-				if (charts_[i]->type_ == CHART_TYPE_PIE || 
-					charts_[i]->type_ == CHART_TYPE_DOUGHNUT) axisPresent = false;
+				if (ch->type_ == CHART_TYPE_PIE || 
+					ch->type_ == CHART_TYPE_DOUGHNUT) axisPresent = false;
 			}
 			if (axisPresent)
 			{
-				for (size_t i = 0; i < axis_.size(); i++)
-				{		
-					axis_[i]->oox_serialize(CP_XML_STREAM());
+				BOOST_FOREACH(oox_axis_content_ptr const & a, axis_)
+				{
+					a->oox_serialize(CP_XML_STREAM());
 				}
 			}
 			shape.oox_serialize(CP_XML_STREAM());

ASCOfficeOdfFile/src/docx/oox_title.cpp

@@ -32,7 +32,7 @@
 
 #include "oox_title.h"
 #include <boost/functional.hpp>
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -63,7 +63,7 @@ void oox_chart::set_content_series(odf_reader::chart::series & content)
 }
 void oox_chart::set_values_series(int ind, std::vector<std::wstring> & val)
 {
-	if (val.empty())return;
+	if (val.size()<1)return;
 
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setValues (ind, val);
@@ -74,11 +74,9 @@ void oox_chart::set_properties(std::vector<odf_reader::_property> g)
 
 	_CP_OPT(bool) bStacked;
 	_CP_OPT(bool) bPercent;
-	_CP_OPT(int) iGapWidth;
 
-	odf_reader::GetProperty(g, L"stacked", bStacked);
-	odf_reader::GetProperty(g, L"percentage", bPercent);
-	odf_reader::GetProperty(g, L"gap-width", iGapWidth);
+	odf_reader::GetProperty(g, L"stacked",bStacked);
+	odf_reader::GetProperty(g, L"percentage",bPercent);
 
 	if ( (bStacked) && (bStacked.get()))
 	{
@@ -89,10 +87,6 @@ void oox_chart::set_properties(std::vector<odf_reader::_property> g)
 	{
 		grouping_ = L"percentStacked";	
 	}
-	if (iGapWidth)
-	{
-		dispBlanksAs_ = L"gap";
-	}
 	//solid-type - трехмерные
 }
 void oox_chart::oox_serialize_common(std::wostream & _Wostream)
@@ -134,15 +128,17 @@ void oox_bar_chart::set_properties(std::vector<odf_reader::_property> g)
 {
 	oox_chart::set_properties(g);
 
-	odf_reader::GetProperty(g, L"vertical", bVertical);
-	odf_reader::GetProperty(g, L"connect-bars", bConnectBars);
+	odf_reader::GetProperty(g, L"vertical",bVertical);
+	odf_reader::GetProperty(g, L"connect-bars",bConnectBars);
 	
-	odf_reader::GetProperty(g, L"gap-width", iGapWidth);
-	odf_reader::GetProperty(g, L"overlap", iOverlap);
+	odf_reader::GetProperty(g, L"gap-width",iGapWidth);
+	odf_reader::GetProperty(g, L"overlap",iOverlap);
 }
 
 void oox_bar_chart::set_additional_properties(std::vector<odf_reader::_property> g)
 {
+	odf_reader::GetProperty(g, L"gap-width",iGapWidth);
+	odf_reader::GetProperty(g, L"overlap",iOverlap);
 }
 
 void oox_bar_chart::oox_serialize(std::wostream & _Wostream)
@@ -173,13 +169,13 @@ void oox_bar_chart::oox_serialize(std::wostream & _Wostream)
 			}
 			CP_XML_NODE(L"c:overlap")//-100 to 100
 			{
-				CP_XML_ATTR(L"val", Overlap); 
+				CP_XML_ATTR(L"val",Overlap); 
 			}
 			if (iGapWidth)
 			{
 				CP_XML_NODE(L"c:gapWidth")
 				{
-					CP_XML_ATTR(L"val", iGapWidth.get()); 
+					CP_XML_ATTR(L"val",iGapWidth.get()); 
 				}
 			}
 			CP_XML_NODE(L"c:varyColors")

ASCOfficeOdfFile/src/docx/oox_types_chart.h

@@ -63,10 +63,9 @@ public:
 
 	oox_chart()
 	{
-		grouping_		= L"standard";
-		is3D_			= false;
-		type_			= 0;
-		dispBlanksAs_	= L"zero";
+		grouping_	= L"standard";
+		is3D_		= false;
+		type_		= 0;
 	}
 	~oox_chart(){}
  
@@ -99,10 +98,9 @@ public:
 
 	int								type_;
 	bool							is3D_;
-	std::wstring					dispBlanksAs_;
-	std::vector<int>				axisId_;	//	axId (Axis ID) §21.2.2.9
+	std::vector<int>				axisId_;	//axId (Axis ID) §21.2.2.9
 	std::wstring					grouping_;	//	clustered | percentStacked | stacked | standard 
-	std::vector<oox_series_ptr>		series_;	//	ser (Bar Chart Series) §21.2.2.170
+	std::vector<oox_series_ptr>		series_;	//ser (Bar Chart Series) §21.2.2.170
 
 	virtual void set_properties(std::vector<odf_reader::_property> g);
 	virtual void set_additional_properties(std::vector<odf_reader::_property> g){}

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

@@ -32,7 +32,7 @@
 
 #include "xlsx_border.h"
 #include <boost/functional.hpp>
-#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

@@ -55,8 +55,8 @@ public:
 
     void add_format(std::wstring const & condition, std::wstring const & format)
     {
-        std::wstring c = XmlUtils::GetLower(condition);
-
+        std::wstring c = condition;
+		XmlUtils::GetLower(c);
         XmlUtils::replace_all( c, L" ", L"");
         XmlUtils::replace_all( c, L"\t", L"");
 

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -576,31 +576,11 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
 		impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
 }
 
-void xlsx_drawing_context::process_object(drawing_object_description & obj, xlsx_table_metrics & table_metrics,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_object(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
 {
 	std::wstring ref;
     bool isMediaInternal = true;
 	
-	if (drawing.type_anchor == 2) // absolute
-	{
-		//пересчет нужен для оле
-		xlsx_table_position from, to;
-		
-		process_position_properties	(obj, table_metrics, from, to);
-
-		drawing.from_.type				= xlsx_drawing_position::from;
-		drawing.from_.position.col		= from.col;
-		drawing.from_.position.colOff	= static_cast<size_t>(odf_types::length(from.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
-		drawing.from_.position.row		= from.row;
-		drawing.from_.position.rowOff	= static_cast<size_t>(odf_types::length(from.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
-
-		drawing.to_.type				= xlsx_drawing_position::to;
-		drawing.to_.position.col		= to.col;
-		drawing.to_.position.colOff		= static_cast<size_t>(odf_types::length(to.colOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
-		drawing.to_.position.row		= to.row;
-		drawing.to_.position.rowOff		= static_cast<size_t>(odf_types::length(to.rowOff, odf_types::length::pt).get_value_unit(odf_types::length::emu));
-	}	
-	
 	drawing.objectId		= impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
 	drawing.objectProgId	= obj.descriptor_;
 
@@ -622,7 +602,7 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 {
 	xlsx_drawings_ptr xlsx_drawings_child(xlsx_drawings::create(true));
 	
-	process_group_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
+	process_objects	( obj.child_objects_, table_metrics, xlsx_drawings_child);	
 	
 	std::wstringstream strm;
 
@@ -640,9 +620,9 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
 }
 void xlsx_drawing_context::process_objects(xlsx_table_metrics & table_metrics)
 {
-	process_group_objects(impl_->objects_, table_metrics, impl_->get_drawings());
+	process_objects(impl_->objects_, table_metrics, impl_->get_drawings());
 }
-void xlsx_drawing_context::process_group_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
+void xlsx_drawing_context::process_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
 {
 	for (size_t i = 0 ; i < objects.size(); i++)
 	{
@@ -681,7 +661,7 @@ void xlsx_drawing_context::process_group_objects(std::vector<drawing_object_desc
 			case typeGroupShape:	process_group	( obj, table_metrics, drawing, xlsx_drawings_);	break;
 			case typeMsObject:	
 			case typeOleObject:	
-									process_object	( obj, table_metrics, drawing, xlsx_drawings_);	break;
+									process_object	( obj, drawing, xlsx_drawings_);				break;
 		}
 	}
 }

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h

@@ -133,13 +133,13 @@ private:
     class Impl;
     _CP_PTR(Impl) impl_;
 
+	void process_objects			(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
 	void process_group				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
-	void process_group_objects		(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_);
   
 	void process_image				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_chart				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
     void process_shape				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
-    void process_object				(drawing_object_description & obj, xlsx_table_metrics & table_metrics, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
+    void process_object				(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
 
 	void process_common_properties	(drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_table_metrics & table_metrics);
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

@@ -65,7 +65,7 @@ public:
 
 		if (sheet_rel)
 		{
-			for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+			for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
 			{		
 				if (xlsx_sheet_rels_[i].rid == rid && xlsx_sheet_rels_[i].ref == ref)
 					present = true;
@@ -75,7 +75,7 @@ public:
 		}
 		else
 		{
-			for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+			for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
 			{		
 				if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
 					present = true;
@@ -89,7 +89,7 @@ public:
     {
 		if (inGroup)
 		{
-			for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
+			for (int i = 0 ; i < xlsx_drawings_.size(); i++)
 			{
 				xlsx_drawings_[i].serialize(strm);
 			}
@@ -114,7 +114,7 @@ public:
     }
 	void serialize_objects(std::wostream & strm) 
     {
-		for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
+		for (int i = 0 ; i < xlsx_drawings_.size(); i++)
 		{
 			if (xlsx_drawings_[i].type != typeOleObject && xlsx_drawings_[i].type != typeMsObject) continue;
 
@@ -129,7 +129,7 @@ public:
 
     void dump_rels_drawing(rels & Rels)
     {
-        for (size_t i = 0 ; i < xlsx_drawing_rels_.size(); i++)
+        for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
         {
 			if (xlsx_drawing_rels_[i].type == typeImage		|| 
 				xlsx_drawing_rels_[i].type == typeMedia		||
@@ -146,7 +146,7 @@ public:
     }
     void dump_rels_sheet(rels & Rels)
     {
-        for (size_t i = 0 ; i < xlsx_sheet_rels_.size(); i++)
+        for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
         {
 			Rels.add(relationship( xlsx_sheet_rels_[i].rid,
 						mediaitems::get_rel_type(xlsx_sheet_rels_[i].type),

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.cpp

@@ -66,27 +66,13 @@ public:
 
 	struct _field_value
 	{
-		_field_value(const std::wstring &val, const std::wstring &type, const bool &sd) : sVal(val), sNode(type), show_details(sd) {}
+		_field_value(const std::wstring &val, const std::wstring &type) : sVal(val), sNode(type) {}
 		std::wstring	sVal;
 		std::wstring	sNode;
-		bool			show_details;
-	};
-	struct _reference
-	{
-		std::wstring	name;
-		int				type = -1;
-		std::wstring	member_name;
-		int				member_type = -1;
-	};
-	struct _group
-	{
-		std::wstring				name;
-		std::vector<_field_value>	caches;
 	};
 	struct _field
 	{
 		std::wstring				name;
-		std::wstring				display_name;
 		int							type = -1;
 		int							hierarchy = -1;
 		int							function = -1;
@@ -94,20 +80,13 @@ public:
 		bool						data_layout = false;
 		bool						show_empty = false;
 		bool						repeat_item_labels = true;
+		int							type_groups = 0;
 		int							sort = 0;
+		std::wstring				source_groups;
 		
 		std::vector<int>			subtotals;
 		
 		std::vector<_field_value>	caches;
-		std::vector<_reference>		references;
-		int							references_field = -1;
-		bool						used_in_referenes = false;
-		
-		int							type_groups = 0;
-		int							base_group = -1;
-		std::wstring				source_groups;
-		std::vector<_group>			groups;
-		std::vector<int>			groups_discrete;
 
 		bool						bDataFieldEnabled = false;
 		bool						bString = false;
@@ -142,11 +121,6 @@ public:
 			data_on_row = false;
 			identify_categories = false;
 			drill_enabled = true;
-			grand_total = -1;
-			firstDataRow = 0;
-			firstDataCol = 0;
-			bAxisRow = true;
-			bAxisCol = true;
 		}
 		std::wstring				name;
 		std::wstring				location_ref;
@@ -166,21 +140,12 @@ public:
 		std::vector<int>			col_fields;
 		std::vector<int>			data_fields;
 		
-		int							grand_total = -1;
 		bool						identify_categories = false;
 		bool						drill_enabled = true;
-		bool						ignore_empty_rows = false;
 
 		bool						data_on_row = false;
-		bool						in_group = false;
-//-----------------------------------------------------------------------------
-		int							firstDataRow = 0;
-		int							firstDataCol = 0;
-		bool						bAxisRow = true;
-		bool						bAxisCol = true;
 	}current_;
 
-	void calc_headers();
 	void sort_fields();
 
 	void serialize_view(std::wostream & strm);
@@ -194,7 +159,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 +180,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 +194,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())
@@ -292,7 +257,21 @@ private:
 xlsx_pivots_context::xlsx_pivots_context() : impl_(new xlsx_pivots_context::Impl())
 {
 }
-void xlsx_pivots_context::Impl::calc_headers()
+void xlsx_pivots_context::Impl::sort_fields()
+{
+	for (size_t i = 0; i < current_.fields.size(); i++)
+	{
+		if (current_.fields[i].type == 7)
+			continue;
+		if (!current_.fields[i].source_groups.empty() && i != current_.fields.size() -1)
+		{
+			current_.fields.push_back(current_.fields[i]);
+			current_.fields.erase(current_.fields.begin() + i , current_.fields.begin() + i + 1);
+			i--;
+		}
+	}
+}
+void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 {
 	if (current_.headers.empty()) return;
 
@@ -335,30 +314,30 @@ void xlsx_pivots_context::Impl::calc_headers()
 	bool resRow = clear_header_map(mapRowHeader);
 	bool resCol = clear_header_map(mapColHeader);
 
+	size_t firstDataRow, firstDataCol;
+
 	if (resRow == resCol && resCol == false)
 	{
-		current_.firstDataRow = current_.firstDataCol = 1; 
+		firstDataRow = firstDataCol = 1; 
 	}
 	else if (resRow == false)
 	{
-		current_.bAxisCol = false;
 		clear_header_map2(mapRowHeader, mapColHeader);
 	}
 	else if (resCol == false)
 	{
-		current_.bAxisRow = false;
 		clear_header_map2(mapColHeader, mapRowHeader);
 	}
 
 	if (resRow || resCol)
 	{
-		current_.firstDataCol = mapRowHeader.empty() ? 1 : mapRowHeader.begin()->second - min_col;
+		firstDataCol = mapRowHeader.empty() ? 1 : mapRowHeader.begin()->second - min_col;
 		
 		if (mapColHeader.empty())
 		{
 			pFind = mapRowHeader.end(); pFind--;
 			min_row = pFind->first;
-			current_.firstDataRow = 1;
+			firstDataRow = 1;
 		}
 		else
 		{
@@ -368,11 +347,11 @@ void xlsx_pivots_context::Impl::calc_headers()
 				if (min_row > mapRowHeader.begin()->first)
 					min_row = mapRowHeader.begin()->first;
 			}
-			current_.firstDataRow = mapColHeader.begin()->second - min_row + 1;
+			firstDataRow = mapColHeader.begin()->second - min_row + 1;
 		}
 	}
-	if (current_.firstDataCol < 1) current_.firstDataCol = 1;
-	if (current_.firstDataRow < 1) current_.firstDataRow = 1;
+	if (firstDataCol < 1) firstDataCol = 1;
+	if (firstDataRow < 1) firstDataRow = 1;
 
 	std::vector<std::wstring> split_ref;
 	boost::algorithm::split(split_ref, current_.location_ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
@@ -390,199 +369,14 @@ void xlsx_pivots_context::Impl::calc_headers()
 
 		split_ref[0] = oox::getColAddress(col) + oox::getRowAddress(row);
 	}
+	std::wstring location_data;
 	if (split_ref.size() > 1)
 	{
-		current_.location_ref = split_ref[0] + L":" + split_ref[1];
+		location_data += split_ref[0] + L":" + split_ref[1];
 	}
-}
-void xlsx_pivots_context::Impl::sort_fields()
-{
-	size_t count_skip = 0;
-	for (size_t i = 0; i < current_.fields.size() - count_skip; i++)
-	{
-		if (!current_.fields[i].source_groups.empty() && i != current_.fields.size() - count_skip)
-		{
-			current_.fields.push_back(current_.fields[i]);
-			current_.fields.erase(current_.fields.begin() + i , current_.fields.begin() + i + 1);
-			i--;
-			count_skip++;
-		}
-	}
-	count_skip = 0;
-	for (size_t i = 0; i < current_.fields.size() - count_skip; i++)
-	{
-		if (current_.fields[i].name.empty() && i != current_.fields.size() - count_skip)
-		{
-			current_.fields.push_back(current_.fields[i]);
-			current_.fields.erase(current_.fields.begin() + i , current_.fields.begin() + i + 1);
-			i--;
-			count_skip++;
-		}
-	}
-	
-	bool bAddRepeateRow = false;
-	bool bAddRepeateCol = false;
-
-	int count_items_col = -1, count_items_row = -1;
-	
-	int index_current = 0;
-	for (size_t i = 0; i < current_.fields.size(); i++, index_current++)
-	{
-		if ( current_.fields[i].type_groups > 0 )
-		{
-			current_.fields[i].base_group = 0;
-
-			int index_group = 0;
-			for (size_t k = 0; k < current_.fields.size(); k++)
-			{
-				if (current_.fields[k].type == 7) continue;
-				if (current_.fields[k].name == current_.fields[i].source_groups && !current_.fields[i].source_groups.empty())
-				{
-					if (current_.fields[k].type_groups == 0)
-						current_.fields[k].base_group = index_current; //опорный (если он и базовый - не писать)
-					current_.fields[i].base_group = index_group;
-
-					for (size_t c = 0; !current_.fields[i].groups.empty() && c < current_.fields[k].caches.size(); c++)
-					{
-						for (size_t g = 0; g < current_.fields[i].groups.size(); g++)
-						{
-							for (size_t h = 0; h < current_.fields[i].groups[g].caches.size(); h++)
-							{
-								if (current_.fields[i].groups[g].caches[h].sVal == current_.fields[k].caches[c].sVal)
-									current_.fields[i].groups_discrete.push_back(g);
-							}
-						}
-					}
-					break;
-				}
-				index_group++;
-			}
-		}
-		if ( current_.fields[i].name.empty() &&
-			!current_.fields[i].data_layout)
-			continue;
-
-		switch(current_.fields[i].type)
-		{
-			case 0:	// column
-			{
-				if (!current_.fields[i].name.empty())
-				{
-					current_.col_fields.push_back(i);	
-
-					if ( count_items_col < 0)
-					{
-						count_items_col = current_.fields[i].caches.size();
-					}
-					else
-					{
-						if (count_items_col != current_.fields[i].caches.size())
-							bAddRepeateCol = true;
-					}	
-				}
-				//if (current_.fields[i].data_layout)
-				//{
-				//	bAddRepeateCol = false;
-
-				//	if ((current_.fields[i].name.empty() && (!current_.identify_categories || current_.fields[i].hierarchy >= 0)) || 
-				//		current_.fields[i].used_in_referenes )
-				//	{
-				//		if ((current_.col_fields.empty()) || (current_.col_fields.back() != -2))
-				//		{
-				//			bAddRepeateCol = true;
-				//		}	
-				//	}
-				//}
-				
-				//if (current_.fields[i].caches.empty())
-				//	bEmptyColCache = true;
-
-
-			}break;
-			case 1:	// data
-			{
-				int index_field = -1;
-				
-				for (size_t j = 0; j < i/*current_.fields.size()*/; j++)
-				{
-					if ( current_.fields[j].name == current_.fields[i].name )
-					{
-						current_.fields[j].bDataFieldEnabled = true;
-						index_field = j;
-						break;
-					}
-				}
-				if (index_field >= 0)
-				{
-					if (current_.fields[i].caches.empty())
-					{
-						current_.fields[i].type = 7; //skip 
-						current_.fields_count--; 
-						index_current--;
-					}
-					
-					current_.fields[i].references_field = index_field;
-				}
-
-				index_field = i;
-				current_.fields[i].bDataFieldEnabled = true;
-				current_.data_fields.push_back(index_field);	
-			}break;
-			case 2:	// hidden
-			{
-			}break;
-			case 3:	// page
-			{
-				current_.page_fields.push_back(i);	
-			}break;
-			case 4:	// row
-			{
-				if (!current_.fields[i].name.empty())
-				{
-					current_.row_fields.push_back(i);	
-
-					if ( count_items_row < 0)
-					{
-						count_items_row = current_.fields[i].caches.size();
-					}
-					else
-					{
-						if (count_items_row != current_.fields[i].caches.size())
-							bAddRepeateRow = true;
-					}
-				}
-
-				if (current_.fields[i].data_layout)
-				{
-					current_.data_on_row = true;
-
-					bAddRepeateCol = false;
-
-					if ((current_.fields[i].name.empty() && (current_.fields[i].hierarchy >= 0)) ||
-						current_.fields[i].used_in_referenes )
-					{
-						bAddRepeateRow = true;
-					}
-				}
-
-			}break;
-		}
-
-		if (current_.fields[i].name.empty())
-		{
-			current_.fields.erase(current_.fields.begin() + i, current_.fields.begin() + i + 1);
-			current_.fields_count--; 
-			i--;
-		}
-	}
-	if (bAddRepeateCol || (count_items_col == 0 && current_.bAxisCol)) ///* || (bEmptyColCache && current_.grand_total < 0)*/?? Financial Execution (template).ods
-		current_.col_fields.push_back(-2);	
-	
-	if (bAddRepeateRow || (count_items_row == 0 && current_.bAxisRow))
-		current_.row_fields.push_back(-2);	
-}
-void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
-{
+	else location_data = current_.location_ref;
+//------------------------------------------------------------------------------------------------
+			
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"pivotTableDefinition")
@@ -619,11 +413,11 @@ void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 
 			CP_XML_NODE(L"location")
 			{
-				CP_XML_ATTR(L"ref", current_.location_ref);
+				CP_XML_ATTR(L"ref", location_data);
 				
 				CP_XML_ATTR(L"firstHeaderRow", 1 );
-				CP_XML_ATTR(L"firstDataRow", current_.firstDataRow);
-				CP_XML_ATTR(L"firstDataCol", current_.firstDataCol);
+				CP_XML_ATTR(L"firstDataRow", firstDataRow);
+				CP_XML_ATTR(L"firstDataCol", firstDataCol);
 				
 				if (current_.page_fields.empty() == false)
 				{
@@ -674,42 +468,22 @@ void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 						}
 						CP_XML_ATTR(L"defaultSubtotal", 0);
 
-						if (current_.fields[i].type != 2) 
+						if (!current_.fields[i].caches.empty() && current_.fields[i].type != 2)
 						{
-							if (!current_.fields[i].groups.empty())
-							{
-								CP_XML_NODE(L"items")
-								{					 
-									CP_XML_ATTR(L"count", current_.fields[i].groups.size());
-									for (size_t j = 0; j < current_.fields[i].groups.size(); j++)
-									{
-										CP_XML_NODE(L"item")
-										{					 
-											CP_XML_ATTR(L"x", j);
-										}
-									}
-								}
-							}
-							else if (!current_.fields[i].caches.empty())
-							{
-								CP_XML_NODE(L"items")
-								{					 
-									CP_XML_ATTR(L"count", current_.fields[i].caches.size());
-									for (size_t j = 0; j < current_.fields[i].caches.size(); j++)
-									{
-										CP_XML_NODE(L"item")
-										{					 
-											if (current_.fields[i].caches[j].show_details == false)
-											{
-												CP_XML_ATTR(L"sd", 0);
-											}
-											CP_XML_ATTR(L"x", j);
-										}
+							CP_XML_NODE(L"items")
+							{					 
+								CP_XML_ATTR(L"count", current_.fields[i].caches.size());
+								for (size_t j = 0; j < current_.fields[i].caches.size(); j++)
+								{
+									CP_XML_NODE(L"item")
+									{					 
+										CP_XML_ATTR(L"x", j);
 									}
 								}
 							}
 						}
 					}
+					//CP_XML_STREAM() << fields_[i].view_;
 				}		
 			}
 			if (!current_.row_fields.empty())
@@ -763,85 +537,35 @@ void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 					CP_XML_ATTR(L"count", current_.data_fields.size());
 					for (size_t i = 0; i < current_.data_fields.size(); i++)
 					{
-						int ind_field_dirty = current_.data_fields[i];
-
 						CP_XML_NODE(L"dataField")
-						{	
-							int fld = 0, ind_fld = current_.fields[ind_field_dirty].references_field < 0 ? ind_field_dirty : 
-														current_.fields[ind_field_dirty].references_field;
-							for (size_t k = 0; k < ind_fld; k++)
-							{
-								if (current_.fields[k].type != 7 ) fld++;
-							}
-						
-							CP_XML_ATTR(L"fld", fld);
-							if (current_.fields[ind_field_dirty].references.empty())
-							{
-								CP_XML_ATTR(L"baseField", fld);
-							}
-							else 
-							{
-								size_t base_field = 0, base_item = 0;
-								for (size_t k = 0; k < current_.fields.size(); k++)
-								{
-									if (current_.fields[k].type == 7 ) continue;
+						{					 
+							CP_XML_ATTR(L"fld", current_.data_fields[i]);
+							CP_XML_ATTR(L"baseField", current_.data_fields[i]);
+							//CP_XML_ATTR(L"baseItem", -1);
+							//CP_XML_ATTR(L"name", L"");
 
-									if (current_.fields[k].name == current_.fields[ind_field_dirty].references[0].name)
-									{
-										for (size_t j = 0; j < current_.fields[k].caches.size(); j++)
-										{
-											if (current_.fields[k].caches[j].sVal == current_.fields[ind_field_dirty].references[0].member_name)
-											{
-												base_item = j;
-												break;
-											}
-										}
-										break;
-									}
-									base_field++;
-								}
-								CP_XML_ATTR(L"baseField", base_field);
-								CP_XML_ATTR(L"baseItem", base_item);
-								
-								switch(current_.fields[ind_field_dirty].references[0].type)
-								{
-									case 1: CP_XML_ATTR(L"showDataAs", L"difference");	break;
-									case 2: CP_XML_ATTR(L"showDataAs", L"percent");		break;
-									case 3: CP_XML_ATTR(L"showDataAs", L"percentDiff"); break;
-								}
-							}
-							std::wstring name;
-
-							if (ind_field_dirty >= 0 && ind_field_dirty < current_.fields.size())
+							int ind_field = current_.data_fields[i];
+							if (ind_field >= 0 && ind_field < current_.fields.size())
 							{
-								switch(current_.fields[ind_field_dirty].function)
+								switch(current_.fields[ind_field].function)
 								{
-									case 1:		CP_XML_ATTR(L"subtotal", L"average");	name = L"average ";		break;
-									case 2:		CP_XML_ATTR(L"subtotal", L"count");		name = L"count ";		break;
-									case 3:		CP_XML_ATTR(L"subtotal", L"countNums");	name = L"countNums ";	break;
-									case 4:		CP_XML_ATTR(L"subtotal", L"max");		name = L"max ";			break;
-									case 5:		CP_XML_ATTR(L"subtotal", L"min");		name = L"min ";			break;
-									case 6:		CP_XML_ATTR(L"subtotal", L"product");	name = L"product ";		break;
-									case 7:		CP_XML_ATTR(L"subtotal", L"stdDev");	name = L"stdDev Dev ";	break;
-									case 8:		CP_XML_ATTR(L"subtotal", L"stdDevp");	name = L"stdDevp ";		break;
-									case 9:		CP_XML_ATTR(L"subtotal", L"sum");		name = L"sum by ";		break;
-									case 10:	CP_XML_ATTR(L"subtotal", L"var");		name = L"var ";			break;
-									case 11:	CP_XML_ATTR(L"subtotal", L"varp");		name = L"varp ";		break;
+									case 1:		CP_XML_ATTR(L"subtotal", L"average");	break;
+									case 2:		CP_XML_ATTR(L"subtotal", L"count");		break;
+									case 3:		CP_XML_ATTR(L"subtotal", L"countNums"); break;
+									case 4:		CP_XML_ATTR(L"subtotal", L"max");		break;
+									case 5:		CP_XML_ATTR(L"subtotal", L"min");		break;
+									case 6:		CP_XML_ATTR(L"subtotal", L"product");	break;
+									case 7:		CP_XML_ATTR(L"subtotal", L"stdDev");	break;
+									case 8:		CP_XML_ATTR(L"subtotal", L"stdDevp");	break;
+									case 9:		CP_XML_ATTR(L"subtotal", L"sum");		break;
+									case 10:	CP_XML_ATTR(L"subtotal", L"var");		break;
+									case 11:	CP_XML_ATTR(L"subtotal", L"varp");		break;
 									case 12:
 										{
 											CP_XML_ATTR(L"subtotal", current_.fields[current_.data_fields[i]].user_function);
 										}break;		
 									default: break;
 								}
-								if (current_.fields[ind_field_dirty].display_name.empty())
-								{
-									name += current_.fields[ind_field_dirty].name;
-								}
-								else
-								{
-									name = current_.fields[ind_field_dirty].display_name;
-								}
-								CP_XML_ATTR(L"name", name);
 							}
 						}
 					}
@@ -941,7 +665,7 @@ void xlsx_pivots_context::Impl::serialize_type_field(CP_ATTR_NODE, _field & fiel
 }
 void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 {
-	std::map<std::wstring, bool> used_field_name, used_field_name_lower;
+	std::map<std::wstring, bool> used_field_name;
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"pivotCacheDefinition")
@@ -984,7 +708,6 @@ void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 					}
 				}	
 			}
-			int index_current = 0;
 
 			if (current_.fields.empty() == false)
 			{
@@ -999,24 +722,12 @@ void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 
 						if (used_field_name.end() != used_field_name.find(current_.fields[i].name))
 							continue;
-//---------------------------------------------------------------------------
-						used_field_name.insert(std::make_pair(current_.fields[i].name, true)); //дублированые поля
 
-						std::wstring name = current_.fields[i].name; // в мс "H" и "h" одно имя (
+						used_field_name.insert(std::make_pair(current_.fields[i].name, true));
 
-						std::wstring name_lower = XmlUtils::GetLower(name);
-
-						while (used_field_name_lower.end() != used_field_name_lower.find(name_lower))
-						{
-							name += L"_";
-							name_lower = XmlUtils::GetLower(name);
-						}
-
-						used_field_name_lower.insert(std::make_pair(name_lower, true)); 
-//---------------------------------------------------------------------------
 						CP_XML_NODE(L"cacheField")
 						{
-							CP_XML_ATTR(L"name", name);
+							CP_XML_ATTR(L"name", current_.fields[i].name);
 							CP_XML_ATTR(L"numFmtId", 0);
 
 							if (!current_.fields[i].source_groups.empty())
@@ -1033,12 +744,11 @@ void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 									{
 										CP_XML_ATTR(L"count", current_.fields[i].caches.size());
 									}
-									else if (current_.fields[i].type_groups < 8)
-									{//group by  date
+									else
+									{
 										current_.fields[i].bDate = true;
 										current_.fields[i].bString = false;
 									}
-									//else group by fields
 								
 									serialize_type_field(CP_GET_XML_NODE(), current_.fields[i]);					
 									if ( current_.fields[i].type_groups == 0 )
@@ -1056,78 +766,37 @@ void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 									}
 								}
 							}
-							if (current_.fields[i].base_group >= 0)
+							if ( current_.fields[i].type_groups != 0 )
 							{
 								CP_XML_NODE(L"fieldGroup")
-								{	
-									if ( current_.fields[i].type_groups > 0)
+								{
+									CP_XML_ATTR(L"base", 0);
+									CP_XML_NODE(L"rangePr")
 									{
-										CP_XML_ATTR(L"base", current_.fields[i].base_group);
-									}
-									else
-									{
-										CP_XML_ATTR(L"par", current_.fields[i].base_group);	
-									}
-									if (current_.fields[i].type_groups > 0)
-									{
-										if (current_.fields[i].type_groups < 8)
+										switch(current_.fields[i].type_groups)
 										{
-											CP_XML_NODE(L"rangePr")
-											{
-												switch(current_.fields[i].type_groups)
-												{
-												case 1: CP_XML_ATTR(L"groupBy",	L"seconds");	break;
-												case 2: CP_XML_ATTR(L"groupBy",	L"minutes");	break;
-												case 3: CP_XML_ATTR(L"groupBy",	L"hours");		break;
-												case 4: CP_XML_ATTR(L"groupBy",	L"days");		break;
-												case 5: CP_XML_ATTR(L"groupBy",	L"months");		break;
-												case 6: CP_XML_ATTR(L"groupBy",	L"quarters");	break;
-												case 7: CP_XML_ATTR(L"groupBy",	L"years");		break;
-												}
-												CP_XML_ATTR(L"startDate", L"1899-12-31T00:00:00");
-												CP_XML_ATTR(L"endDate", L"1899-12-31T00:00:00");
-											}
+										case 1: CP_XML_ATTR(L"groupBy",	L"seconds");	break;
+										case 2: CP_XML_ATTR(L"groupBy",	L"minutes");	break;
+										case 3: CP_XML_ATTR(L"groupBy",	L"hours");		break;
+										case 4: CP_XML_ATTR(L"groupBy",	L"days");		break;
+										case 5: CP_XML_ATTR(L"groupBy",	L"months");		break;
+										case 6: CP_XML_ATTR(L"groupBy",	L"quarters");	break;
+										case 7: CP_XML_ATTR(L"groupBy",	L"years");		break;
 										}
-										if (!current_.fields[i].groups_discrete.empty())
+										CP_XML_ATTR(L"startDate", L"1899-12-31T00:00:00");
+										CP_XML_ATTR(L"endDate", L"1899-12-31T00:00:00");
+									}
+									CP_XML_NODE(L"groupItems")
+									{
+										CP_XML_ATTR(L"count", current_.fields[i].caches.size());
+										
+										for (size_t j = 0; j < current_.fields[i].caches.size(); j++)
 										{
-											CP_XML_NODE(L"discretePr")
+											CP_XML_NODE(current_.fields[i].caches[j].sNode)
 											{
-												CP_XML_ATTR(L"count", current_.fields[i].groups_discrete.size());
-												for (size_t j = 0; j < current_.fields[i].groups_discrete.size(); j++)
+												if (current_.fields[i].caches[j].sVal.empty() == false)
 												{
-													CP_XML_NODE(L"x")
-													{
-														CP_XML_ATTR(L"v", current_.fields[i].groups_discrete[j]);
-													}
-												}
-											}
-										}
-										CP_XML_NODE(L"groupItems")
-										{
-											if (!current_.fields[i].groups.empty())
-											{
-												CP_XML_ATTR(L"count", current_.fields[i].groups.size());
-												for (size_t j = 0; j < current_.fields[i].groups.size(); j++)
-												{
-													CP_XML_NODE(L"s")
-													{
-														CP_XML_ATTR(L"v", current_.fields[i].groups[j].name);
-													}
-												}
-											}
-											else
-											{
-												CP_XML_ATTR(L"count", current_.fields[i].caches.size());
-												
-												for (size_t j = 0; j < current_.fields[i].caches.size(); j++)
-												{
-													CP_XML_NODE(current_.fields[i].caches[j].sNode)
-													{
-														if (current_.fields[i].caches[j].sVal.empty() == false)
-														{
-															CP_XML_ATTR(L"v", current_.fields[i].caches[j].sVal);
-														}
-													}
+													CP_XML_ATTR(L"v", current_.fields[i].caches[j].sVal);
 												}
 											}
 										}
@@ -1135,8 +804,6 @@ void xlsx_pivots_context::Impl::serialize_cache(std::wostream & strm)
 								}
 							}
 						}							
-
-						index_current++;
 					}
 				}
 			}
@@ -1236,7 +903,6 @@ int xlsx_pivots_context::end_table()
 	std::wstringstream	cache_strm;
 	std::wstringstream	rec_strm;
 	
-	impl_->calc_headers();
 	impl_->sort_fields();
 
 	impl_->serialize_view(view_strm);
@@ -1274,18 +940,10 @@ void xlsx_pivots_context::set_identify_categories(bool val)
 {
 	impl_->current_.identify_categories = val;
 }
-void xlsx_pivots_context::set_ignore_empty_rows(bool val)
-{
-	impl_->current_.ignore_empty_rows = val;
-}
 void xlsx_pivots_context::set_drill(bool val)
 {
 	impl_->current_.drill_enabled = val;
 }
-void xlsx_pivots_context::set_grand_total(int type)
-{
-	impl_->current_.grand_total = type;
-}
 void xlsx_pivots_context::start_field()
 {
 	Impl::_field f;
@@ -1297,86 +955,75 @@ void xlsx_pivots_context::set_field_name(std::wstring name)
 {
 	impl_->current_.fields.back().name = name;
 }
-void xlsx_pivots_context::set_field_display(std::wstring name)
-{
-	impl_->current_.fields.back().display_name = name;
-}
 void xlsx_pivots_context::set_field_type(int type, int hierarchy)
 {
 	impl_->current_.fields.back().type		= type;
 	impl_->current_.fields.back().hierarchy = hierarchy;
 
-	//if ( impl_->current_.fields.back().name.empty() &&
-	//	!impl_->current_.fields.back().data_layout)
-	//	return;
+	if ( impl_->current_.fields.back().name.empty() &&
+		!impl_->current_.fields.back().data_layout)
+		return;
 
-	//switch(type)
-	//{
-	//	case 0:	// column
-	//	{
-	//		if (impl_->current_.fields.back().data_layout)
-	//		{
-	//			if (impl_->current_.fields.back().name.empty() && (!impl_->current_.identify_categories || hierarchy >= 0))
-	//				//impl_->current_.fields.back().repeat_item_labels )) //???? 
-	//					impl_->current_.col_fields.push_back(-2);	
-	//		}
-	//		else
-	//			impl_->current_.col_fields.push_back(impl_->current_.fields.size() - 1);	
-	//	}break;
-	//	case 1:	// data
-	//	{
-	//		int index_field = -1;
-	//		
-	//		for (size_t i = 0; i < impl_->current_.fields.size() - 1; i++)
-	//		{
-	//			if (impl_->current_.fields[i].name == impl_->current_.fields.back().name && 
-	//				(impl_->current_.fields[i].type != 1 || !impl_->current_.fields.back().references.empty()))
-	//			{
-	//				impl_->current_.fields[i].bDataFieldEnabled = true;
-	//				index_field = i;
-	//				break;
-	//			}
-	//		}
-	//		if (index_field >= 0)
-	//		{
-	//			impl_->current_.fields.back().type = 7; //skip 
-	//			impl_->current_.fields_count--; 
-	//			
-	//			if (!impl_->current_.fields.back().references.empty())
-	//			{
-	//				impl_->current_.fields.back().references_field = index_field;
-	//				impl_->current_.fields.back().bDataFieldEnabled = true;
-	//			
-	//				index_field = impl_->current_.fields.size() - 1;
-	//			}
-	//		}
-	//		else
-	//		{
-	//			index_field = impl_->current_.fields.size() - 1;
-	//			impl_->current_.fields.back().bDataFieldEnabled = true;
-	//		}
-	//		impl_->current_.data_fields.push_back(index_field);	
-	//	}break;
- //       case 2:	// hidden
-	//		break;
- //       case 3:	// page
-	//		impl_->current_.page_fields.push_back(impl_->current_.fields.size() - 1);	
-	//		break;
-	//	case 4:	// row
-	//		if (impl_->current_.fields.back().data_layout)
-	//		{
-	//			impl_->current_.data_on_row = true;
+	switch(type)
+	{
+		case 0:	// column
+		{
+			if (impl_->current_.fields.back().data_layout)
+			{
+				if (impl_->current_.fields.back().name.empty() && (!impl_->current_.identify_categories || hierarchy >= 0))
+					//impl_->current_.fields.back().repeat_item_labels )) //???? 
+						impl_->current_.col_fields.push_back(-2);	
+			}
+			else
+				impl_->current_.col_fields.push_back(impl_->current_.fields.size() - 1);	
+		}break;
+		case 1:	// data
+		{
+			int index_field = -1;
+			
+			for (size_t i = 0; i < impl_->current_.fields.size(); i++)
+			{
+				if (impl_->current_.fields[i].name == impl_->current_.fields.back().name && 
+					impl_->current_.fields[i].type != 1)
+				{
+					impl_->current_.fields[i].bDataFieldEnabled = true;
+					index_field = i;
+					break;
+				}
+			}
+			if (index_field >= 0)
+			{
+				impl_->current_.fields.back().type = 7;
+				impl_->current_.fields_count--; 
+				impl_->current_.data_fields.push_back(index_field);	
+			}
+			else
+			{
+				index_field = impl_->current_.fields.size() - 1;
+				impl_->current_.fields.back().bDataFieldEnabled = true;
+				impl_->current_.data_fields.push_back(index_field);	
+			}
+		}break;
+        case 2:	// hidden
+			break;
+        case 3:	// page
+			impl_->current_.page_fields.push_back(impl_->current_.fields.size() - 1);	
+			break;
+		case 4:	// row
+			if (impl_->current_.fields.back().data_layout)
+			{
+				impl_->current_.data_on_row = true;
 
-	//			if (impl_->current_.fields.back().name.empty() && (!impl_->current_.identify_categories || hierarchy >= 0))
-	//				//(impl_->current_.fields.back().repeat_item_labels ||
-	//			 //  !impl_->current_.identify_categories ))
-	//					impl_->current_.row_fields.push_back(-2);	
+				if (impl_->current_.fields.back().name.empty() && (!impl_->current_.identify_categories || hierarchy >= 0))
+					//(impl_->current_.fields.back().repeat_item_labels ||
+				 //  !impl_->current_.identify_categories ))
+						impl_->current_.row_fields.push_back(-2);	
 
-	//		}
-	//		else
-	//			impl_->current_.row_fields.push_back(impl_->current_.fields.size() - 1);	
-	//		break;
-	//}
+			}
+			else
+				impl_->current_.row_fields.push_back(impl_->current_.fields.size() - 1);	
+			break;
+	}
 }
 void xlsx_pivots_context::set_field_function(int type)
 {
@@ -1411,64 +1058,18 @@ void xlsx_pivots_context::set_field_groups_source(std::wstring name)
 {
 	impl_->current_.fields.back().source_groups = name;
 }
-void xlsx_pivots_context::start_field_group()
-{
-	impl_->current_.in_group = true;
-	Impl::_group group;
-	impl_->current_.fields.back().groups.push_back(group);
-}
-void xlsx_pivots_context::set_field_group_name (std::wstring name)
-{
-	impl_->current_.fields.back().groups.back().name = name;
-}
-void xlsx_pivots_context::end_field_group()
-{
-	impl_->current_.in_group = false;
-}
 void xlsx_pivots_context::set_field_sort(int type)
 {
 	impl_->current_.fields.back().sort = type + 1;
 }
-void xlsx_pivots_context::start_field_reference()
-{
-	Impl::_reference ref;
-	impl_->current_.fields.back().references.push_back(ref);
-}
-void xlsx_pivots_context::end_field_reference()
-{
-}
-void xlsx_pivots_context::set_field_ref_name(std::wstring name)
-{
-	impl_->current_.fields.back().references.back().name = name;
-
-	for (size_t i = 0; i < impl_->current_.fields.size(); i++)
-	{
-		if (impl_->current_.fields[i].name == name)
-		{
-			impl_->current_.fields[i].used_in_referenes = true;
-		}
-	}
-}
-void xlsx_pivots_context::set_field_ref_type (int type)
-{
-	impl_->current_.fields.back().references.back().type = type;
-}
-void xlsx_pivots_context::set_field_ref_member_name(std::wstring name)
-{
-	impl_->current_.fields.back().references.back().member_name = name;
-}
-void xlsx_pivots_context::set_field_ref_member_type(int type)
-{
-	impl_->current_.fields.back().references.back().member_type = type;
-}
-void xlsx_pivots_context::add_field_cache(int index, std::wstring value, bool show_details)
+void xlsx_pivots_context::add_field_cache(int index, std::wstring value)
 {
 	if (index < 0)
 		index = impl_->current_.fields.back().caches.size();
 
 	while (index > impl_->current_.fields.back().caches.size())
 	{
-		Impl::_field_value f(L"", L"m", true);
+		Impl::_field_value f(L"", L"m");
 
 		impl_->current_.fields.back().caches.push_back(f);
 		impl_->current_.fields.back().bEmpty = true;
@@ -1529,21 +1130,15 @@ void xlsx_pivots_context::add_field_cache(int index, std::wstring value, bool sh
 			impl_->current_.fields.back().bString = true;
 		}
 	}
-	impl_->current_.fields.back().caches.push_back(Impl::_field_value(value, node_name, show_details));
-
-	if (impl_->current_.in_group)
-	{
-		impl_->current_.fields.back().groups.back().caches.push_back(impl_->current_.fields.back().caches.back());
-	}
-
+	impl_->current_.fields.back().caches.push_back(Impl::_field_value(value, node_name));
 }
 void xlsx_pivots_context::end_field()
 {
-	//if (impl_->current_.fields.back().name.empty())
-	//{
-	//	impl_->current_.fields_count--; 
-	//	impl_->current_.fields.pop_back();
-	//}
+	if (impl_->current_.fields.back().name.empty())
+	{
+		impl_->current_.fields_count--; 
+		impl_->current_.fields.pop_back();
+	}
 }
 void xlsx_pivots_context::set_source_range(std::wstring table_name, std::wstring ref)
 {

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.h

@@ -51,31 +51,17 @@ public:
 
 	void start_field ();
 		void set_field_name (std::wstring name);
-		void set_field_display (std::wstring name);
 		void set_field_type (int type, int hierarchy);
 		void set_field_function (int type);
 		void set_field_user_function (std::wstring f);
 		void add_field_subtotal (int function_type);
-		void add_field_cache (int index, std::wstring value, bool show_details = true);
+		void add_field_cache (int index, std::wstring value);
 		void set_field_show_empty (bool val);
 		void set_field_data_layout (bool val);		
 		void set_field_sort (int type);
-		void set_repeat_item_labels(bool val);
-
 		void set_field_groups (int type);
 		void set_field_groups_source(std::wstring name);
-
-		void start_field_group();
-			void set_field_group_name (std::wstring name);
-		void end_field_group();
-
-		void start_field_reference();
-			void set_field_ref_name(std::wstring name);
-			void set_field_ref_type (int type);
-			void set_field_ref_member_name(std::wstring name);
-			void set_field_ref_member_type(int type);
-		void end_field_reference();
-
+		void set_repeat_item_labels(bool val);
 	void end_field();
 
 	int get_count();
@@ -87,9 +73,7 @@ public:
 	void add_button_header(std::wstring ref);
 
 	void set_identify_categories(bool val);
-	void set_ignore_empty_rows(bool val);
 	void set_drill(bool val);
-	void set_grand_total(int type);
 
 	void set_source_range(std::wstring table_name, std::wstring ref);
 	
@@ -114,6 +98,7 @@ public:
 private:
     class Impl;
     _CP_PTR(Impl) impl_;
+              
 };
 
 }

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -133,8 +133,7 @@ xlsx_table_state::xlsx_table_state(xlsx_conversion_context * Context, std::wstri
     xlsx_drawing_context_	(Context->get_drawing_context_handle()),
     xlsx_comments_context_	(Context->get_comments_context_handle()),
     table_column_last_width_(0.0),
-	in_cell(false),
-	bEndTable(false)
+	in_cell(false)
 
 {        
 	memset(&group_row_,0,sizeof(_group_row));

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

@@ -91,9 +91,6 @@ public:
     void end_row		();
 
 	void add_empty_row(int count);
-
-	void set_end_table(){ bEndTable = true; }
-	bool get_end_table(){ return bEndTable; }
     
 	std::wstring current_row_style			() const;
     std::wstring default_row_cell_style		() const;
@@ -156,7 +153,6 @@ public:
 	friend class xlsx_table_context;
 
 private:	
-	bool								bEndTable;
     xlsx_conversion_context *			context_;    
 
     std::wstring						tableName_;

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/xlsx_utils.cpp

@@ -195,14 +195,7 @@ std::wstring cellType2Str(XlsxCellType::type type)
 
 boost::int64_t convertDate(int Year, int Month, int Day)
 {
-	if (Year < 1400 || Year >10000)
-		return - 1;
- 	if (Month < 1 || Month > 12)
-		return - 1;
-	if (Day < 1 || Day > 31)
-		return - 1;
-	
-	boost::int64_t daysFrom1900  =  boost::gregorian::date_duration(boost::gregorian::date(Year, Month, Day) - boost::gregorian::date(1900, 1, 1)).days() + 1;
+    boost::int64_t daysFrom1900  =  boost::gregorian::date_duration(boost::gregorian::date(Year, Month, Day) - boost::gregorian::date(1900, 1, 1)).days() + 1;
 
     if (Year <= 1900 && 
         Month <= 2 &&

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -401,7 +401,7 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		std::vector<std::wstring>		cell_cash;
 		std::vector<std::wstring>		cat_cash;
 
-		calc_cache_series (domain_cell_range_adress_,			domain_cash);
+		calc_cache_series (domain_cell_range_adress_,	domain_cash);
 		calc_cache_series (series_[i].cell_range_address_,		cell_cash);
 		
 		if (categories_.size() >0)
@@ -462,19 +462,10 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 
 	std::sort(axises_.begin(), axises_.end(), axises_sort());//file_1_ (1).odp
 	
-	bool x_enabled	= false;
-	bool y_enabled	= false;
-	bool z_enabled	= false;
-	bool is3D		= false;
+	bool x_enabled = false;
+	bool y_enabled = false;
+	bool z_enabled = false;
 	
-	_CP_OPT(bool) boolVal;
-	odf_reader::GetProperty(plot_area_.properties_, L"three-dimensional", boolVal);
-
-	if ((boolVal) && (*boolVal)) 
-	{
-		is3D = true;
-	}
-
 	for (int i = 0; i < axises_.size(); i++)
 	{
 		axis & a  = axises_[i];
@@ -490,8 +481,6 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 
 			if (class_ == chart_stock && a.type_ == 3 )		
 				a.type_ = 4; //шкала дат.
-
-			if (is3D) a.type_ = 1; // шкала категорий
 			
 			x_enabled = true;
 		}
@@ -510,7 +499,7 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		}
 		else if (a.dimension_ == L"z")
 		{
-			is3D = true;
+			chart_context.set_3D_chart (true);
 			continue;
 			a.type_ = 2;
 			z_enabled = true;
@@ -518,18 +507,6 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 
 		chart_context.add_axis(a.type_, a);
 	}
-
-	if (is3D)
-	{
-		if (!z_enabled)
-		{
-			chart::axis a;
-			a.type_ = 0;	// blank
-
-			chart_context.add_axis(a.type_, a);
-		}
-		chart_context.set_3D_chart (true);
-	}
 }
 
 //----------------------------------------------------------------------------------------
@@ -762,28 +739,6 @@ 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::legend				legend_;
+	chart::simple				legend_;
 	chart::plot_area			plot_area_;
 
 	chart::simple				wall_;

ASCOfficeOdfFile/src/odf/chart_objects.h

@@ -76,7 +76,6 @@ namespace chart {
 	struct simple
 	{
 		simple() : bEnabled(false) {}
-		
 		bool					bEnabled;
 		std::vector<_property>	properties_; 
  		std::vector<_property>	text_properties_;
@@ -93,11 +92,6 @@ 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/bool.cpp

@@ -46,7 +46,8 @@ std::wostream & operator << (std::wostream & _Wostream, const Bool & _Val)
 }
 Bool Bool::parse(const std::wstring & Str)
 {
-    std::wstring tmp = XmlUtils::GetLower(Str);
+    std::wstring tmp = Str;
+	XmlUtils::GetLower(tmp);
 
 	if (tmp == L"0" || tmp == L"false") return Bool(false);
 	else return Bool(true);

ASCOfficeOdfFile/src/odf/datatypes/calcext_type.cpp

@@ -58,9 +58,6 @@ 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;
@@ -87,8 +84,6 @@ 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,8 +49,7 @@ public:
         Minimum,
         AutoMaximum,
         AutoMinimum,
-		Formula,
-		Percentile
+		Formula
     };
 
     calcext_type() {}

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -306,7 +306,7 @@ std::wstring draw_object_ole::detectObject(const std::wstring &fileName)
 		return L"";
 	}
 	std::wstring prog;
-	POLE::Stream* pStream = new POLE::Stream(storage, L"CompObj");
+	POLE::Stream* pStream = new POLE::Stream(storage, "CompObj");
 	if ((pStream) && (pStream->size() > 28))
 	{
 		//skip the CompObjHeader

ASCOfficeOdfFile/src/odf/font_face.h

@@ -144,6 +144,7 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
     virtual void add_text(const std::wstring & Text);
 };
+
 CP_REGISTER_OFFICE_ELEMENT2(svg_font_face_name);
 
 //  svg:definition-src
@@ -163,8 +164,10 @@ 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>
 {
@@ -230,6 +233,7 @@ public:
 
     friend class odf_document;
 };
+
 CP_REGISTER_OFFICE_ELEMENT2(style_font_face);
 
 //  office-font-face-decls
@@ -253,6 +257,7 @@ 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);
 
 }