.

Release/v5.2.0

.gitignore

@@ -47,8 +47,6 @@ ASCOfficeXlsFile2/win32/_ASCOfficeXlsFile2_p.c
 ASCOfficeXlsFile2/win32/dlldata.c
 OfficeUtils/win32/OfficeUtilsLib/OfficeUtilsLib/ReadMe.txt
 X2tConverter/**/Makefile.*
-X2tConverter/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/Makefile
-X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.7z
 *.obj
 *.pdb

ASCOfficeDocFile/Common/FormatUtils.h

@@ -52,9 +52,9 @@
     #include <string.h>
 #endif
 
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include "../../DesktopEditor/common/Types.h"
 #include "../../Common/DocxFormat/Source/Base/unicode_util.h"
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include "../../UnicodeConverter/UnicodeConverter.h"
 
 #include <boost/format.hpp>

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
+	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
 		if (!doc || !docx) return S_FALSE;
 		
@@ -202,18 +202,20 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
+        long result = S_FALSE;
+
 		WordDocument			doc(progress, m_sTempFolder);
 		WordprocessingDocument	docx(strDstDirectory, &doc);
 		
-		_UINT32 result = doc.LoadDocument(strSrcFile, password);
+		result = doc.LoadDocument(strSrcFile, password);
 
-        if (result == 0)
+        if (result == S_OK)
 		{
 			result = Convert(&doc, &docx, progress);
 
-            if (result == 0)
+            if (result == S_OK)
 			{
 				docx.SaveDocument(bMacros);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include <string>
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 struct ProgressCallback;
 
@@ -49,9 +48,9 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		_UINT32 LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
-		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
+		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
 	};
 }

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -484,266 +484,6 @@ namespace DocFileFormat
 		return result_cp;
 	}
 
-	void DocumentMapping::writeField(const std::wstring& sFieldString, int cpFieldStart, int cpFieldEnd)
-	{
-		_fieldLevels.push_back(fieldLevels());
-		
-		std::vector<std::wstring> arField;
-		boost::algorithm::split(arField, sFieldString, boost::algorithm::is_any_of(L"\\"), boost::algorithm::token_compress_on);
-		
-		std::wstring f;
-		std::wstring EMBED		( L"EMBED" );
-		std::wstring embed		( L"embed" );
-		std::wstring LINK		( L"LINK" );
-        std::wstring FORM		( L"FORM" );
-        std::wstring Excel		( L"Excel" );
-        std::wstring Word		( L"Word" );
-        std::wstring opendocument(L"opendocument" );
-        std::wstring Equation	( L"Equation" );
-        std::wstring MERGEFORMAT( L"MERGEFORMAT" );
-        std::wstring QUOTE		( L"QUOTE" );
-        std::wstring chart		( L"Chart" );
-        std::wstring PBrush		( L"PBrush" );
-        std::wstring TOC		( L"TOC" );
-        std::wstring HYPERLINK	( L"HYPERLINK" );
-        std::wstring PAGEREF	( L"PAGEREF" );
-        std::wstring PAGE		( L"PAGE" );
-        std::wstring SHAPE		( L"SHAPE" );
-
-		if (arField.empty() == false)
-			f = arField[0];
-		else
-			f = sFieldString;
-
-		bool bChart			= search( f.begin(), f.end(), chart.begin(),		chart.end())			!= f.end();
-		bool bEMBED			= search( f.begin(), f.end(), EMBED.begin(),		EMBED.end())			!= f.end() ||
-							  search( f.begin(), f.end(), embed.begin(),		embed.end())			!= f.end();
-		bool bLINK			= search( f.begin(), f.end(), LINK.begin(),			LINK.end())				!= f.end();
-		bool bOpendocument	= search( f.begin(), f.end(), opendocument.begin(), opendocument.end())		!= f.end();
-		bool bFORM			= search( f.begin(), f.end(), FORM.begin(),			FORM.end())				!= f.end();
-		bool bMERGEFORMAT	= search( f.begin(), f.end(), MERGEFORMAT.begin(),	MERGEFORMAT.end())		!= f.end();
-		bool bExcel			= search( f.begin(), f.end(), Excel.begin(),		Excel.end())			!= f.end();
-		bool bWord			= search( f.begin(), f.end(), Word.begin(),			Word.end())				!= f.end();
-		bool bHYPERLINK		= search( f.begin(), f.end(), HYPERLINK.begin(),	HYPERLINK.end())		!= f.end();
-		bool bQUOTE			= search( f.begin(), f.end(), QUOTE.begin(),		QUOTE.end())			!= f.end();
-		bool bEquation		= search( f.begin(), f.end(), Equation.begin(),		Equation.end())			!= f.end();
-		bool bPAGE			= search( f.begin(), f.end(), PAGE.begin(),			PAGE.end())				!= f.end();
-		bool bTOC			= search( f.begin(), f.end(), TOC.begin(),			TOC.end())				!= f.end();
-		bool bSHAPE			= search( f.begin(), f.end(), SHAPE.begin(),		SHAPE.end())				!= f.end();
-		
-		bool bPAGEREF = false; 
-		if (bHYPERLINK && arField.size() > 1)
-		{
-			std::wstring f1 = arField[1];
-			bPAGEREF	= search( f1.begin(), f1.end(), PAGEREF.begin(), PAGEREF.end())	!= f1.end();
-		}			
-
-		if (bTOC)
-			_bContentWrite = true;
-
-		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->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();
-
-			if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
-			{
-				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 );
-					}
-				}
-			}
-
-            m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
-
-			_fieldLevels.back().bBegin = true;
-		}
-		else if ( ( bMERGEFORMAT || bExcel || bWord || bOpendocument )
-				&& 
-				( ( bEMBED || bLINK ) && bChart) )
-		{
-            m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-                m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-            m_pXmlWriter->WriteNodeEnd( L"", true, false );
-
-			int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
-
-            m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
-
-			_fieldLevels.back().bBegin = true;
-		}
-		else if (bHYPERLINK && bPAGEREF)
-		{
-			int cpFieldSep2 = cpFieldStart, cpFieldSep1 = cpFieldStart;
-			std::vector<std::wstring> toc;
-
-			if (arField.size() > 1)
-				f = arField[1];
-
-			if ( _bContentWrite )
-			{
-				m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-					m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-				m_pXmlWriter->WriteNodeEnd( L"", true );
-
-				_fieldLevels.back().bBegin = true;
-			}
-			else
-			{
-				for (size_t i = 1; i < arField.size(); i++)
-				{
-					std::wstring f1 = arField[1];
-					int d = (int)f1.find(PAGEREF);
-
-					if (d > 0)
-					{
-						_writeWebHidden = true;
-						std::wstring _writeTocLink =f1.substr(d + 9);
-						d = (int)_writeTocLink.find(L" ");
-						_writeTocLink = _writeTocLink.substr(0, d);
-						
-						_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
-						_writeAfterRun +=	_writeTocLink;
-						_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
-
-						break;								
-						//cp = cpFieldSep1;
-					}
-					//cpFieldSep1 = cpFieldSep2;
-				}
-				_skipRuns = 5; //with separator
-			}
-		}
-		else if ( bEMBED ||	(bLINK && !bHYPERLINK)|| bQUOTE)						
-		{
-			int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::Picture);
-			int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::FieldSeparator);
-
-			if (cpPic < cpFieldEnd)
-			{
-				int fcPic = m_document->FindFileCharPos( cpPic );
-				std::list<CharacterPropertyExceptions*>* chpxs	=	m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
-				
-				CharacterPropertyExceptions* chpxObj =	chpxs->front();
-
-				RevisionData oData = RevisionData(chpxObj);
-
-				CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &oData, _lastValidPapx, false);
-				if(rPr)
-				{
-					chpxObj->Convert(rPr);
-					RELEASEOBJECT(rPr);
-				}					
-				XMLTools::CStringXmlWriter	oleWriter;
-				XMLTools::CStringXmlWriter	oleObjectWriter;
-				
-				VMLPictureMapping	oVmlMapper (m_context, &oleWriter, true, _caller);
-
-				if (!m_shapeIdOwner.empty())		//4571833.doc
-					oVmlMapper.m_shapeId = m_shapeIdOwner;
-
-				if (m_document->nWordVersion > 0)
-				{							
-					OleObject ole ( chpxObj, m_document);
-					
-                    oleWriter.WriteNodeBegin (L"w:object", true);
-                        oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ));
-                        oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ));
-                    oleWriter.WriteNodeEnd( L"", true, false );
-
-					ole.pictureDesciptor.Convert(&oVmlMapper);
-					OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId);
-					
-					ole.Convert( &oleObjectMapping );
-
-					_lastOLEObject = oleObjectWriter.GetXmlString();
-				}
-				else
-				{
-					PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->nWordVersion);
-					
-                    oleWriter.WriteNodeBegin (L"w:object", true);
-                        oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) );
-                        oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) );
-                    oleWriter.WriteNodeEnd( L"", true, false );
-					
-					pic.Convert(&oVmlMapper);
-					RELEASEOBJECT(chpxs);
-
-					if ( cpFieldSep < cpFieldEnd  && m_document->m_PieceTable)
-					{
-						int fcFieldSep = m_document->m_PieceTable->FileCharacterPositions->operator []( cpFieldSep );
-						int fcFieldSep1 = m_document->FindFileCharPos( cpFieldSep );
-						
-						std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions( fcFieldSep, ( fcFieldSep + 1 ) ); 
-						CharacterPropertyExceptions* chpxSep = chpxs->front();
-						
-						OleObject ole ( chpxSep, m_document);
-						OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &pic, _caller, oVmlMapper.m_shapeId );
-						
-						if (oVmlMapper.m_isEmbedded)
-						{
-							ole.isEquation		= oVmlMapper.m_isEquation;
-							ole.isEmbedded		= oVmlMapper.m_isEmbedded;
-							ole.emeddedData		= oVmlMapper.m_embeddedData;
-						}
-						ole.Convert( &oleObjectMapping );
-
-						_lastOLEObject = oleObjectWriter.GetXmlString();
-						
-						RELEASEOBJECT( chpxs );
-					}
-				}
-				oleWriter.WriteString( _lastOLEObject );
-                oleWriter.WriteNodeEnd( L"w:object" );
-
-				if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
-				{
-					//нельзя в Run писать oMath
-					//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
-					_writeAfterRun = oVmlMapper.m_equationXml;
-				}
-				else
-				{
-					m_pXmlWriter->WriteString(oleWriter.GetXmlString());
-				}	
-			}
-
-			_skipRuns		= 3;
-			_embeddedObject	= true;
-		}					
-		else
-		{
-            m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
-                m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
-            m_pXmlWriter->WriteNodeEnd( L"", true );
-
-			_fieldLevels.back().bBegin = true;
-		}
-	}
-
 	// Writes the given text to the document
 	int DocumentMapping::writeText(std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText)
 	{
@@ -836,15 +576,289 @@ namespace DocFileFormat
 			}
 			else if (TextMark::FieldBeginMark == code)
 			{
+				_fieldLevels.push_back(fieldLevels());
+
 				int cpFieldStart = initialCp + i;
 				int cpFieldEnd = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 				
-				std::wstring sFieldString;
+				std::wstring f, sFieldString;
 				if (cpFieldEnd < (int)m_document->Text->size())
 					sFieldString = std::wstring( ( m_document->Text->begin() + cpFieldStart ), ( m_document->Text->begin() + cpFieldEnd + 1 ) );
 
-				writeField(sFieldString, cpFieldStart, cpFieldEnd);
+				std::vector<std::wstring> arField;
+				boost::algorithm::split(arField, sFieldString, boost::algorithm::is_any_of(L"\\"), boost::algorithm::token_compress_on);
+				
+				std::wstring EMBED		( L"EMBED" );
+  				std::wstring embed		( L"embed" );
+				std::wstring LINK		( L"LINK" );
+                std::wstring FORM		( L"FORM" );
+                std::wstring Excel		( L"Excel" );
+                std::wstring Word		( L"Word" );
+                std::wstring opendocument(L"opendocument" );
+                std::wstring Equation	( L"Equation" );
+                std::wstring MERGEFORMAT( L"MERGEFORMAT" );
+                std::wstring QUOTE		( L"QUOTE" );
+                std::wstring chart		( L"Chart" );
+                std::wstring PBrush		( L"PBrush" );
+                std::wstring TOC		( L"TOC" );
+                std::wstring HYPERLINK	( L"HYPERLINK" );
+                std::wstring PAGEREF	( L"PAGEREF" );
+                std::wstring PAGE		( L"PAGE" );
+                std::wstring SHAPE		( L"SHAPE" );
 
+				if (arField.empty() == false)
+					f = arField[0];
+				else
+					f = sFieldString;
+
+				bool bChart			= search( f.begin(), f.end(), chart.begin(),		chart.end())			!= f.end();
+				bool bEMBED			= search( f.begin(), f.end(), EMBED.begin(),		EMBED.end())			!= f.end() ||
+									  search( f.begin(), f.end(), embed.begin(),		embed.end())			!= f.end();
+				bool bLINK			= search( f.begin(), f.end(), LINK.begin(),			LINK.end())				!= f.end();
+				bool bOpendocument	= search( f.begin(), f.end(), opendocument.begin(), opendocument.end())		!= f.end();
+				bool bFORM			= search( f.begin(), f.end(), FORM.begin(),			FORM.end())				!= f.end();
+				bool bMERGEFORMAT	= search( f.begin(), f.end(), MERGEFORMAT.begin(),	MERGEFORMAT.end())		!= f.end();
+				bool bExcel			= search( f.begin(), f.end(), Excel.begin(),		Excel.end())			!= f.end();
+				bool bWord			= search( f.begin(), f.end(), Word.begin(),			Word.end())				!= f.end();
+				bool bHYPERLINK		= search( f.begin(), f.end(), HYPERLINK.begin(),	HYPERLINK.end())		!= f.end();
+				bool bQUOTE			= search( f.begin(), f.end(), QUOTE.begin(),		QUOTE.end())			!= f.end();
+				bool bEquation		= search( f.begin(), f.end(), Equation.begin(),		Equation.end())			!= f.end();
+				bool bPAGE			= search( f.begin(), f.end(), PAGE.begin(),			PAGE.end())				!= f.end();
+				bool bTOC			= search( f.begin(), f.end(), TOC.begin(),			TOC.end())				!= f.end();
+				bool bSHAPE			= search( f.begin(), f.end(), SHAPE.begin(),		SHAPE.end())				!= f.end();
+				
+				bool bPAGEREF = false; 
+				if (bHYPERLINK && arField.size() > 1)
+				{
+					std::wstring f1 = arField[1];
+					bPAGEREF	= search( f1.begin(), f1.end(), PAGEREF.begin(), PAGEREF.end())	!= f1.end();
+				}			
+
+				if (bTOC)
+					_bContentWrite = true;
+
+				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->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();
+
+					if (bFORMTEXT || bFORMCHECKBOX || bFORMDROPDOWN)
+					{
+						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 );
+							}
+						}
+					}
+
+                    m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
+
+					_fieldLevels.back().bBegin = true;
+				}
+				else if ( ( bMERGEFORMAT || bExcel || bWord || bOpendocument )
+						&& 
+						( ( bEMBED || bLINK ) && bChart) )
+				{
+                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+                        m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+                    m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+					int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
+
+                    m_pXmlWriter->WriteNodeEnd( L"w:fldChar" );
+
+					_fieldLevels.back().bBegin = true;
+				}
+				else if (bHYPERLINK && bPAGEREF)
+				{
+					int cpFieldSep2 = cpFieldStart, cpFieldSep1 = cpFieldStart;
+					std::vector<std::wstring> toc;
+
+					if (arField.size() > 1)
+						f = arField[1];
+
+					if ( _bContentWrite )
+					{
+						m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+							m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+						m_pXmlWriter->WriteNodeEnd( L"", true );
+
+						_fieldLevels.back().bBegin = true;
+					}
+					else
+					{
+						for (size_t i = 1; i < arField.size(); i++)
+						{
+							std::wstring f1 = arField[1];
+							int d = (int)f1.find(PAGEREF);
+
+							if (d > 0)
+							{
+								_writeWebHidden = true;
+								std::wstring _writeTocLink =f1.substr(d + 9);
+								d = (int)_writeTocLink.find(L" ");
+								_writeTocLink = _writeTocLink.substr(0, d);
+								
+								_writeAfterRun	=	std::wstring (L"<w:hyperlink w:anchor = \"");
+								_writeAfterRun +=	_writeTocLink;
+								_writeAfterRun +=	std::wstring (L"\" w:history=\"1\">");
+
+								break;								
+								//cp = cpFieldSep1;
+							}
+							//cpFieldSep1 = cpFieldSep2;
+						}
+						_skipRuns = 5; //with separator
+					}
+				}
+				//else if ( bHYPERLINK )
+				//{//todooo - выделение гиперссылки отдельно
+				//	std::vector<std::wstring> arRefs;
+				//	boost::algorithm::split(arRefs, f, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
+				//	
+				//	std::wstring sLink = arRefs[2];
+				//	m_pXmlWriter->WriteNodeBegin( L"w:hyperlink", true );
+
+				//	int relID = m_context->_docx->RegisterHyperlink(_caller, sLink);
+				//	m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
+				//	m_pXmlWriter->WriteAttribute( L"w:history", 1 );
+				//	m_pXmlWriter->WriteNodeEnd( L"", true, false );
+
+				//	if (arRefs.size() > 2)
+				//	{
+				//		writeTextElement(arRefs[3].substr(1, arRefs[3].length() - 2), textType);
+				//	}
+				//	m_pXmlWriter->WriteNodeEnd( L"w:hyperlink", false, true );
+
+				//	_skipRuns = 1;
+				//}
+				else if ( bEMBED ||	(bLINK && !bHYPERLINK)|| bQUOTE)						
+				{
+					int cpPic		=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::Picture);
+					int cpFieldSep	=	searchNextTextMark(m_document->Text, cpFieldStart,	TextMark::FieldSeparator);
+
+					if (cpPic < cpFieldEnd)
+					{
+						int fcPic = m_document->FindFileCharPos( cpPic );
+						std::list<CharacterPropertyExceptions*>* chpxs	=	m_document->GetCharacterPropertyExceptions(fcPic, fcPic + 1); 
+						
+						CharacterPropertyExceptions* chpxObj =	chpxs->front();
+
+						RevisionData oData = RevisionData(chpxObj);
+
+						CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &oData, _lastValidPapx, false);
+						if(rPr)
+						{
+							chpxObj->Convert(rPr);
+							RELEASEOBJECT(rPr);
+						}					
+						XMLTools::CStringXmlWriter	oleWriter;
+						XMLTools::CStringXmlWriter	oleObjectWriter;
+						
+						VMLPictureMapping	oVmlMapper (m_context, &oleWriter, true, _caller);
+
+						if (!m_shapeIdOwner.empty())		//4571833.doc
+							oVmlMapper.m_shapeId = m_shapeIdOwner;
+
+						if (m_document->nWordVersion > 0)
+						{							
+							OleObject ole ( chpxObj, m_document);
+							
+                            oleWriter.WriteNodeBegin (L"w:object", true);
+                                oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ));
+                                oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ));
+                            oleWriter.WriteNodeEnd( L"", true, false );
+
+							ole.pictureDesciptor.Convert(&oVmlMapper);
+							OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId);
+							
+							ole.Convert( &oleObjectMapping );
+
+							_lastOLEObject = oleObjectWriter.GetXmlString();
+						}
+						else
+						{
+							PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->nWordVersion);
+							
+                            oleWriter.WriteNodeBegin (L"w:object", true);
+                                oleWriter.WriteAttribute( L"w:dxaOrig", FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ) );
+                                oleWriter.WriteAttribute( L"w:dyaOrig", FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ) );
+                            oleWriter.WriteNodeEnd( L"", true, false );
+							
+							pic.Convert(&oVmlMapper);
+							RELEASEOBJECT(chpxs);
+
+							if ( cpFieldSep < cpFieldEnd  && m_document->m_PieceTable)
+							{
+								int fcFieldSep = m_document->m_PieceTable->FileCharacterPositions->operator []( cpFieldSep );
+								int fcFieldSep1 = m_document->FindFileCharPos( cpFieldSep );
+								
+								std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions( fcFieldSep, ( fcFieldSep + 1 ) ); 
+								CharacterPropertyExceptions* chpxSep = chpxs->front();
+								
+								OleObject ole ( chpxSep, m_document);
+								OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &pic, _caller, oVmlMapper.m_shapeId );
+								
+								if (oVmlMapper.m_isEmbedded)
+								{
+									ole.isEquation		= oVmlMapper.m_isEquation;
+									ole.isEmbedded		= oVmlMapper.m_isEmbedded;
+									ole.emeddedData		= oVmlMapper.m_embeddedData;
+								}
+								ole.Convert( &oleObjectMapping );
+
+								_lastOLEObject = oleObjectWriter.GetXmlString();
+								
+								RELEASEOBJECT( chpxs );
+							}
+						}
+						oleWriter.WriteString( _lastOLEObject );
+                        oleWriter.WriteNodeEnd( L"w:object" );
+
+						if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
+						{
+							//нельзя в Run писать oMath
+							//m_pXmlWriter->WriteString(oVmlMapper.m_equationXml);
+							_writeAfterRun = oVmlMapper.m_equationXml;
+						}
+						else
+						{
+							m_pXmlWriter->WriteString(oleWriter.GetXmlString());
+						}	
+					}
+
+					_skipRuns		= 3;
+					_embeddedObject	= true;
+				}					
+				else
+				{
+                    m_pXmlWriter->WriteNodeBegin( L"w:fldChar", true );
+                        m_pXmlWriter->WriteAttribute( L"w:fldCharType", L"begin" );
+                    m_pXmlWriter->WriteNodeEnd( L"", true );
+
+					_fieldLevels.back().bBegin = true;
+				}
 			}
 			else if (TextMark::FieldSeparator == code)
 			{
@@ -1028,7 +1042,7 @@ namespace DocFileFormat
 				else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
 				{
                     m_pXmlWriter->WriteNodeBegin( L"w:endnoteReference", true );
-					EndnoteDescriptor* desc = dynamic_cast<EndnoteDescriptor*>(m_document->EndnoteReferenceCharactersPlex->Elements[_endnoteNr]);
+					EndnoteDescriptor* desc = dynamic_cast<EndnoteDescriptor*>(m_document->EndnoteReferenceCharactersPlex->Elements[_footnoteNr]);
 					if (desc && desc->aEndIdx == 0)
 					{
 						m_pXmlWriter->WriteAttribute( L"w:customMarkFollows", L"1");
@@ -1064,21 +1078,7 @@ namespace DocFileFormat
 
 			cp++;
 		}
-		if (std::wstring::npos != text.find(L"EMBED"))
-		{//если есть мааркер конца поля и маркер замещающей картинки и нету маркера начала
-			//О реорганизации территориальных органов ПФР с 01.11.2018.doc
-			int cpFieldStart	= initialCp;
-			int cpPic			= searchNextTextMark(m_document->Text, cpFieldStart, TextMark::Picture);
-			int cpFieldEnd		= searchNextTextMark( m_document->Text, cpFieldStart, TextMark::FieldEndMark );
 
-			bool bStartField = _fieldLevels.empty() ? false : (_fieldLevels.back().bBegin && !_fieldLevels.back().bSeparate);
-
-			if (cpFieldStart < cpPic && cpPic < cpFieldEnd && !bStartField)
-			{
-				writeField(text, cpFieldStart, cpFieldEnd);
-				text.clear();
-			}
-		}
         if (!text.empty())
 		{
             //bool preserve_space = (text.find(L"\x20")) != text.npos) ? true : false;
@@ -1348,8 +1348,6 @@ namespace DocFileFormat
 					{
 						iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
 					}break;
-					default:
-						break;
 				}
 			}
 			if (nestingLevel == iTap_current)
@@ -1379,8 +1377,6 @@ namespace DocFileFormat
 
 							AddBoundary(boundary2, max_boundary, boundaries);
 						}break;
-						default:
-							break;
 					}
 				}
 			}

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h

@@ -85,17 +85,21 @@ namespace DocFileFormat
 		int getCurrentSection	(int cp);
 //---------------------------------
 		bool isSectionEnd		( int cp );
-
+	// Writes a Paragraph that starts at the given cp and 
+	// ends at the next paragraph end mark or section end mark
 		int writeParagraph( int cp, int cpEnd ); 
+	// Writes a Paragraph that starts at the given cpStart and 
+	// ends at the given cpEnd
 		int writeParagraph( int initialCp, int cpEnd, bool sectionEnd, bool lastBad = false );
+	// Writes a Paragraph RSID
+		void writeParagraphRsid( const ParagraphPropertyExceptions* papx );
+	// Writes a run with the given characters and CHPX
 		int writeRun( std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp );
-		int	writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
-		void writeParagraphRsid	( const ParagraphPropertyExceptions* papx );
+	// Writes the given text to the document	
+		int	 writeText			( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
 		void writeTextElement	( const std::wstring& text, const std::wstring& textType );
         void writeTextStart		( const std::wstring& textType, bool preserve_space);
 		void writeTextEnd		( const std::wstring& textType );
-		void writeField			(const std::wstring& sFieldString, int cpFieldStart, int cpFieldEnd);
-
 		
 		std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
 		std::vector<int> searchAnnot(std::vector<wchar_t>* chars, int initialCp);

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -110,7 +110,7 @@ namespace DocFileFormat
 	typedef struct FibWord2
 	{
 		unsigned int Spare  = 0;
-		unsigned short rgwSpare0[3];
+		unsigned char rgwSpare0[3];
 
 		unsigned int fcPlcMcr = 0;
 		unsigned int lcbPlcMcr = 0;
@@ -1312,10 +1312,10 @@ namespace DocFileFormat
 			
 			flag16 = reader.ReadUInt16(); //10
 			
-			m_FibBase.fDot				= ((flag16 & 0x0001) >> 2) != 0;
-			m_FibBase.fGlsy				= ((flag16 & 0x0002) >> 1) != 0;
-			m_FibBase.fComplex			= ((flag16 & 0x0004) >> 2) != 0;
-            m_FibBase.fHasPic			= ((flag16 & 0x0008) >> 3) != 0;
+			m_FibBase.fDot				= (flag16 & 0x0001) >> 2;
+			m_FibBase.fGlsy				= (flag16 & 0x0002) >> 1;
+			m_FibBase.fComplex			= (flag16 & 0x0004) >> 2;
+            m_FibBase.fHasPic			= (flag16 & 0x0008) >> 3;
             m_FibBase.cQuickSaves		= (WORD)(((int)flag16 & 0x00F0) >> 4);
             m_FibBase.fEncrypted		= FormatUtils::BitmaskToBool((int)flag16, 0x0100);
 			m_FibBase.fWhichTblStm		= FormatUtils::BitmaskToBool((int)flag16, 0x0200);

ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp

@@ -134,8 +134,6 @@ FormFieldData::FormFieldData( int type, const CharacterPropertyExceptions* chpx,
 				bNilPICFAndBinData = true; // or bPICFAndOfficeArtData - shape, pic, ole
 			}
 			break;
-			default:
-				break;
 		}
 	}
 

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -31,7 +31,6 @@
  */
 
 #include "MainDocumentMapping.h"
-#include "OfficeDrawing/FillStyleBooleanProperties.h"
 
 namespace DocFileFormat
 {
@@ -84,27 +83,16 @@ namespace DocFileFormat
 
 		if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
 		{
-			bool bFilled = true;
 			m_document->DocProperties->bDisplayBackgroundShape = true;
 			ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
 
-			OptionEntryPtr boolFill = pShape->ExtractOption(fillStyleBooleanProperties);
-
-			FillStyleBooleanProperties booleans(boolFill ? boolFill->op : 0);
-			if (booleans.fUsefFilled && !booleans.fFilled)
-			{
-				bFilled = false;
-			}
-			if (bFilled)
-			{
-				m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
-					m_pXmlWriter->WriteAttribute ( L"w:color", L"FFFFFF");
-				m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
-				
-				VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
-					pShape->Convert(&oVmlWriter);
-				m_pXmlWriter->WriteNodeEnd (L"w:background");
-			}
+			m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
+				m_pXmlWriter->WriteAttribute	( L"w:color", L"FFFFFF");
+			m_pXmlWriter->WriteNodeEnd( L"",  TRUE, FALSE );
+			
+			VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL,  _caller);
+				pShape->Convert(&oVmlWriter);
+			m_pXmlWriter->WriteNodeEnd (L"w:background");
 		}
 
 		m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -217,7 +217,7 @@ public:
 
 private:
 
-	unsigned char*			m_Data;
+	unsigned char*	m_Data;
 	unsigned long	m_Size;
 	unsigned long	m_Position;
 	bool			bMemoryCopy;

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -697,8 +697,6 @@ namespace DocFileFormat
 					{
 						isPictureBullet = FormatUtils::BitmaskToBool(FormatUtils::BytesToUInt16(iter->Arguments, 0, iter->argumentsSize), 0x1);  
 					}break;
-					default:
-						break;
 				}
 			}
 

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -97,7 +97,7 @@ namespace DocFileFormat
 								ShapeContainer* shape	=	static_cast<ShapeContainer*>(groupChild);
 								if (shape)
 								{
-									shape->m_nIndex = (int)i;
+									shape->m_nIndex = i;
 									if (shape->m_bBackground)
 									{
 										m_pBackgroud = shape;

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h

@@ -112,7 +112,7 @@ namespace DocFileFormat
 					if (lMinF <= point.x)
 					{
 						int index = (DWORD)point.x - 0x80000000;
-						if (index >= 0 && index < (int)guides.size())
+						if (index >= 0 && index < guides.size())
 						{
 							point.x = guides[index].param3;
 						}
@@ -120,7 +120,7 @@ namespace DocFileFormat
 					if (lMinF <= point.y)
 					{
 						int index = (DWORD)point.y - 0x80000000;
-						if (index >= 0 && index < (int)guides.size())
+						if (index >= 0 && index < guides.size())
 						{
 							point.y = guides[index].param3;
 						}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -60,8 +60,8 @@ namespace DocFileFormat
 			for ( size_t i = 0; i < this->Children.size(); ++i )
 			{
 				ClientAnchor *clientAnchor = dynamic_cast<ClientAnchor*>( this->Children[i] );
-				//if ( (clientAnchor) && (clientAnchor->value == 0x80000000))
-				//	m_bSkip = true; //О реорганизации территориальных органов ПФР с 01.11.2018.doc
+				if ( (clientAnchor) && (clientAnchor->value == 0x80000000))
+					m_bSkip = true;
 
 				Shape* sh = dynamic_cast<Shape*>( this->Children[i] );
 				if (sh)
@@ -101,24 +101,6 @@ namespace DocFileFormat
 			return new ShapeContainer( _reader, bodySize, typeCode, version, instance );
 		}
 
-		OptionEntryPtr ExtractOption(const PropertyId & prop) const
-		{
-			OptionEntryPtr ret;
-			for ( size_t i = 0; i < this->Children.size(); ++i )
-			{
-				ShapeOptions* opt = dynamic_cast<ShapeOptions*>( this->Children[i] );
-
-				if ( opt == NULL ) continue;
-
-				std::map<PropertyId, OptionEntryPtr>::iterator pFind = opt->OptionsByID.find(prop);
-				if (pFind != opt->OptionsByID.end())
-				{
-					ret = pFind->second;
-				}
-			}
-			return ret;
-		}
-
 		std::vector<OptionEntryPtr> ExtractOptions() const
 		{
 			std::vector<OptionEntryPtr> ret;

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.cpp

@@ -244,8 +244,6 @@ namespace DocFileFormat
 			case sprmOldCFData:
 			case sprmCFData:
 				break;
-			default:
-				break;
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/RevisionData.cpp

@@ -117,8 +117,6 @@ namespace DocFileFormat
 					this->RsidDel = FormatUtils::BytesToInt32( iter->Arguments, 0, iter->argumentsSize );
 				}
 				break;
-			default:
-				break;
 			}
 
 			//put the sprm on the revision stack

ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp

@@ -130,8 +130,6 @@ namespace DocFileFormat
 							appendValueAttribute( &pgBorders, L"w:display", L"notFirstPage" );
 
 					}break;
-					default:
-						break;
 				}
 			}
 			if (_ctx->_doc->nWordVersion == 2)

ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp

@@ -92,8 +92,6 @@ namespace DocFileFormat
 				{
 					iTap_current = FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize );
 				}break;
-				default:
-					break;
 			}
 		}
 		std::list<SinglePropertyModifier>::const_reverse_iterator rend = tapx->grpprl->rend();
@@ -320,8 +318,6 @@ namespace DocFileFormat
 					}
 				}
 				break;
-				default:
-					break;
 			}
 		}
 		if (_gridSpan <= 1 && nComputedCellWidth > _width && _width > 1)

ASCOfficeDocFile/DocDocxConverter/TableRowPropertiesMapping.cpp

@@ -70,7 +70,9 @@ namespace DocFileFormat
 				case sprmTDefTable:
 				{
 					//SprmTDefTable tdef = new SprmTDefTable(sprm.Arguments);
-				}break;	
+				}
+				break;
+
 				case sprmOldTTableHeader:
 				case sprmTTableHeader:
 				{						//header row
@@ -82,7 +84,9 @@ namespace DocFileFormat
                         XMLTools::XMLElement header( L"w:tblHeader" );
 						_trPr->AppendChild( header );
 					}
-				}break;	
+				}
+				break;
+
 				case sprmTWidthAfter:
 				{						//width after
                     XMLTools::XMLElement wAfter( L"w:wAfter" );
@@ -92,7 +96,9 @@ namespace DocFileFormat
                     XMLTools::XMLAttribute wAfterType( L"w:type", L"dxa" );
 					wAfter.AppendAttribute( wAfterType );
 					_trPr->AppendChild( wAfter, true );
-				}break;	
+				}
+				break;
+
 				case sprmTWidthBefore:
 				{						//width before
 					short before = FormatUtils::BytesToInt16( iter->Arguments, 1, iter->argumentsSize );
@@ -107,7 +113,9 @@ namespace DocFileFormat
 						wBefore.AppendAttribute( wBeforeType );
 						_trPr->AppendChild( wBefore, true );
 					}
-				}break;	
+				}
+				break;
+
 				case sprmOldTDyaRowHeight:
 				case sprmTDyaRowHeight:
 				{						//row height
@@ -139,19 +147,19 @@ namespace DocFileFormat
 					_trPr->AppendChild( rowHeight );
 				}
 				break;
-				case sprmOldTFCantSplit:
-				case sprmTFCantSplit:
-				case sprmTFCantSplit90:
-				{						//can't split
-					appendFlagElement( _trPr, *iter, L"cantSplit", true );
-				}break;
 
-					//div id
-				case sprmTIpgp:// = PGPInfo.ipgpSelf (PGPInfo structure describes the border and margin properties)
-				{
-				}break;
-				default:
-					break;
+			case sprmOldTFCantSplit:
+			case sprmTFCantSplit:
+			case sprmTFCantSplit90:
+			{						//can't split
+                appendFlagElement( _trPr, *iter, L"cantSplit", true );
+			}break;
+
+				//div id
+			case sprmTIpgp:// = PGPInfo.ipgpSelf (PGPInfo structure describes the border and margin properties)
+			{
+			}break;
+
 				//borders 80 exceptions
 				//case SinglePropertyModifier.OperationCode.sprmTTableBorders80:
 				//    unsigned char[] brc80 = new unsigned char[4];

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -427,9 +427,8 @@ namespace DocFileFormat
 					{
 						appendStyleProperty(&strStyle, L"visibility", L"hidden");
 					}
-				}break;
-			default:
-				break;				
+				}
+				break;
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -168,8 +168,6 @@ namespace DocFileFormat
 							m_pXmlWriter->WriteAttribute(L"wrapcoords", wrapCoords);
 					}
 					break;
-					default:
-						break;
 				}
 			}
 
@@ -1684,8 +1682,6 @@ namespace DocFileFormat
 				{
 					appendStyleProperty(oStyle, L"mso-wrap-distance-top", (FormatUtils::DoubleToWideString(EmuValue((int)iter->op).ToPoints()) + std::wstring(L"pt")));
 				}break;
-			default:
-				break;
 			}
 		}
 		
@@ -1823,12 +1819,12 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"none";
 			case 1:		return L"block";
 			case 2:		return L"classic";
 			case 3:		return L"diamond";
 			case 4:		return L"oval";
 			case 5:		return L"open";
-			default:	return L"none";
 		}
 	}
 
@@ -1836,9 +1832,9 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"short";
 			case 1:		return L"medium";
 			case 2:		return L"long";
-			default:	return L"short";
 		}
 	}
 
@@ -1846,9 +1842,9 @@ namespace DocFileFormat
 	{
 		switch ( op )
 		{
+			default:	return L"narrow";
 			case 1:		return L"medium";
 			case 2:		return L"wide";
-			default:	return L"narrow";
 		}
 	}
 

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -117,7 +117,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	_UINT32 WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
+	int WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
 	{
 		m_sFileName = fileName;
 		m_sPassword = password;

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -94,7 +94,7 @@ namespace DocFileFormat
 		WordDocument (const ProgressCallback* pCallFunc, const std::wstring & tempFolder );
 		virtual ~WordDocument();
 
-		_UINT32 LoadDocument(const std::wstring & fileName, const std::wstring & password);
+		int LoadDocument(const std::wstring & fileName, const std::wstring & password);
 
 		int		nWordVersion;
 		int		nDocumentCodePage;

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,9 +34,9 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-_UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
+HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
 {
-	_UINT32 hr = 0;
+	HRESULT hr = S_FALSE;
 
 	DocFileFormat::Converter docToDocx;
 	docToDocx.m_sTempFolder = m_sTempFolder;
@@ -46,7 +46,7 @@ _UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::w
 	return hr;
 }
 
-_UINT32 COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
+HRESULT COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
 {
-    return 0;
+    return S_OK;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

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

ASCOfficeDocxFile2/BinReader/CustormXmlWriter.cpp

@@ -66,7 +66,7 @@ namespace Writers
 		NSDirectory::CreateDirectories(sCustomXmlRelsDir);
 
 		m_pDrawingConverter->SetDstContentRels();
-		unsigned int lId;
+		long lId;
 		m_pDrawingConverter->WriteRels(OOX::FileTypes::CustomXmlProps.RelationType(), sCustomXMLPropsFilename, L"", &lId);
 		m_pDrawingConverter->SaveDstContentRels(sCustomXmlRelsDir + FILE_SEPARATOR_STR + sCustomXmlFilename + L".rels");
 

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -335,10 +335,48 @@ public:
 			sShd += L"<w:shd";
 			if(bValue)
 			{
-				if(shd_Nil == Value)
-					sShd += L" w:val=\"nil\"";
-				else
-					sShd += L" w:val=\"clear\"";
+				switch(Value)
+				{
+					case SimpleTypes::shdClear                 : sShd += L" w:val=\"clear\"";		break;
+					case SimpleTypes::shdDiagCross             : sShd += L" w:val=\"diagCross\"";	break;
+					case SimpleTypes::shdDiagStripe            : sShd += L" w:val=\"diagStripe\"";	break;
+					case SimpleTypes::shdHorzCross             : sShd += L" w:val=\"horzCross\"";	break;
+					case SimpleTypes::shdHorzStripe            : sShd += L" w:val=\"horzStripe\"";	break;
+					case SimpleTypes::shdNil                   : sShd += L" w:val=\"nil\"";			break;
+					case SimpleTypes::shdPct10                 : sShd += L" w:val=\"pct10\"";	break;
+					case SimpleTypes::shdPct12                 : sShd += L" w:val=\"pct12\"";	break;
+					case SimpleTypes::shdPct15                 : sShd += L" w:val=\"pct15\"";	break;
+					case SimpleTypes::shdPct20                 : sShd += L" w:val=\"pct20\"";	break;
+					case SimpleTypes::shdPct25                 : sShd += L" w:val=\"pct25\"";	break;
+					case SimpleTypes::shdPct30                 : sShd += L" w:val=\"pct30\"";	break;
+					case SimpleTypes::shdPct35                 : sShd += L" w:val=\"pct35\"";	break;
+					case SimpleTypes::shdPct37                 : sShd += L" w:val=\"pct37\"";	break;
+					case SimpleTypes::shdPct40                 : sShd += L" w:val=\"pct40\"";	break;
+					case SimpleTypes::shdPct45                 : sShd += L" w:val=\"pct45\"";	break;
+					case SimpleTypes::shdPct5                  : sShd += L" w:val=\"pct5\"";	break;
+					case SimpleTypes::shdPct50                 : sShd += L" w:val=\"pct50\"";	break;
+					case SimpleTypes::shdPct55                 : sShd += L" w:val=\"pct55\"";	break;
+					case SimpleTypes::shdPct60                 : sShd += L" w:val=\"pct60\"";	break;
+					case SimpleTypes::shdPct62                 : sShd += L" w:val=\"pct62\"";	break;
+					case SimpleTypes::shdPct65                 : sShd += L" w:val=\"pct65\"";	break;
+					case SimpleTypes::shdPct70                 : sShd += L" w:val=\"pct70\"";	break;
+					case SimpleTypes::shdPct75                 : sShd += L" w:val=\"pct75\"";	break;
+					case SimpleTypes::shdPct80                 : sShd += L" w:val=\"pct80\"";	break;
+					case SimpleTypes::shdPct85                 : sShd += L" w:val=\"pct85\"";	break;
+					case SimpleTypes::shdPct87                 : sShd += L" w:val=\"pct87\"";	break;
+					case SimpleTypes::shdPct90                 : sShd += L" w:val=\"pct90\"";	break;
+					case SimpleTypes::shdPct95                 : sShd += L" w:val=\"pct95\"";	break;
+					case SimpleTypes::shdReverseDiagStripe     : sShd += L" w:val=\"reverseDiagStripe\"";		break;
+					case SimpleTypes::shdSolid                 : sShd += L" w:val=\"solid\"";					break;
+					case SimpleTypes::shdThinDiagCross         : sShd += L" w:val=\"thinDiagCross\"";			break;
+					case SimpleTypes::shdThinDiagStripe        : sShd += L" w:val=\"thinDiagStripe\"";			break;
+					case SimpleTypes::shdThinHorzCross         : sShd += L" w:val=\"thinHorzCross\"";			break;
+					case SimpleTypes::shdThinHorzStripe			: sShd += L" w:val=\"thinHorzStripe\"";			break;
+					case SimpleTypes::shdThinReverseDiagStripe	: sShd += L" w:val=\"thinReverseDiagStripe\"";	break;
+					case SimpleTypes::shdThinVertStripe			: sShd += L" w:val=\"thinVertStripe\"";			break;
+					case SimpleTypes::shdVertStripe				: sShd += L" w:val=\"vertStripe\"";				break;
+					default										: sShd += L" w:val=\"solid\"";					break;
+				}
 			}
 			sShd += L" w:color=\"auto\"";
 			if(bColor)
@@ -2115,7 +2153,7 @@ class CDrawingProperty
 public:
 	bool			bObject;
     std::wstring	sObjectProgram;	
-    unsigned int	nObjectId;
+    long			nObjectId;
     BYTE			nObjectType;
 	
 	long    DataPos;

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -100,9 +100,10 @@ public:
 		RELEASEOBJECT(m_oRPr)
 	}
 };
+
 #define READ1_DEF(stLen, res, fReadFunction, arg) {\
 	long read1defCurPos = 0;\
-		while(read1defCurPos < (long)stLen)\
+	while(read1defCurPos < stLen)\
 	{\
 		BYTE read1defType = m_oBufferedStream.GetUChar();\
 		long read1defLength =  m_oBufferedStream.GetLong();\
@@ -119,7 +120,7 @@ public:
 }
 #define READ2_DEF(stLen, res, fReadFunction, arg) {\
 	long read2defCurPos = 0;\
-		while(read2defCurPos < (long)stLen)\
+	while(read2defCurPos < stLen)\
 	{\
 		BYTE read2defType = m_oBufferedStream.GetUChar();\
 		long read2defLenType =  m_oBufferedStream.GetUChar();\
@@ -2055,7 +2056,7 @@ public:
 			if(true == orowPrAfterBefore.bGridAfter && orowPrAfterBefore.nGridAfter > 0 && false == orowPrAfterBefore.oAfterWidth.bW)
 			{
 				//ищем по tblGrid
-				if(orowPrAfterBefore.nGridAfter < (long)m_aCurTblGrid.size())
+				if(orowPrAfterBefore.nGridAfter < m_aCurTblGrid.size())
 				{
 					double nSumW = 0;
 					for(int i = 0; i < orowPrAfterBefore.nGridAfter; i++)
@@ -2597,7 +2598,7 @@ public:
 		if ( c_oSerNumTypes::Lvl == type )
 		{
 			docLvl* odocLvl = new docLvl();
-			odocLvl->ILvl = (long)odocANum->Lvls.size();
+			odocLvl->ILvl = odocANum->Lvls.size();
 			READ2_DEF(length, res, this->ReadLevel, odocLvl);
 			odocANum->Lvls.push_back(odocLvl);
 		}
@@ -2831,8 +2832,7 @@ public:
 		}
 		else if(c_oSer_sts::Style_Default == type)
 		{
-			odocStyle->bDefault = true;
-			odocStyle->Default = m_oBufferedStream.GetBool();
+			odocStyle->bDefault = (0 != m_oBufferedStream.GetUChar());
 		}
 		else if(c_oSer_sts::Style_BasedOn == type)
 		{
@@ -3893,7 +3893,7 @@ public:
 			oFile.WriteFile(pData, length);
 			oFile.CloseFile();
 
-			unsigned int lId = 0;
+			long lId;
 			m_oFileWriter.m_pDrawingConverter->WriteRels(OOX::FileTypes::JsaProject.RelationType(), sJsaProject.GetPath(), L"", &lId);
 			m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_pContentTypes->AddDefault(sJsaProject.GetExtention(false));
 		}
@@ -3970,12 +3970,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathArg, poResult);
             m_oDocumentWriter.m_oContent.WriteString(std::wstring(_T("</m:oMath>")));
 		}
-		else if ( c_oSerParType::MRun == type )
-		{
-			GetRunStringWriter().WriteString(std::wstring(_T("<m:r>")));
-			READ1_DEF(length, res, this->ReadMathMRun, poResult);
-			GetRunStringWriter().WriteString(std::wstring(_T("</m:r>")));
-		}
 		else if ( c_oSerParType::Hyperlink == type )
 		{
 			CHyperlink oHyperlink;
@@ -4526,7 +4520,7 @@ public:
 			READ1_DEF(length, res, this->ReadParagraphContent, NULL);
 			if (!pHyperlink->sLink.empty())
 			{
-				unsigned int rId;
+				long rId;
 				std::wstring sHref = XmlUtils::EncodeXmlString(pHyperlink->sLink);
 				m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink")), sHref, std::wstring(_T("External")), &rId);
 				pHyperlink->rId = L"rId" + std::to_wstring(rId);
@@ -4598,12 +4592,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathDelimiter, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:d>")));
 		}
-		else if ( c_oSer_OMathContentType::Del == type )
-		{
-			TrackRevision oTrackRevision;
-			READ1_DEF(length, res, this->ReadDelIns, &oTrackRevision);
-			oTrackRevision.Write(&GetRunStringWriter(), _T("w:del"));
-		}
 		else if ( c_oSer_OMathContentType::EqArr == type )
 		{			
             GetRunStringWriter().WriteString(std::wstring(_T("<m:eqArr>")));
@@ -4628,12 +4616,6 @@ public:
 			READ1_DEF(length, res, this->ReadMathGroupChr, poResult);
             GetRunStringWriter().WriteString(std::wstring(_T("</m:groupChr>")));
 		}
-		else if ( c_oSer_OMathContentType::Ins == type )
-		{
-			TrackRevision oTrackRevision;
-			READ1_DEF(length, res, this->ReadDelIns, &oTrackRevision);
-			oTrackRevision.Write(&GetRunStringWriter(), _T("w:ins"));
-		}
 		else if ( c_oSer_OMathContentType::LimLow == type )
 		{			
             GetRunStringWriter().WriteString(std::wstring(_T("<m:limLow>")));
@@ -6889,7 +6871,7 @@ public:
                 std::wstring sNewImgRel = _T("media/") + sNewImgName;
 
                 sNewImgRel = XmlUtils::EncodeXmlString(sNewImgRel);
-				unsigned int rId;
+				long rId;
                 m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image")), sNewImgRel, std::wstring(), &rId);
                 odocImg.srId = L"rId" + std::to_wstring(rId);
 				//odocImg.srId = m_oMediaWriter.m_poDocumentRelsWriter->AddRels(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"), sNewImgRel, false);
@@ -7430,7 +7412,7 @@ public:
 				if (oXlsxSerializer.writeChartXlsx(sXlsxPath, *pChartSpace))
 				{
 					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-					unsigned int rIdXlsx;
+					long rIdXlsx;
 					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
 
 					m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rIdXlsx);
@@ -7457,7 +7439,7 @@ public:
                 OOX::CPath pathChartsRels =  pathChartsRelsDir.GetPath() + FILE_SEPARATOR_STR + sFilename + L".rels";
 				m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(pathChartsRels.GetPath());
 
-				unsigned int rIdChart;
+				long rIdChart;
                 std::wstring bstrChartRelType = OOX::FileTypes::Chart.RelationType();
 				
 				m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartRelType, sRelsName, std::wstring(), &rIdChart);
@@ -8564,7 +8546,7 @@ public:
 				m_oBufferedStream.Seek(nDocumentOffset);
 
 				m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
-				unsigned int stamdartRId;
+				long stamdartRId;
                
 				m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",		L"styles.xml",		L"", &stamdartRId);
                 m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings",	L"settings.xml",	L"", &stamdartRId);
@@ -8592,19 +8574,19 @@ public:
 
 				if(false == m_oFileWriter.m_oNumberingWriter.IsEmpty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering", L"numbering.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml", L"/word", L"numbering.xml");
 				}
                 if(false == m_oFileWriter.m_oFootnotesWriter.IsEmpty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes", L"footnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml", L"/word", L"footnotes.xml");
 				}
                 if(false == m_oFileWriter.m_oEndnotesWriter.IsEmpty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes", L"endnotes.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml", L"/word", L"endnotes.xml");
 				}
@@ -8613,7 +8595,7 @@ public:
 					Writers::HdrFtrItem* pHeader = m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders[i];
 					if(false == pHeader->IsEmpty())
 					{
-						unsigned int rId;
+						long rId;
                         m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", pHeader->m_sFilename, std::wstring(), &rId);
                         pHeader->rId = L"rId" + std::to_wstring( rId );
 						
@@ -8625,7 +8607,7 @@ public:
 					Writers::HdrFtrItem* pFooter = m_oFileWriter.m_oHeaderFooterWriter.m_aFooters[i];
 					if(false == pFooter->IsEmpty())
 					{
-						unsigned int rId;
+						long rId;
                         m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", pFooter->m_sFilename, std::wstring(), &rId);
                         pFooter->rId = L"rId" + std::to_wstring( rId );
 						
@@ -8635,7 +8617,7 @@ public:
 				if(!oSettingsCustom.IsEmpty()){
 					std::wstring sFilename = m_oFileWriter.m_oCustomXmlWriter.WriteCustomXml(oSettingsCustom.GetSchemaUrl(), oSettingsCustom.ToXml());
 					std::wstring sRelsPath = L"../" + OOX::FileTypes::CustomXml.DefaultDirectory().GetPath() + L"/" + sFilename;
-					unsigned int rId;
+					long rId;
 					m_oFileWriter.m_pDrawingConverter->WriteRels(OOX::FileTypes::CustomXml.RelationType(), sRelsPath, L"", &rId);
 				}
 
@@ -8656,19 +8638,19 @@ public:
                 
 				if(false == oCommentsWriter.m_sComment.empty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments", L"comments.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", L"/word", L"comments.xml");
 				}
                 if(false == oCommentsWriter.m_sCommentExt.empty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/commentsExtended", L"commentsExtended.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml", L"/word", L"commentsExtended.xml");
 				}
                 if(false == oCommentsWriter.m_sPeople.empty())
 				{
-					unsigned int rId;
+					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(L"http://schemas.microsoft.com/office/2011/relationships/people", L"people.xml", std::wstring(), &rId);
 					m_oFileWriter.m_pDrawingConverter->Registration(L"application/vnd.openxmlformats-officedocument.wordprocessingml.people+xml", L"/word", L"people.xml");
 				}

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -1438,8 +1438,8 @@ namespace MathEquation
 				}
 				else if (eType == commandBrackets)
 				{
-					MBRACKETSTYPE ebType = MBRACKETSTYPE::bracketsAngle; //???
-					EndBrackets(ebType, false, false);
+					MBRACKETSTYPE ebType;
+					EndBrackets(ebType, false,false);
 				}
 			}
 			virtual void BeginAngleBracketsWithSeparator(MANGLEBRACKETSWITHSEPARATORTYPE eType)

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -499,8 +499,8 @@ extern int g_nCurFormatVersion;
 		MoveToRangeEnd = 21,
 		JsaProject = 22,
 		BookmarkStart = 23,
-		BookmarkEnd = 24,
-		MRun = 25
+		BookmarkEnd = 24
+
 	};}
 	namespace c_oSerDocTableType{enum c_oSerDocTableType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -315,19 +315,19 @@ namespace BinDocxRW
 		void WriteShd(const ComplexTypes::Word::CShading& Shd)
 		{
 			//Type
-			if(false != Shd.m_oVal.IsInit())
+			if (false != Shd.m_oVal.IsInit())
 			{
 				m_oStream.WriteBYTE(c_oSerShdType::Value);
 				m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				switch(Shd.m_oVal.get().GetValue())
-				{
-				case SimpleTypes::shdNil:   m_oStream.WriteBYTE(shd_Nil);break;
-				default:                    m_oStream.WriteBYTE(shd_Clear);break;
-				}
+				m_oStream.WriteBYTE(Shd.m_oVal.get().GetValue()); //Misalignment-footer.doc
+
 			}
 			//Value
-			if(false != Shd.m_oFill.IsInit())
+			if (false != Shd.m_oFill.IsInit())
 				WriteColor(c_oSerShdType::Color, Shd.m_oFill.get());
+			else if (false != Shd.m_oColor.IsInit())
+				WriteColor(c_oSerShdType::Color, Shd.m_oColor.get());
+
 			WriteThemeColor(c_oSerShdType::ColorTheme, Shd.m_oFill, Shd.m_oThemeFill, Shd.m_oThemeFillTint, Shd.m_oThemeFillShade);
 		}
 		void WriteDistance(const NSCommon::nullable<SimpleTypes::CWrapDistance<>>& m_oDistL,
@@ -3505,14 +3505,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_m_r:
-					{
-						OOX::Logic::CMRun* pMRun = static_cast<OOX::Logic::CMRun*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSerParType::MRun);
-						WriteMathRunContent(pMRun);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				default:
 					break;
 				}
@@ -4122,14 +4114,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_w_del:
-					{
-						OOX::Logic::CDel* pDel = static_cast<OOX::Logic::CDel*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Del);
-						WriteDel(*pDel);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				case OOX::et_m_eqArr:
 					{
 						OOX::Logic::CEqArr* pEqArr = static_cast<OOX::Logic::CEqArr*>(item);
@@ -4182,14 +4166,6 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				case OOX::et_w_ins:
-					{
-						OOX::Logic::CIns* pIns = static_cast<OOX::Logic::CIns*>(item);
-						nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Ins);
-						WriteIns(*pIns);
-						m_oBcw.WriteItemEnd(nCurPos);
-						break;
-					}
 				case OOX::et_m_limLow:
 					{
 						OOX::Logic::CLimLow* pLimLow = static_cast<OOX::Logic::CLimLow*>(item);

ASCOfficeDocxFile2/DocWrapper/ChartWriter.cpp

@@ -282,7 +282,7 @@ namespace BinXlsxRW{
 			{
 				OOX::Spreadsheet::CTableColumn* pTableColumn = new OOX::Spreadsheet::CTableColumn();
 				pTableColumn->m_oId.Init();
-				pTableColumn->m_oId->SetValue((unsigned int)i + 1);
+				pTableColumn->m_oId->SetValue(i + 1);
 				pTableColumn->m_oName.Init();
 				pTableColumn->m_oName->append(m_aTableNames[i]);
 				pTable->m_oTable->m_oTableColumns->m_arrItems.push_back(pTableColumn);
@@ -604,7 +604,7 @@ namespace BinXlsxRW{
 							// Не число
 							aSharedStrings.push_back(val);
 							pCell->m_oType->SetValue(SimpleTypes::Spreadsheet::celltypeSharedString);
-							pCell->m_oValue->m_sText = std::to_wstring((int)aSharedStrings.size() - 1);
+							pCell->m_oValue->m_sText = std::to_wstring(aSharedStrings.size() - 1);
 						}
 						else
 						{
@@ -658,7 +658,7 @@ namespace BinXlsxRW{
 
         if(NULL != format)
 		{
-			int nXfsIndex = (int)m_aXfs.size();
+			int nXfsIndex = m_aXfs.size();
 
             boost::unordered_map<std::wstring, int>::const_iterator itFormat = m_mapFormats.find(*format);
 			if(itFormat == m_mapFormats.end())

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -196,7 +196,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 		bool bValidFormat = false;
         std::wstring sSignature(g_sFormatSignature);
         int nSigLength = (int)sSignature.length();
-		if((int)nBase64DataSize > nSigLength)
+		if(nBase64DataSize > nSigLength)
 		{
             std::string sCurSig((char*)pBase64Data, nSigLength);
             if(sSignature == std::wstring(sCurSig.begin(), sCurSig.end()))

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -85,7 +85,7 @@ namespace BinXlsxRW{
 		sMediaPath = pathMediaDir.GetPath();
 		sEmbedPath = pathEmbedDir.GetPath();
 	}
-    _UINT32 CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
+    int CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
         std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
 
@@ -100,7 +100,7 @@ namespace BinXlsxRW{
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;		
 		return oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 	}
-    _UINT32 CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
+    int CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
 	{
 		COfficeFontPicker* pFontPicker = new COfficeFontPicker();
 		pFontPicker->Init(m_sFontDir);
@@ -136,7 +136,7 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		_UINT32 result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
+		int result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
 		return result;
@@ -186,7 +186,7 @@ namespace BinXlsxRW{
 					pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
 
 					std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
-					unsigned int rId;
+					long rId;
 					std::wstring bstrChartsWorksheetRelType = OOX::FileTypes::MicrosoftOfficeExcelWorksheet.RelationType();
 					m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, std::wstring(), &rId);
 

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -33,7 +33,6 @@
 #define XLSX_SERIALIZER
 
 #include <string>
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace OOX
 {
@@ -63,8 +62,8 @@ namespace BinXlsxRW {
 		
         static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 
-        _UINT32 loadFromFile	(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
-        _UINT32 saveToFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
+        int loadFromFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
+        int saveToFile			(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
 		
         bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilename, const long& lChartNumber);
 		

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -53,6 +53,12 @@
 		69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181AD1C77274E00B2952B /* FileDownloader.h */; };
 		8A404FD3208A01AF00F2D5CF /* FileDownloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A404FD2208A01AF00F2D5CF /* FileDownloader.cpp */; };
 		8A404FD5208A01CE00F2D5CF /* FileDownloader_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A404FD4208A01CE00F2D5CF /* FileDownloader_private.h */; };
+		8AB24BFD213004E400E80DDD /* CustormXmlWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AB24BFB213004E300E80DDD /* CustormXmlWriter.cpp */; };
+		8AB24BFE213004E400E80DDD /* CustormXmlWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB24BFC213004E300E80DDD /* CustormXmlWriter.h */; };
+		8AC6D2052130146000D9C0F1 /* xmlutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AC6D2042130146000D9C0F1 /* xmlutils.h */; };
+		8AC6D2092130146800D9C0F1 /* xmllight_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AC6D2062130146800D9C0F1 /* xmllight_private.h */; };
+		8AC6D20A2130146800D9C0F1 /* xmldom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AC6D2072130146800D9C0F1 /* xmldom.cpp */; };
+		8AC6D20B2130146800D9C0F1 /* xmllight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AC6D2082130146800D9C0F1 /* xmllight.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -103,6 +109,12 @@
 		69F181AD1C77274E00B2952B /* FileDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader.h; path = ../../../Common/FileDownloader/FileDownloader.h; sourceTree = "<group>"; };
 		8A404FD2208A01AF00F2D5CF /* FileDownloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDownloader.cpp; path = ../../../Common/FileDownloader/FileDownloader.cpp; sourceTree = "<group>"; };
 		8A404FD4208A01CE00F2D5CF /* FileDownloader_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDownloader_private.h; path = ../../../Common/FileDownloader/FileDownloader_private.h; sourceTree = "<group>"; };
+		8AB24BFB213004E300E80DDD /* CustormXmlWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustormXmlWriter.cpp; sourceTree = "<group>"; };
+		8AB24BFC213004E300E80DDD /* CustormXmlWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustormXmlWriter.h; sourceTree = "<group>"; };
+		8AC6D2042130146000D9C0F1 /* xmlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xmlutils.h; path = ../../../DesktopEditor/xml/include/xmlutils.h; sourceTree = "<group>"; };
+		8AC6D2062130146800D9C0F1 /* xmllight_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xmllight_private.h; path = ../../../DesktopEditor/xml/src/xmllight_private.h; sourceTree = "<group>"; };
+		8AC6D2072130146800D9C0F1 /* xmldom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmldom.cpp; path = ../../../DesktopEditor/xml/src/xmldom.cpp; sourceTree = "<group>"; };
+		8AC6D2082130146800D9C0F1 /* xmllight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmllight.cpp; path = ../../../DesktopEditor/xml/src/xmllight.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -135,6 +147,7 @@
 		17E17EDE1AC453F800BEA2EA /* ASCOfficeDocxFile2Lib */ = {
 			isa = PBXGroup;
 			children = (
+				8AC6D2032130145600D9C0F1 /* XmlUtils */,
 				17E17F4D1AC454E200BEA2EA /* Common */,
 				17E17F1A1AC4549B00BEA2EA /* XlsxSerializerCom */,
 				17E17F0D1AC4546100BEA2EA /* DocWrapper */,
@@ -149,6 +162,8 @@
 			children = (
 				17E17EEB1AC4544900BEA2EA /* ChartWriter.h */,
 				17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */,
+				8AB24BFB213004E300E80DDD /* CustormXmlWriter.cpp */,
+				8AB24BFC213004E300E80DDD /* CustormXmlWriter.h */,
 				17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */,
 				17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */,
 				17E17EF11AC4544900BEA2EA /* DocumentWriter.h */,
@@ -252,6 +267,17 @@
 			name = BinWriter;
 			sourceTree = "<group>";
 		};
+		8AC6D2032130145600D9C0F1 /* XmlUtils */ = {
+			isa = PBXGroup;
+			children = (
+				8AC6D2072130146800D9C0F1 /* xmldom.cpp */,
+				8AC6D2062130146800D9C0F1 /* xmllight_private.h */,
+				8AC6D2082130146800D9C0F1 /* xmllight.cpp */,
+				8AC6D2042130146000D9C0F1 /* xmlutils.h */,
+			);
+			name = XmlUtils;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -276,7 +302,9 @@
 				17C1FEAD1ACC42C4006B99B3 /* ChartWriter.h in Headers */,
 				17C1FEAE1ACC42C4006B99B3 /* DocumentRelsWriter.h in Headers */,
 				17C1FEAF1ACC42C4006B99B3 /* CommentsWriter.h in Headers */,
+				8AC6D2052130146000D9C0F1 /* xmlutils.h in Headers */,
 				69F181AF1C77274E00B2952B /* FileDownloader.h in Headers */,
+				8AC6D2092130146800D9C0F1 /* xmllight_private.h in Headers */,
 				17C1FEB01ACC42C4006B99B3 /* BinaryCommonReader.h in Headers */,
 				17C1FEB11ACC42C4006B99B3 /* Common.h in Headers */,
 				8A404FD5208A01CE00F2D5CF /* FileDownloader_private.h in Headers */,
@@ -292,6 +320,7 @@
 				17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */,
 				17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */,
 				17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */,
+				8AB24BFE213004E400E80DDD /* CustormXmlWriter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -346,17 +375,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8AB24BFD213004E400E80DDD /* CustormXmlWriter.cpp in Sources */,
 				17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */,
 				17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */,
 				17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */,
 				17C1FE991ACC42C4006B99B3 /* DocxSerializer.cpp in Sources */,
 				17C1FE9A1ACC42C4006B99B3 /* CommonWriter.cpp in Sources */,
+				8AC6D20B2130146800D9C0F1 /* xmllight.cpp in Sources */,
 				17C1FE9B1ACC42C4006B99B3 /* CSVWriter.cpp in Sources */,
 				69414A301CB51666003E771B /* ChartWriter.cpp in Sources */,
 				6967917E1D9E8AEE002CA4BA /* BinWriters.cpp in Sources */,
 				69BBDF251F0B8AAC00EB1BF7 /* FileDownloader_mac.mm in Sources */,
 				17C1FE9C1ACC42C4006B99B3 /* XlsxSerializer.cpp in Sources */,
 				690FE0851E9BBD68004B26D0 /* Readers.cpp in Sources */,
+				8AC6D20A2130146800D9C0F1 /* xmldom.cpp in Sources */,
 				17C1FE9D1ACC42C4006B99B3 /* FontProcessor.cpp in Sources */,
 				8A404FD3208A01AF00F2D5CF /* FileDownloader.cpp in Sources */,
 			);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -95,7 +95,7 @@ namespace formulasconvert {
 
 	bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)
 	{
-                boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([\\w^0-9\\$]+\\d+)(?::\\.([\\w^0-9]+\\d+)){0,1}\\]");
+		boost::wregex re(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.([a-zA-Z\\$]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
 		boost::wsmatch result;
 		bool b = boost::regex_search(expr, result, re);
 
@@ -211,7 +211,7 @@ namespace formulasconvert {
 	}
 	std::wstring odf2oox_converter::Impl::replace_named_ref_formater1(boost::wsmatch const & what)
 	{
-		boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]+\\${0,1}\\d+)(?::\\.(\\${0,1}[\\w^0-9]+\\${0,1}\\d+)){0,1}");
+		boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
 
 		std::wstring expr = what[1].str();
 		const std::wstring res = boost::regex_replace(
@@ -235,7 +235,7 @@ namespace formulasconvert {
 	{
 		convert_with_TableName = withTableName;
 
-		boost::wregex complexRef(L"\\[(?:\$)?([^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}\\]");
+		boost::wregex complexRef(L"\\[(?:\$)?([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}\\]");
 		/*
 									 [     $   Sheet2          . A1								 : ( $   Sheet2)? . B5                    ]
 		*/
@@ -252,7 +252,7 @@ namespace formulasconvert {
 		convert_with_TableName = withTableName;
 		
 		//boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
-		boost::wregex complexRef(L"\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[\\w^0-9]*\\${0,1}\\d*)){0,1}");
+		boost::wregex complexRef(L"\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}");
 	
 		const std::wstring res = boost::regex_replace(
 			expr,
@@ -358,52 +358,35 @@ namespace formulasconvert {
 	
 		return L"";
 	}
-	void odf_replace_tmp_back(std::wstring &expr)
-	{
-		XmlUtils::replace_all( expr, L"ТОСHKA", L".");
-		XmlUtils::replace_all( expr, L"VOSKL", L"!");
-
-		XmlUtils::replace_all( expr, L"SCOBCAIN", L"(");
-		XmlUtils::replace_all( expr, L"SCOBCAOUT", L")");
-
-		XmlUtils::replace_all( expr, L"KVADRATIN", L"[");
-		XmlUtils::replace_all( expr, L"KVADRATOUT", L"]");
-		
-		XmlUtils::replace_all( expr, L"PROBEL", L" ");
-		XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
-		XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
-	}
-	void odf_replace_tmp(std::wstring &expr)
-	{
-		XmlUtils::replace_all( expr, L".", L"ТОСHKA");
-		XmlUtils::replace_all( expr, L"!", L"VOSKL");
-
-		XmlUtils::replace_all( expr, L"(", L"SCOBCAIN");
-		XmlUtils::replace_all( expr, L")", L"SCOBCAOUT");
-
-		XmlUtils::replace_all( expr, L"[", L"KVADRATIN");
-		XmlUtils::replace_all( expr, L"]", L"KVADRATOUT");
-		
-		XmlUtils::replace_all( expr, L" ", L"PROBEL");
-		XmlUtils::replace_all( expr, L"'", L"APOSTROF");	
-		XmlUtils::replace_all( expr, L"\"", L"KAVYCHKA");
-	}
 	std::wstring convert_scobci(boost::wsmatch const & what)
 	{
 		if (what[1].matched)
 		{
 			std::wstring inner = what[1].str();
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
 
-			odf_replace_tmp(inner);
-
+			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+			
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"'", L"APOSTROF");
 			return inner;
 		}
 		else if (what[2].matched)
 		{
 			std::wstring inner = what[2].str();
-			
-			odf_replace_tmp(inner);
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
 
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+ 			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+			
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
 			return inner;
 		}
 		else if (what[3].matched)
@@ -509,9 +492,9 @@ namespace formulasconvert {
 			XmlUtils::replace_all( workstr, L"FDIST(", L"_xlfn.F.DIST(");
 			// ROUNDUP( - тут в oox 2 параметра - разрядность нужно - ,0) - EV Requirements v2.2.3.ods
 			
-			if (std::wstring::npos != workstr.find(L"CONCATINATE"))
+			int res_find=0;
+			if ((res_find = workstr.find(L"CONCATINATE")) > 0)
 			{
-				bool l = true;
 				//могут быть частично заданы диапазоны
 				//todooo
 			}	
@@ -526,7 +509,18 @@ namespace formulasconvert {
 
 
 	//-----------------------------------------------------------
-		odf_replace_tmp_back(workstr);
+ 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+		XmlUtils::replace_all( workstr, L"ТОСHKA"	, L".");
+
+		XmlUtils::replace_all( workstr, L"SCOBCAIN"	, L"(");
+		XmlUtils::replace_all( workstr, L"SCOBCAOUT"	, L")");
+
+		XmlUtils::replace_all( workstr, L"KVADRATIN"	, L"[");
+		XmlUtils::replace_all( workstr, L"KVADRATOUT", L"]");
+
+		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"KAVYCHKA"	, L"\"");
 
 		return workstr;
 	}

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -69,42 +69,9 @@ public:
 
 bool			oox2odf_converter::Impl::isFindBaseCell_ = false;
 std::wstring	oox2odf_converter::Impl::table_name_ = L"";
-void oox_replace_tmp_back(std::wstring &expr)
-{
-	XmlUtils::replace_all( expr, L"ТОСHKA", L".");
-	XmlUtils::replace_all( expr, L"VOSKL", L"!");
 
-	XmlUtils::replace_all( expr, L"SCOBCAIN", L"(");
-	XmlUtils::replace_all( expr, L"SCOBCAOUT", L")");
-
-	XmlUtils::replace_all( expr, L"KVADRATIN", L"[");
-	XmlUtils::replace_all( expr, L"KVADRATOUT", L"]");
-	
-	XmlUtils::replace_all( expr, L"PROBEL", L" ");
-	XmlUtils::replace_all( expr, L"APOSTROF", L"'");	
-	XmlUtils::replace_all( expr, L"KAVYCHKA", L"\"");
-}
-
-void oox_replace_tmp(std::wstring &expr)
-{
-	XmlUtils::replace_all( expr, L".", L"ТОСHKA");
-	XmlUtils::replace_all( expr, L"!", L"VOSKL");
-
-	XmlUtils::replace_all( expr, L"(", L"SCOBCAIN");
-	XmlUtils::replace_all( expr, L")", L"SCOBCAOUT");
-
-	XmlUtils::replace_all( expr, L"[", L"KVADRATIN");
-	XmlUtils::replace_all( expr, L"]", L"KVADRATOUT");
-	
-	XmlUtils::replace_all( expr, L" ", L"PROBEL");
-	XmlUtils::replace_all( expr, L"'", L"APOSTROF");	
-	XmlUtils::replace_all( expr, L"\"", L"KAVYCHKA");
-}
 void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 {
-	if ((0 == expr.find(L"KAVYCHKA")) && (expr.length() - 8 == expr.rfind(L"KAVYCHKA") ))
-		return;
-
 	boost::wregex re(L"([:$!])+");
 
 	boost::wsmatch result;
@@ -112,7 +79,7 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr)
 
 	if (b)
 	{
-		boost::wregex re1(L"(\\$?\\w+\\!)?([\\w^0-9$]*\\d*)\\:?([\\w^0-9$]*\\d*)?");
+		boost::wregex re1(L"(\\$?\\w+\\!)?([a-zA-Z$]*\\d*)\\:?([a-zA-Z$]*\\d*)?");
 //                          $   Sheet2   ! $ A1                 :  $ B5    
 //                          $   Sheet2   ! $ A                  :  $ A    
 //                          $   Sheet2   ! $ 1                  :  $ 1    
@@ -144,12 +111,8 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 
         std::wstring c1 = what[2].str(); 
         std::wstring c2 = what[3].str(); 
-
-		if ((0 == c1.find(L"KAVYCHKA")) && (c1.length() - 8 == c1.rfind(L"KAVYCHKA") ))
-		{
-			return c1;
-		}
-		else if (!c1.empty() || !c2.empty() || !sheet.empty())
+		
+		if (!c1.empty() || !c2.empty() || !sheet.empty())
 		{      
 			XmlUtils::replace_all( sheet, L"!", L"");
 
@@ -159,8 +122,9 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 			}	
 			if (!sheet.empty()  && (std::wstring::npos != c1.find(L"$"))) sheet = L"$"  + sheet;
 
-
-			s =  L"["  + sheet + L"." + c1 + (c2.empty() ? L"" : (L":" + sheet  + L"." + c2)) + std::wstring(L"]");
+			s =  std::wstring(L"[")  + sheet + L"." + 
+									 c1 +
+									(c2.empty() ? L"" : (L":" + sheet  + L"." + c2) ) + std::wstring(L"]");
 		}
         return s;
 	}
@@ -214,22 +178,27 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 	replace_vertical(workstr);
 	replace_semicolons(workstr);		
 	
-	std::wstring res1 = boost::regex_replace(
-        workstr,
-		boost::wregex(L"('.*?')|(\".*?\")"),
-		&oox2odf_converter::Impl::convert_scobci, boost::match_default | boost::format_all);
-
 	std::vector<std::wstring> distance;
 
-	boost::algorithm::split(distance, res1, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
+	boost::algorithm::split(distance,workstr, boost::algorithm::is_any_of(L";"), boost::algorithm::token_compress_on);
 
 	for (size_t i = 0; i < distance.size(); i++)
 	{		
 		std::wstring &d = distance[i];
 
+		XmlUtils::replace_all( d, L"(", L"SCOBCAIN");
+		XmlUtils::replace_all( d, L")", L"SCOBCAOUT");
+		XmlUtils::replace_all( d, L" ", L"PROBEL");
+		XmlUtils::replace_all( d, L"'", L"APOSTROF");
+		XmlUtils::replace_all( d, L"\"", L"KAVYCHKA");
+		
 		replace_cells_range(d);
 
-		oox_replace_tmp_back(d);
+		XmlUtils::replace_all( d, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( d, L"SCOBCAOUT", L")");
+		XmlUtils::replace_all( d, L"PROBEL", L" ");
+		XmlUtils::replace_all( d, L"APOSTROF", L"'");
+		XmlUtils::replace_all( d, L"KAVYCHKA", L"\"");
 			
 		out = out + d + std::wstring(L";");
 	}
@@ -240,7 +209,11 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 
 	if (table_name_.empty() == false)
 	{
-		oox_replace_tmp_back(table_name_);
+		XmlUtils::replace_all( table_name_, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( table_name_, L"SCOBCAOUT", L")");
+		XmlUtils::replace_all( table_name_, L"PROBEL", L" ");
+		XmlUtils::replace_all( table_name_, L"APOSTROF", L"'");
+		XmlUtils::replace_all( table_name_, L"KAVYCHKA", L"\"");
 	}
 }
 
@@ -397,19 +370,32 @@ std::wstring replace_(boost::wsmatch const & what)
 
 	return L"";
 }
-
 std::wstring oox2odf_converter::Impl::convert_scobci(boost::wsmatch const & what)
 {
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        oox_replace_tmp(inner);
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+		
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"'", L"APOSTROF");
 		return inner;
 	}
     else if (what[2].matched)
     {
         std::wstring inner = what[2].str();
-        oox_replace_tmp(inner);
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
+
+ 		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
+		
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
 		return inner;
 	}
     else if (what[3].matched)
@@ -422,7 +408,7 @@ std::wstring  oox2odf_converter::Impl::replace_arguments(boost::wsmatch const &
 {
 	std::wstring out;
 
-	size_t sz = what.size();
+	int sz = what.size();
 
     if (what[1].matched)
     {
@@ -458,13 +444,13 @@ std::wstring oox2odf_converter::Impl::convert(const std::wstring& expr)
     if (is_forbidden1(expr))
         return L"NULLFORMULA";
 
-	std::wstring workstr = expr;
+    std::wstring workstr = expr;
     replace_cells_range(workstr);
     replace_vertical(workstr);
     replace_semicolons(workstr);
     return workstr;
 }
-// (Formula) -> of:=(Formula) 
+// of:=(Formula) -> (Formula)
 std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 {
     std::wstring workstr = expr;
@@ -476,13 +462,9 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 	
 	std::wstring res = boost::regex_replace(
 		res1,
-		boost::wregex(L"(?!([\\w^0-9]+\\d*\\())(([\\w^0-9]+\\!)?\\$?[\\w^0-9]*\\$?\\d*(\\:\\$?[\\w^0-9]*\\$?\\d*){0,1})"),
+		boost::wregex(L"(?!([a-zA-Z]+\\d*\\())(([a-zA-Z]+\\!)?\\$?[a-zA-Z]*\\$?\\d*(\\:\\$?[a-zA-Z]*\\$?\\d*){0,1})"),
 		&oox2odf_converter::Impl::replace_arguments, boost::match_default | boost::format_all);
 
-	//SUBTOTAL(109,Expense31[Amount])
-	XmlUtils::replace_all( res, L"[", L"KVADRATIN");
-	XmlUtils::replace_all( res, L"]", L"KVADRATOUT");
-
 	if (res1 == res)
 	{
 		XmlUtils::replace_all( res1, L"KAVYCHKA", L"\""); //IMCONJUGATE_emb.xlsx
@@ -494,7 +476,16 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 			boost::match_default | boost::format_all);
 	}
 
-	oox_replace_tmp_back(res);
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
+
+	XmlUtils::replace_all( res, L"KVADRATIN", L"[");
+	XmlUtils::replace_all( res, L"KVADRATOUT", L"]");
+    
+
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
+
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
 	replace_vertical(res);   
 	replace_semicolons(res);
@@ -503,7 +494,17 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 
 	if (table_name_.empty() == false)
 	{
-		oox_replace_tmp_back(table_name_);
+		XmlUtils::replace_all( table_name_, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( table_name_, L"SCOBCAOUT", L")");
+
+		XmlUtils::replace_all( table_name_, L"KVADRATIN", L"[");
+		XmlUtils::replace_all( table_name_, L"KVADRATOUT", L"]");
+	    
+
+		XmlUtils::replace_all( table_name_, L"APOSTROF", L"'");
+
+		XmlUtils::replace_all( table_name_, L"KAVYCHKA", L"\"");
+		XmlUtils::replace_all( table_name_, L"PROBEL", L" ");
 	}
 
     return std::wstring(L"of:=") + res;
@@ -532,7 +533,12 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 	     
 	}
 
-    oox_replace_tmp_back( res);
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
+
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
+
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
 	replace_vertical(res);
 	replace_semicolons(res);
@@ -562,7 +568,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 	
 	boost::algorithm::split(distance_inp,expr, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
-	for (size_t i = 0; i < distance_inp.size(); i++)
+	for (int i = 0; i < distance_inp.size(); i++)
 	{
 		std::wstring sheet;
 		std::vector<std::wstring> range;
@@ -570,7 +576,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 
 		boost::algorithm::split(range, distance_inp[i], boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
 
-		for (size_t j = 0 ; j < range.size(); j++)
+		for (int j = 0 ; j < range.size(); j++)
 		{
 			int pos = range[j].find('!'); 
 			if (0 <= pos)
@@ -582,7 +588,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 
 		}
 		std::wstring cells_out;
-		for (size_t c = 0; c < cells.size(); c++)
+		for (int c = 0; c < cells.size(); c++)
 		{
 			if (!sheet.empty())
 				cells_out += sheet + L".";
@@ -601,7 +607,7 @@ std::wstring oox2odf_converter::Impl::convert_chart_distance(const std::wstring&
 	}
 	std::wstring result;
 
-	for (size_t i = 0 ; i < distance_out.size(); i++)
+	for (int i = 0 ; i < distance_out.size(); i++)
 	{
 		result += distance_out[i];
 		result += L" ";
@@ -648,6 +654,8 @@ std::wstring oox2odf_converter::get_table_name()
 {
     return impl_->table_name_;
 }
+
+
 std::wstring oox2odf_converter::convert_ref(std::wstring const & expr)
 {
     std::wstring workstr = expr;
@@ -735,7 +743,7 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 	XmlUtils::replace_all( expr, L")", L"");
 	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
-	for (size_t i=0; i < splitted.size(); i++)
+	for (long i=0; i < splitted.size(); i++)
 	{
 		int res = splitted[i].find(L"!");
 		if (res > 0) splitted[i] = splitted[i].substr(res+1, splitted[i].size()-res);

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -43,7 +43,7 @@
 
 #include "../include/odf/odf_document.h"
 
-_UINT32 ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::xlsx_document outputXlsx;
 	cpdoccore::oox::xlsx_conversion_context conversionContext( &inputOdf);
@@ -56,7 +56,7 @@ _UINT32 ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 	outputXlsx.write(dstPath);
     return 0;
 }
-_UINT32 ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::docx_document	outputDocx;
     cpdoccore::oox::docx_conversion_context conversionContext(&inputOdf);
@@ -70,7 +70,7 @@ _UINT32 ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 		
     return 0;
 }
-_UINT32 ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+int ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::pptx_document	outputPptx;
     cpdoccore::oox::pptx_conversion_context conversionContext(&inputOdf);
@@ -83,9 +83,9 @@ _UINT32 ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const st
 
     return 0;
 }
-_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
 {
-	_UINT32 nResult = 0;
+	int nResult = 0;
 
 	try 
     {
@@ -134,9 +134,9 @@ _UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstP
 
 }
 
-_UINT32 ConvertOTF2ODF(const std::wstring & srcPath)
+int ConvertOTF2ODF(const std::wstring & srcPath)
 {
-	_UINT32 nResult = 0;
+	int nResult = 0;
 	
 	std::wstring manifest_xml	= srcPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
 	std::wstring mimetype_xml	= srcPath + FILE_SEPARATOR_STR + L"mimetype";

ASCOfficeOdfFile/src/ConvertOO2OOX.h

@@ -31,11 +31,10 @@
  */
 
 #include "../../DesktopEditor/common/Types.h"
-#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include <string>
 
 struct ProgressCallback;
 
-_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
+int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
 
-_UINT32 ConvertOTF2ODF(const std::wstring & otfPath);
+int ConvertOTF2ODF(const std::wstring & otfPath);

ASCOfficeOdfFile/src/common/CPString.cpp

@@ -42,7 +42,7 @@ std::string ansi_to_utf8(const std::string & _AnsiString)
 
 std::wstring utf8_to_utf16(const std::string & _Utf8String)
 {
-	return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_Utf8String.c_str(), (LONG)_Utf8String.length());
+	return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_Utf8String.c_str(), _Utf8String.length());
 }
 
 std::string utf16_to_utf8(const std::wstring & _Utf16String)

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -589,17 +589,12 @@ void docx_conversion_context::reset_context_state()
 	state_.in_run_				= false;
 	state_.is_paragraph_keep_	= false;
 	
-	state_.drawing_text_props_.clear();	
 	state_.text_properties_stack_.clear();
-	
-	get_styles_context().text_style_ext().clear();
 }
 void docx_conversion_context::back_context_state()
 {
 	state_ = keep_state_.back();
 	keep_state_.pop_back();
-
-	get_styles_context().text_style_ext().clear();
 }
 
 void docx_conversion_context::add_new_run(std::wstring parentStyleId)
@@ -1761,11 +1756,6 @@ void docx_conversion_context::serialize_list_properties(std::wostream & strm)
     }
 }
 
-void docx_conversion_context::set_drawing_text_props (const std::wstring &props)
-{
-	get_styles_context().text_style_ext() = props;
-}
-
 void docx_conversion_context::add_delayed_element(odf_reader::office_element * Elm)
 {
    delayed_elements_.push_back(Elm);    

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -900,8 +900,6 @@ public:
 	
 	table_content_context	& get_table_content_context()	{ return table_content_context_;}
 
-	void set_drawing_text_props (const std::wstring &props);
-
     void docx_convert_delayed	();
     void add_delayed_element	(odf_reader::office_element * Elm);
 
@@ -942,10 +940,10 @@ public:
 	void add_alphabetical_index_text (odf_reader::office_element_ptr & elem);
 
 	void set_process_headers_footers(bool Val)				{ process_headers_footers_ = Val; }
-   
-	headers_footers			& get_headers_footers()			{ return headers_footers_; }
+    headers_footers			& get_headers_footers()			{ return headers_footers_; }
 	header_footer_context	& get_header_footer_context()	{ return header_footer_context_; }
-	drop_cap_context		& get_drop_cap_context()		{return drop_cap_context_;}
+
+	drop_cap_context & get_drop_cap_context(){return drop_cap_context_;}
 	
 	styles_map	styles_map_;
 	bool		process_headers_footers_;
@@ -964,8 +962,6 @@ private:
 		bool in_run_ = false;
 		bool is_paragraph_keep_ = false; 
 
-		std::wstring drawing_text_props_;
-
 		std::vector< const odf_reader::style_text_properties*> text_properties_stack_;
 	}state_;
 	std::vector<_context_state> keep_state_;

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -231,7 +231,7 @@ void docx_serialize_image_child(std::wostream & strm, _docx_drawing & val)
 					CP_XML_NODE(L"a:avLst");
 				}
 
-				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_ln(CP_XML_STREAM(),val.additional);
 			}
 		}
 	}

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

@@ -98,7 +98,7 @@ double docx_table_state::get_current_cell_width()
 	{
 		//return columns_width_[current_table_column_];
 		double res = 0;
-		for (unsigned int i = 0; i < columns_spanned_num_ + 1; i++)
+		for (int i = 0; i < columns_spanned_num_ + 1; i++)
 		{
 			res += columns_width_[current_table_column_ + i];
 		}

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -171,7 +171,7 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 			if (content_.dimension_ == L"y")
 				CP_XML_ATTR(L"val",L"l");//  "b" | "l" |  "r" |  "t"// == bottom left right top
 		}
-		//oox_serialize_ln(_Wostream, content_.graphic_properties_);
+		//oox_serialize_ln(_Wostream,content_.graphic_properties_);
 
 		odf_reader::GetProperty(content_.properties_, L"num_format", strVal);
 		odf_reader::GetProperty(content_.properties_, L"link-data-style-to-source", boolVal);

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

@@ -198,9 +198,7 @@ std::wstringstream & styles_context::list_style()
 
 void styles_context::docx_serialize_text_style(std::wostream & strm, std::wstring parenStyleId, std::wstring & strChange)
 {
-	const std::wstring & text_style_str = text_style_.str();
-  
-	if (!text_style_str.empty() || !text_style_ext_.empty())
+    if (!text_style_.str().empty())
 	{
 		CP_XML_WRITER(strm)
 		{
@@ -210,17 +208,14 @@ void styles_context::docx_serialize_text_style(std::wostream & strm, std::wstrin
 				{
 					CP_XML_STREAM() << L"<w:rStyle w:val=\"" << parenStyleId << L"\" />";
 				}
-				CP_XML_STREAM() << text_style_str;
+				const std::wstring & test_str = text_style_.str();
+				CP_XML_STREAM() << test_str;
 
 				if (!strChange.empty())//rPrChange
 				{
 					CP_XML_STREAM() << strChange;
 					strChange.clear();
 				}
-				if (!text_style_ext_.empty())
-				{
-					CP_XML_STREAM() << text_style_ext_;
-				}
 			}
 		}
 	}

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

@@ -141,7 +141,6 @@ public:
 
 	std::wstring & extern_node(){return extern_node_;}
 	std::wstring & hlinkClick(){return hlinkClick_;}
-	std::wstring & text_style_ext(){return text_style_ext_;}
 
 	const odf_reader::style_instance * get_current_processed_style() const { return current_processed_style_; }
    
@@ -153,7 +152,6 @@ private:
 	
 	std::wstring				extern_node_;
 	std::wstring				hlinkClick_;
-	std::wstring				text_style_ext_;
 
     std::wstringstream			list_style_;
     std::wstringstream			text_style_;

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -108,8 +108,6 @@ static const std::wstring _ooxShapeType[]=
 	L"custGeom",//uses sub-sub type,
 	L"polygon", 
 	L"roundRect", 
-	L"bentConnector3",
-	L"curvedConnector3"
 };
 
 
@@ -126,14 +124,8 @@ static const std::wstring _ooxDashStyle[]=
 	L"sysDashDotDot"
 };
 
-void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_property> & prop, bool always_draw, const std::wstring &ns)
+void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_property> & prop, bool always_draw)
 {
-	std::wstring ns_att = (ns == L"a" ? L"" : ns + L":");
-	std::wstring ns_node = L"a:ln";
-	
-	if (ns == L"w14")
-		ns_node = L"w14:textOutline";
-
 	_CP_OPT(std::wstring)	strStrokeColor; 
 	_CP_OPT(int)			iStroke;
 	_CP_OPT(double)			dStrokeWidth;
@@ -151,30 +143,30 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 
 	CP_XML_WRITER(strm)
     {
-        CP_XML_NODE(ns_node)
+        CP_XML_NODE(L"a:ln")
         { 
-			std::wstring color, dash_style, fill = ns + L":solidFill" ;
+			std::wstring color, dash_style, fill = L"a:solidFill" ;
 
 			if (strStrokeColor) color = *strStrokeColor;
 
 			if (iStroke)
 			{
-				if (iStroke.get() == 0 || bWordArt) fill = ns + L":noFill";
+				if (iStroke.get() == 0 || bWordArt) fill = L"a:noFill";
 				else dash_style =  _ooxDashStyle[iStroke.get()];	
 			}
 			
-			if ((dStrokeWidth) && (*dStrokeWidth >= 0) && fill != ns + L":noFill")
+			if ((dStrokeWidth) && (*dStrokeWidth >= 0) && fill != L"a:noFill")
 			{
 				int val = dStrokeWidth.get() * 12700;	//in emu (1 pt = 12700)
 				if (val < 10)	val = 12700;
 				
-				CP_XML_ATTR2(ns_att + L"w", val);
+				CP_XML_ATTR(L"w", val);
 				if (color.length()<1)color = L"729FCF";
 			}
 		
 			CP_XML_NODE(fill)
 			{ 			
-				if (fill != ns + L":noFill")
+				if (fill != L"a:noFill")
 				{
 					if ( color.empty() )
 					{
@@ -182,49 +174,47 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 						else				color = L"FFFFFF";
 					}
 					
-					CP_XML_NODE(ns + L":srgbClr")
+					CP_XML_NODE(L"a:srgbClr")
 					{
-						CP_XML_ATTR2(ns_att + L"val",color);
+						CP_XML_ATTR(L"val",color);
 						
 						if (dStrokeOpacity)	
 						{
-							CP_XML_NODE(ns + L":alpha")
+							CP_XML_NODE(L"a:alpha")
 							{
-								CP_XML_ATTR2(ns_att + L"val", (int)(*dStrokeOpacity * 1000));
+								CP_XML_ATTR(L"val", (int)(*dStrokeOpacity * 1000));
 							}
 						}
 					}
 				}
 			}
-			if (fill != ns + L":noFill")
+			if (fill != L"a:noFill")
 			{
 				_CP_OPT(std::wstring)	strVal;
 
 				if (dash_style.length() > 0 && dash_style != L"solid")
 				{
-					CP_XML_NODE(ns + L":prstDash"){CP_XML_ATTR2(ns_att + L"val", dash_style);}	
+					CP_XML_NODE(L"a:prstDash"){CP_XML_ATTR(L"val", dash_style);}	
 				}
 				odf_reader::GetProperty(prop,L"marker-start", strVal);	
 				if (strVal)
 				{
-					CP_XML_NODE(ns + L":headEnd"){CP_XML_ATTR2(ns_att + L"type", strVal.get());}
+					CP_XML_NODE(L"a:headEnd"){CP_XML_ATTR(L"type", strVal.get());}
 				}
 				odf_reader::GetProperty(prop,L"marker-end",strVal);	
 				if (strVal)
 				{
-					CP_XML_NODE(ns + L":tailEnd"){CP_XML_ATTR2(ns_att + L"type",strVal.get());}
+					CP_XML_NODE(L"a:tailEnd"){CP_XML_ATTR(L"type",strVal.get());}
 				}
 			}
 		}
     }
 }
-void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop, const std::wstring & shapeGeomPreset, const std::wstring &ns)
+void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop, const std::wstring & shapeGeomPreset)
 {
-	std::wstring ns_att = (ns == L"a" ? L"" : ns + L":");
-
 	CP_XML_WRITER(strm)
     {
-		CP_XML_NODE(ns + L":avLst")
+		CP_XML_NODE(L"a:avLst")
 		{
 			_CP_OPT(std::wstring) strModifiers;
 			odf_reader::GetProperty(prop, L"oox-draw-modifiers", strModifiers);
@@ -245,16 +235,16 @@ void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_pro
 				{
 					names.push_back(L"adj1");
 				}
-				//else if (std::wstring::npos != shapeGeomPreset.find(L"decagon"))
-				//{
-				//	names.push_back(L"vf");
-				//}
-				//else if (std::wstring::npos != shapeGeomPreset.find(L"heptagon") ||
-				//		 std::wstring::npos != shapeGeomPreset.find(L"pentagon"))
-				//{
-				//	names.push_back(L"hf");
-				//	names.push_back(L"vf");
-				//}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"decagon"))
+				{
+					names.push_back(L"vf");
+				}
+				else if (std::wstring::npos != shapeGeomPreset.find(L"heptagon") ||
+						 std::wstring::npos != shapeGeomPreset.find(L"pentagon"))
+				{
+					names.push_back(L"hf");
+					names.push_back(L"vf");
+				}
 				else if (std::wstring::npos != shapeGeomPreset.find(L"hexagon"))
 				{
 					names.push_back(L"adj");
@@ -278,20 +268,20 @@ void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_pro
 				{
 					if (values[i].empty()) continue;
 					
-					CP_XML_NODE(ns + L":gd")
+					CP_XML_NODE(L"a:gd")
 					{
 						if (names.size() > i)
 						{
-							CP_XML_ATTR2(ns_att + L"name", names[i]);
+							CP_XML_ATTR(L"name", names[i]);
 						}
 						else
 						{
 							if (values.size() > 1)
-								CP_XML_ATTR2(ns_att + L"name", L"adj" + std::to_wstring(i + 1));
+								CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i + 1));
 							else
-								CP_XML_ATTR2(ns_att + L"name", L"adj");
+								CP_XML_ATTR(L"name", L"adj");
 						}						
-						CP_XML_ATTR2(ns_att + L"fmla", L"val " + values[i]);
+						CP_XML_ATTR(L"fmla", L"val " + values[i]);
 					}
 				}
 			}
@@ -420,7 +410,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 			shapeGeomPreset = L"rect";
 		}
 	}
-	else if (sub_type <= 12 && sub_type >= 0)
+	else if (sub_type < 10 && sub_type >= 0)
 	{
 		shapeGeomPreset = _ooxShapeType[sub_type]; //odf -> oox
 	} 

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -118,8 +118,8 @@ namespace oox {
     };   
 	typedef _CP_PTR(_oox_drawing) oox_drawing_ptr;
 
-	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false, const std::wstring &ns = L"a");
-	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val, const std::wstring & shapeGeomPreset, const std::wstring &ns = L"a");
+	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false);
+	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val, const std::wstring & shapeGeomPreset);
     void oox_serialize_action	(std::wostream & strm, const _action_desc & val);
     
 }

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -37,9 +37,9 @@
 namespace cpdoccore {
 namespace oox {
 
-	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false), bTile(false), isInternal(true), bGrayscale(false)
+	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false), bTile(false), isInternal(true)
 	{
-		memset(cropRect, 0, sizeof(double)*4);
+		memset(cropRect,0,sizeof(double)*4);
 	}
 	
 	oox_bitmap_fill_ptr oox_bitmap_fill::create(){return boost::make_shared<oox_bitmap_fill>();}
@@ -92,7 +92,7 @@ void oox_serialize_srgb(std::wostream & strm, const std::wstring &color, _CP_OPT
 			{
 				CP_XML_NODE(ns + L":alpha")
 				{
-					CP_XML_ATTR2(ns_att + L"val", std::to_wstring((int)opacity->get_value() * 1000));// + L"%");
+					CP_XML_ATTR2(ns_att + L"val", std::to_wstring((int)opacity->get_value()*1000));// + L"%");
 				}
 			}
 		}
@@ -189,11 +189,7 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val, cons
 					{
 						CP_XML_ATTR2(ns_att + L"amt", (int)(*val.opacity * 1000));
 					}
-				}
-				if (val.bitmap->bGrayscale)
-				{
-					CP_XML_NODE(ns + L":grayscl");
-				}
+				}		
 			}
 			if (val.bitmap->bCrop)
 			{
@@ -296,7 +292,7 @@ void oox_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val, co
 			{
 				CP_XML_NODE(ns + L":gsLst")
 				{
-					for (size_t i = 0; i < val.gradient->colors.size(); i++)
+					for (int i = 0; i < val.gradient->colors.size(); i++)
 					{
 						oox_gradient_fill::_color_position & col = val.gradient->colors[i];
 						CP_XML_NODE(ns + L":gs")

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -70,7 +70,6 @@ namespace oox {
 		bool			bStretch;
 		bool			bCrop;
 		bool			bTile;
-		bool			bGrayscale;
 
 		double			cropRect[4];//0-left, 1 -top, 2- right, 3 - bottom
 		

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -39,7 +39,7 @@ namespace oox {
 
 void oox_chart::set_cache_only (bool val)
 {
-	for (size_t i = 0 ; i < series_.size(); i++)
+	for (int i = 0 ; i < series_.size(); i++)
 	{
 		series_[i]->set_cache_only(val);
 	}

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -212,7 +212,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
                 }
 				CP_XML_NODE(L"p:cNvSpPr")//non visual properies (собственно тока 1 там)
 				{
-					if (val.sub_type == 1 || val.sub_type == 2)CP_XML_ATTR(L"txBox", 1);
+					if (val.sub_type==1 || val.sub_type==2)CP_XML_ATTR(L"txBox", 1);
 					CP_XML_NODE(L"a:spLocks")
 					{
 						CP_XML_ATTR(L"noGrp", 1);
@@ -274,7 +274,7 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val)
             } 
 			val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
 
-			//oox_serialize_ln(CP_XML_STREAM(), val.additional);
+			//oox_serialize_ln(CP_XML_STREAM(),val.additional);
 
             CP_XML_NODE(L"a:graphic")
             {                   
@@ -311,7 +311,7 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
             } 
 			val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
 
-			//oox_serialize_ln(CP_XML_STREAM(), val.additional);
+			//oox_serialize_ln(CP_XML_STREAM(),val.additional);
 
             CP_XML_NODE(L"a:graphic")
             {                   
@@ -352,7 +352,7 @@ void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
             } 
 			val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
 
-			//oox_serialize_ln(CP_XML_STREAM(), val.additional);
+			//oox_serialize_ln(CP_XML_STREAM(),val.additional);
 
             CP_XML_NODE(L"a:graphic")
             {                   

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -538,11 +538,8 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	drawing.fill.bitmap		= oox_bitmap_fill::create();
 	drawing.fill.type		= 2;
 	
-	_CP_OPT(std::wstring)	sTextContent, sColorMode;
-	
+	_CP_OPT(std::wstring) sTextContent;
 	GetProperty(obj.additional_, L"text-content", sTextContent);
-	GetProperty(obj.additional_, L"color-mode", sColorMode);
-
 	if (sTextContent)//в ms office на картинке нельзя сделать надпись - меняем тип на рект с заливкой картинкой
 	{
 		drawing.type		= typeShape;
@@ -552,9 +549,6 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + obj.xlink_href_;			
 	drawing.fill.bitmap->bCrop  = odf_reader::parse_clipping(obj.clipping_string_, fileName, drawing.fill.bitmap->cropRect, NULL);
 	drawing.fill.bitmap->bStretch = true;
-	
-	if ((sColorMode) && (*sColorMode == L"greyscale"))
-		drawing.fill.bitmap->bGrayscale	= true;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////			
 	std::wstring ref;/// это ссылка на выходной внешний объект

ASCOfficeOdfFile/src/docx/xlsx_comments.cpp

@@ -62,7 +62,7 @@ public:
 
 				CP_XML_NODE(L"authors")
 				{
-					for (size_t i = 0 ; i < author_list_.size(); i++)
+					for (int i = 0 ; i < author_list_.size(); i++)
 					{
 						const std::wstring & a = author_list_[i];
 						CP_XML_NODE(L"author")
@@ -74,7 +74,7 @@ public:
 
 				CP_XML_NODE(L"commentList")
 				{
-					for (size_t i = 0 ; i < xlsx_comment_.size(); i++)
+					for (int i = 0 ; i < xlsx_comment_.size(); i++)
 					{
 						const _xlsx_comment & c = xlsx_comment_[i];
 
@@ -107,7 +107,7 @@ public:
 			CP_XML_ATTR(L"xmlns:o", L"urn:schemas-microsoft-com:office:office");
 			CP_XML_ATTR(L"xmlns:x", L"urn:schemas-microsoft-com:office:excel");
  
-			for (size_t i = 0; i < xlsx_comment_.size(); i++)
+			for (int i = 0; i < xlsx_comment_.size(); i++)
 			{
 				const _xlsx_comment & c = xlsx_comment_[i];
 
@@ -222,7 +222,7 @@ public:
     void add(_xlsx_comment & c)
     {
 		bool find = false;
-		for (size_t i = 0; i < author_list_.size(); i++)
+		for (long i = 0; i < author_list_.size(); i++)
 		{		
 			if (c.author_ == author_list_[i])
 			{

ASCOfficeOdfFile/src/docx/xlsx_conditionalFormatting.cpp

@@ -36,10 +36,8 @@
 #include <vector>
 #include <boost/lexical_cast.hpp>
 #include <xml/simple_xml_writer.h>
-#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 #include "../formulasconvert/formulasconvert.h"
-
 namespace cpdoccore {
 namespace oox {
 
@@ -150,10 +148,7 @@ public:
                                 //CP_XML_ATTR(L"aboveAverage"	, 0);
 								if (c.rules[j].type == 1)
 								{
-									if (c.rules[j].formula_type)
-										CP_XML_ATTR(L"type", *c.rules[j].formula_type);
-									else
-										CP_XML_ATTR(L"type", L"cellIs");
+									CP_XML_ATTR(L"type", *c.rules[j].formula_type);									
 									if ((c.rules[j].formula) && (!c.rules[j].formula->empty()))
 									{
 										CP_XML_NODE(L"formula")
@@ -182,11 +177,13 @@ public:
 										{
 											c.rules[j].cfvo[k].serialize(CP_XML_STREAM());
 										}
-
-										CP_XML_NODE(L"color")
+										if (c.rules[j].color.size() > 0)
 										{
-											CP_XML_ATTR(L"rgb", !c.rules[j].color.empty() ? c.rules[j].color[0] : L"FF000000");
-										}
+											CP_XML_NODE(L"color")
+											{
+												CP_XML_ATTR(L"rgb", c.rules[j].color[0]);
+											}
+										}										
 									}
 								}
 								else if (c.rules[j].type == 3)
@@ -248,7 +245,7 @@ void xlsx_conditionalFormatting_context::add(std::wstring ref)
 	formulasconvert::odf2oox_converter converter;
 	impl_->conditionalFormattings_.push_back(conditionalFormatting());
 	
-	impl_->conditionalFormattings_.back().ref = converter.convert_named_ref(ref, false, L" ");
+	impl_->conditionalFormattings_.back().ref = converter.convert_named_ref(ref, false, L";");
 }
 
 void xlsx_conditionalFormatting_context::add_rule(int type)
@@ -263,21 +260,7 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
 	int pos = -1;
 	std::wstring val;
 	
-	if ( f == L"unique")
-	{
-		impl_->conditionalFormattings_.back().rules.back().formula_type = L"uniqueValues";
-		impl_->conditionalFormattings_.back().rules.back().formula = L"0";
-	}
-	else if ( f == L"duplicate")
-	{
-		impl_->conditionalFormattings_.back().rules.back().formula_type = L"duplicateValues";
-		impl_->conditionalFormattings_.back().rules.back().formula = L"0";
-	}	
-	else if ( f == L"above-average")
-	{
-		impl_->conditionalFormattings_.back().rules.back().formula_type = L"aboveAverage";
-	}
-	else if ( 0 <= (pos = f.find(L"formula-is(")))
+	if ( 0 <= (pos = f.find(L"formula-is(")))
 	{
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"expression";
 		val = f.substr(11, f.size() - 12);
@@ -309,45 +292,6 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
 	{
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"duplicateValues";
 	}
-	else if (0 <= (pos = f.find(L"contains-text")))
-	{
-		impl_->conditionalFormattings_.back().rules.back().formula_type = L"containsText";
-
-		std::wstring text = f.substr(14, f.length() - 15);
-
-		if (std::wstring::npos != text.find(L"IF(") || 
-			std::wstring::npos != text.find(L"AND(") ||
-			std::wstring::npos != text.find(L"NOT(") ||
-			std::wstring::npos != text.find(L"ISERROR(") ||
-			std::wstring::npos != text.find(L"SEARCH("))
-		{
-			impl_->conditionalFormattings_.back().rules.back().text = L"";
-			impl_->conditionalFormattings_.back().rules.back().formula = converter.convert(text);
-		}
-		else if (std::wstring::npos != text.find(L"LEN(TRIM(") && 
-			std::wstring::npos != text.find(L"=0"))
-		{
-			impl_->conditionalFormattings_.back().rules.back().text = L"";
-			impl_->conditionalFormattings_.back().rules.back().formula = L"0";
-		}
-		else
-		{
-			impl_->conditionalFormattings_.back().rules.back().operator_ = L"containsText";
-			if ( 0 == text.find(L"\"") && text.length() - 1 == text.rfind(L"\""))
-			{
-				text = text.substr(1, text.length() - 2);
-			}
-			std::wstring ref = impl_->conditionalFormattings_.back().ref;
-			
-			size_t pos;
-			if ((pos = ref.find(L":")) != std::wstring::npos)
-			{
-				ref = ref.substr(0, pos);
-			}
-			impl_->conditionalFormattings_.back().rules.back().text = text;
-			impl_->conditionalFormattings_.back().rules.back().formula = L"NOT(ISERROR(SEARCH(\"" + text + L"\"," + ref + L")))";
-		}
-	}
 	else if (0 <= (pos = f.find(L"top")))
 	{
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"top10";
@@ -358,10 +302,14 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
 		if (0 <= (pos = f.find(L"(")))
 		{
 			val = f.substr(pos + 1, f.length() - pos - 2);
-			if (!val.empty())
-				impl_->conditionalFormattings_.back().rules.back().rank = boost::lexical_cast<int>(val);
+			impl_->conditionalFormattings_.back().rules.back().rank = boost::lexical_cast<int>(val);
 		}	
 	}
+	else if (0 <= (pos = f.find(L"contains-text")))
+	{
+		impl_->conditionalFormattings_.back().rules.back().formula_type = L"containsText";
+		impl_->conditionalFormattings_.back().rules.back().text			= f.substr(15, f.length() - 17);
+	}
 	else
 	{
 		impl_->conditionalFormattings_.back().rules.back().formula_type = L"cellIs";
@@ -413,8 +361,6 @@ void xlsx_conditionalFormatting_context::set_formula(std::wstring f)
 			impl_->conditionalFormattings_.back().rules.back().operator_ = L"between";
 			val = f.substr(8, f.length() - 9);
 			
-			XmlUtils::replace_all(val, L"(", L"");
-			XmlUtils::replace_all(val, L")", L"");
 			if (0 <= (pos = val.find(L",")))
 			{
 				impl_->conditionalFormattings_.back().rules.back().formula2 = converter.convert_named_expr( val.substr(pos + 1) );
@@ -452,11 +398,7 @@ void xlsx_conditionalFormatting_context::add_sfv(int type, std::wstring value)
 		
 		impl_->conditionalFormattings_.back().rules.back().formula.reset(); 
 	}
-	else
-	{
-		if (!value.empty()) cfvo.val = value;
-		else cfvo.val = L"0";
-	}
+	else if (!value.empty()) cfvo.val = value;
 
 	impl_->conditionalFormattings_.back().rules.back().cfvo.push_back(cfvo);
 }

ASCOfficeOdfFile/src/docx/xlsx_defined_names.cpp

@@ -78,7 +78,7 @@ public:
             {
                 CP_XML_NODE(L"definedNames")
                 {
-                    for (size_t i = 0 ; i < content_.size(); i++)
+                    for (int i = 0 ; i < content_.size(); i++)
                     {
                         CP_XML_NODE(L"definedName")
                         {

ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp

@@ -252,7 +252,7 @@ void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
                 CP_XML_NODE(L"xdr:cNvGraphicFramePr");
             } 
 			val.serialize_xfrm(CP_XML_STREAM(), L"xdr");
-			//oox_serialize_ln(CP_XML_STREAM(), val.additional);
+			//oox_serialize_ln(CP_XML_STREAM(),val.additional);
 
             CP_XML_NODE(L"a:graphic")
             {                   

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -202,25 +202,20 @@ void xlsx_drawing_context::end_group()
 {
 	if (impl_->groups_.size() < 1) return;
 
-	if (impl_->groups_.back()->svg_rect_)
+	_rect & group_rect = impl_->groups_.back()->svg_rect_.get();
+
+	group_rect.cy -= group_rect.y;
+	group_rect.cx -= group_rect.x;
+
+	for (size_t i = 0; i < impl_->groups_.back()->child_objects_.size(); i++)
 	{
-		_rect & group_rect = impl_->groups_.back()->svg_rect_.get();
-
-		group_rect.cy -= group_rect.y;
-		group_rect.cx -= group_rect.x;
-
-		for (size_t i = 0; i < impl_->groups_.back()->child_objects_.size(); i++)
-		{
-			if (!impl_->groups_.back()->child_objects_[i].svg_rect_) continue;
-
-			_rect & r = impl_->groups_.back()->child_objects_[i].svg_rect_.get();
-			
-			r.y -= group_rect.y;
-			r.x -= group_rect.x;
-		}
+		_rect & r = impl_->groups_.back()->child_objects_[i].svg_rect_.get();
+		
+		r.y -= group_rect.y;
+		r.x -= group_rect.x;
 	}
 	
-	if (impl_->groups_.back()->in_group_ && impl_->groups_.back()->svg_rect_)
+	if (impl_->groups_.back()->in_group_)
 	{
 		_rect & objct_rect = impl_->groups_.back()->svg_rect_.get();
 		
@@ -256,8 +251,7 @@ void xlsx_drawing_context::start_drawing(std::wstring const & name)
 
 void xlsx_drawing_context::end_drawing()
 {
-	if (impl_->object_description_.in_group_ && 
-				impl_->object_description_.svg_rect_)
+	if (impl_->object_description_.in_group_)
 	{
 		_rect & objct_rect = impl_->object_description_.svg_rect_.get();
 		_rect & group_rect = impl_->groups_.back()->svg_rect_.get();
@@ -539,10 +533,8 @@ void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx
 		drawing.fill.bitmap = oox_bitmap_fill::create();
 		drawing.fill.type	= 2;
 	}
-	_CP_OPT(std::wstring)	sTextContent, sColorMode;
-	
-	GetProperty(obj.additional_, L"text-content", sTextContent);
-	GetProperty(obj.additional_, L"color-mode", sColorMode);
+	_CP_OPT(std::wstring) sTextContent;
+	GetProperty(obj.additional_,L"text-content",sTextContent);
 
 	if (sTextContent)//в ms office на картинке нельзя сделать надпись - меняем тип на рект с заливкой картинкой
 	{
@@ -554,9 +546,6 @@ void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx
 	drawing.fill.bitmap->bCrop		= odf_reader::parse_clipping(obj.clipping_string_, fileName, drawing.fill.bitmap->cropRect, NULL/*applicationFonts_*/);
 	drawing.fill.bitmap->bStretch	= true;
 
-	if ((sColorMode) && (*sColorMode == L"greyscale"))
-		drawing.fill.bitmap->bGrayscale	= true;
-
 	std::wstring ref;/// это ссылка на выходной внешний объект
 	bool isMediaInternal = false;
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

@@ -104,7 +104,7 @@ public:
 					CP_XML_ATTR(L"xmlns:a"	, L"http://schemas.openxmlformats.org/drawingml/2006/main");
 					CP_XML_ATTR(L"xmlns:r"	, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 
-					for (size_t i = 0 ; i < xlsx_drawings_.size(); i++)
+					for (int i = 0 ; i < xlsx_drawings_.size(); i++)
 					{
 						xlsx_drawings_[i].serialize(CP_XML_STREAM());
 					}

ASCOfficeOdfFile/src/docx/xlsx_dxfs.cpp

@@ -90,7 +90,7 @@ void xlsx_dxfs::serialize(std::wostream & _Wostream)  const
         {
             CP_XML_ATTR(L"count", impl_->dxf_array.size());
 			
-			for (size_t i = 0; i < impl_->dxf_array.size(); i++)
+			for (int i = 0; i < impl_->dxf_array.size(); i++)
             {
 				CP_XML_NODE(L"dxf")
 				{

ASCOfficeOdfFile/src/docx/xlsx_merge_cells.cpp

@@ -65,7 +65,7 @@ public:
                 {
                     CP_XML_ATTR(L"count", merges_.size());
 
-                    for (size_t i = 0 ; i < merges_.size(); i++)
+                    for (int i = 0 ; i < merges_.size(); i++)
                     {
 						merge & m = merges_[i];
 

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

@@ -52,7 +52,6 @@ public:
     std::wstringstream  hyperlinks_;
     std::wstringstream  comments_;
     std::wstringstream	sort_;
-	std::wstringstream	tableParts_;
     std::wstringstream	autofilter_;
 	std::wstringstream	conditionalFormatting_;
 	std::wstringstream  picture_background_;
@@ -100,18 +99,16 @@ std::wostream & xlsx_xml_worksheet::sheetFormat()
 {
     return impl_->sheetFormat_;
 }
+
 std::wostream & xlsx_xml_worksheet::sheetData()
 {
     return impl_->sheetData_;
 }
+
 std::wostream & xlsx_xml_worksheet::mergeCells()
 {
     return impl_->mergeCells_;
 }
-std::wostream & xlsx_xml_worksheet::tableParts()
-{
-    return impl_->tableParts_;
-}
 std::wostream & xlsx_xml_worksheet::conditionalFormatting()
 {
     return impl_->conditionalFormatting_;
@@ -218,13 +215,6 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
 					CP_XML_ATTR(L"r:id",impl_->vml_drawingId_);
 				}
 			}
-			if (!impl_->tableParts_.str().empty())
-            {
-                CP_XML_NODE(L"tableParts")
-                {
-					CP_XML_STREAM() << impl_->tableParts_.str();
-				}
-			}
 			if (!impl_->ole_objects_.str().empty())
             {
                 CP_XML_NODE(L"oleObjects")

ASCOfficeOdfFile/src/docx/xlsx_output_xml.h

@@ -60,7 +60,6 @@ public:
     std::wostream & drawing(); 
     std::wostream & comments();
 	std::wostream & autofilter();
-	std::wostream & tableParts();
 	std::wostream & conditionalFormatting();
 	std::wostream & picture_background();
 	std::wostream & dataValidations();

ASCOfficeOdfFile/src/docx/xlsx_package.cpp

@@ -244,10 +244,6 @@ void xl_files::write(const std::wstring & RootPath)
 	{
         charts_files_.set_main_document(get_main_document());
         charts_files_.write(path);
-    }
-	{
-        table_part_files_.set_main_document(get_main_document());
-        table_part_files_.write(path);
     }
 	if (drawings_)
     {
@@ -326,10 +322,6 @@ void xl_files::add_pivot_table(pivot_table_content_ptr pivot_table)
 {
     pivot_table_files_.add_pivot_table(pivot_table);
 }
-void xl_files::add_table_part(const std::wstring &content)
-{
-	table_part_files_.add_table_part(content);
-}
 void xl_files::add_jsaProject(const std::string &content)
 {
 	jsaProject_ = package::simple_element::create(L"jsaProject.bin", content);
@@ -426,42 +418,20 @@ void xl_pivot_table_files::write(const std::wstring & RootPath)
     }
 }
 //------------------------------------------------------------------------------------------------------
-void xl_table_part_files::add_table_part(const std::wstring & table_part)
-{
-    table_parts_.push_back(table_part);
-}
-void xl_table_part_files::write(const std::wstring & RootPath)
-{
-	if (table_parts_.empty()) return;
-
-	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"tables";
-    NSDirectory::CreateDirectory(path.c_str());
-	
-	for (size_t i = 0; i < table_parts_.size(); i++)
-    {
-        const std::wstring fileName = std::wstring(L"table") + std::to_wstring(i + 1) + L".xml";
-        content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
-       
-		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml";
-        contentTypes->add_override(std::wstring(L"/xl/tables/") + fileName, kWSConType);
-
-        package::simple_element(fileName, table_parts_[i]).write(path);
-    }
-}
-//------------------------------------------------------------------------------------------------------
 void xl_charts_files::add_chart(chart_content_ptr chart)
 {
     charts_.push_back(chart);
 }
 void xl_charts_files::write(const std::wstring & RootPath)
 {
-	if (charts_.empty()) return;
-
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"charts";
     NSDirectory::CreateDirectory(path.c_str());
 
+    size_t count = 0;
+
 	for (size_t i = 0; i < charts_.size(); i++)
     {
+        count++;
         const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(i + 1) + L".xml";
         content_type * contentTypes = this->get_main_document()->get_content_types_file().content();
        

ASCOfficeOdfFile/src/docx/xlsx_package.h

@@ -131,17 +131,7 @@ public:
 
 };
 
-class xl_table_part_files  : public element
-{
-public:
-	xl_table_part_files(){}
 
-    void add_table_part(const std::wstring & table_part);
-	virtual void write(const std::wstring & RootPath);
-    
-    std::vector<std::wstring> table_parts_;
-
-};
 class xl_charts_files  : public element
 {
 public:
@@ -254,7 +244,6 @@ public:
 	void add_pivot_table	(pivot_table_content_ptr table);
 	void add_jsaProject		(const std::string &content);
 	void add_control_props	(simple_element_ptr Element);
-	void add_table_part		(const std::wstring &content);
 
 private:
     rels_files				rels_files_;
@@ -263,8 +252,7 @@ private:
 	xl_pivot_cache_files	pivot_cache_files_;
 	xl_pivot_table_files	pivot_table_files_;
   	xl_control_props_files	control_props_files_;
-	xl_table_part_files		table_part_files_;
- 
+  
 	element_ptr		theme_;
     element_ptr		workbook_;
 

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.cpp

@@ -540,7 +540,7 @@ void xlsx_pivots_context::Impl::sort_fields()
 					}
 					else
 					{
-						if (count_items_row < (int)current_.fields[i].caches.size())
+						if (count_items_row < current_.fields[i].caches.size())
 							bAddRepeateRow = true;
 					}
 				}
@@ -772,7 +772,7 @@ void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 						{	
 							int fld = 0, ind_fld = current_.fields[ind_field_dirty].references_field < 0 ? ind_field_dirty : 
 														current_.fields[ind_field_dirty].references_field;
-							for (int k = 0; k < ind_fld; k++)
+							for (size_t k = 0; k < ind_fld; k++)
 							{
 								if (current_.fields[k].type != 7 ) fld++;
 							}
@@ -815,7 +815,7 @@ void xlsx_pivots_context::Impl::serialize_view(std::wostream & strm)
 							}
 							std::wstring name;
 
-							if (ind_field_dirty >= 0 && ind_field_dirty < (int)current_.fields.size())
+							if (ind_field_dirty >= 0 && ind_field_dirty < current_.fields.size())
 							{
 								switch(current_.fields[ind_field_dirty].function)
 								{
@@ -1470,7 +1470,7 @@ void xlsx_pivots_context::add_field_cache(int index, std::wstring value, bool sh
 	if (index < 0)
 		index = impl_->current_.fields.back().caches.size();
 
-	while (index > (int)impl_->current_.fields.back().caches.size())
+	while (index > impl_->current_.fields.back().caches.size())
 	{
 		Impl::_field_value f(L"", L"m", true);
 

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp

@@ -68,7 +68,7 @@ public:
     {
 		double length_pt =0;
  		
-		for (size_t i = 0; i < region_.size(); i++)
+		for (int i = 0; i < region_.size(); i++)
         {
 			region & r = region_[i];
             if (cell <= r.start_cell + r.count)
@@ -102,7 +102,7 @@ public:
 		if (pos < 0)//cs102.ods
 		{
 			int c_skip = 0, i = 0;
-			for (i = 0; i < (int)region_.size(); i++)
+			for (i = 0; i < region_.size(); i++)
 			{
 				if (region_[i].count + c_skip > offset)
 					break;
@@ -119,7 +119,7 @@ public:
 
 		}
         
-		for (size_t i = 0; i < region_.size(); i++)
+		for (int i = 0; i < region_.size(); i++)
         {
 			region & r = region_[i];
 			if (r.start_cell + r.count <= offset) 
@@ -172,7 +172,7 @@ public:
     }
     std::pair<int, double> search(double pos) 
     {
-		for (size_t i = 0; i < region_.size(); i++)
+		for (int i = 0; i < region_.size(); i++)
         {
 			region & r = region_[i];
 

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -134,21 +134,10 @@ xlsx_table_state::xlsx_table_state(xlsx_conversion_context * Context, std::wstri
     xlsx_comments_context_	(Context->get_comments_context_handle()),
     table_column_last_width_(0.0),
 	in_cell(false),
-	bEndTable_(false),
-	bRTL_(false)
+	bEndTable(false)
 
 {        
-	odf_reader::style_table_properties	* table_prop = NULL;
-	odf_reader::style_instance			* tableStyle = context_->root()->odf_context().styleContainer().style_by_name(table_style_, odf_types::style_family::Table, false);
-	
-	if ((tableStyle) && (tableStyle->content()))
-		table_prop = tableStyle->content()->get_style_table_properties();
-
-	if ((table_prop) && (table_prop->content().common_writing_mode_attlist_.style_writing_mode_))
-	{
-		if (table_prop->content().common_writing_mode_attlist_.style_writing_mode_->get_type() == odf_types::writing_mode::RlTb)
-			bRTL_ = true;
-	}
+	memset(&group_row_,0,sizeof(_group_row));
 }
     
 void xlsx_table_state::start_column(unsigned int repeated, const std::wstring & defaultCellStyleName)
@@ -160,11 +149,6 @@ void xlsx_table_state::start_column(unsigned int repeated, const std::wstring &
     columns_.push_back(repeated);
 }
 
-void xlsx_table_state::set_rtl(bool val)
-{
-	bRTL_ = val;
-}
-
 unsigned int xlsx_table_state::columns_count() const
 {
     return columns_count_;
@@ -211,7 +195,7 @@ std::wstring xlsx_table_state::default_row_cell_style() const
 
 std::wstring xlsx_table_state::default_column_cell_style() const
 {
-	if (current_table_column_ + 1 < (int)column_default_cell_style_name_.size())
+	if (current_table_column_ + 1 < column_default_cell_style_name_.size())
 		return column_default_cell_style_name_.at(current_table_column_ + 1);
 	else
 	{
@@ -240,10 +224,10 @@ void xlsx_table_state::start_cell(size_t columnsSpanned, size_t rowsSpanned)
 		xlsx_merge_cells_.add_merge(current_table_column_, current_table_row_, columnsSpanned, rowsSpanned);
 	}
 
-    //if ( current_columns_spaned() > 0 )
-    //{
-    //    _CP_LOG << L"[warning] current columns spanned > 0\n";
-    //}
+    if ( current_columns_spaned() > 0 )
+    {
+        _CP_LOG << L"[warning] current columns spanned > 0\n";
+    }
 
     columns_spanned_num_ = static_cast<int>(columnsSpanned);
 
@@ -257,16 +241,16 @@ void xlsx_table_state::start_cell(size_t columnsSpanned, size_t rowsSpanned)
             rows_spanned_.push_back(xlsx_row_spanned());   
     }
 
-    if ((int)rows_spanned_.size() <= current_table_column_)
+    if (rows_spanned_.size() <= current_table_column_)
     {
         _CP_LOG << L"[warning] set_rows_spanned error\n";
     }
     else
     {
-        //if (rows_spanned_[current_table_column_].num() > 0)
-        //{
-        //    _CP_LOG << L"[warning] current rows spanned > 0\n";
-        //}
+        if (rows_spanned_[current_table_column_].num() > 0)
+        {
+            _CP_LOG << L"[warning] current rows spanned > 0\n";
+        }
         rows_spanned_[current_table_column_].num(static_cast<unsigned int>(rowsSpanned));
         rows_spanned_[current_table_column_].column_spanned(static_cast<unsigned int>(columnsSpanned));
         for (size_t i = 0; i <= columns_spanned_num_; ++i)
@@ -437,9 +421,6 @@ void xlsx_table_state::serialize_table_format (std::wostream & strm)
 				{
 					CP_XML_ATTR(L"workbookViewId", 0);
 
-					if (bRTL_)
-						CP_XML_ATTR(L"rightToLeft", 1); 
-
 					std::wstring s_col, s_row;
 					for (int i = 0; i < odfContext.Settings().get_table_view_count(0, tableName_); i++)
 					{
@@ -477,6 +458,7 @@ void xlsx_table_state::serialize_table_format (std::wostream & strm)
 				}
 			}
 			//	-showRowColHeaders
+			//	-rightToLeft
 		} 
 
 		double default_height = (2 * context_->getMaxDigitSize().second * 72. / 96. * 100.) /100.;//in point size.

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

@@ -53,36 +53,6 @@ typedef _CP_PTR(xlsx_table_state) xlsx_table_state_ptr;
 class xlsx_data_range;
 typedef _CP_PTR(xlsx_data_range) xlsx_data_range_ptr;
 
-class xlsx_data_range_values;
-typedef _CP_PTR(xlsx_data_range_values) xlsx_data_range_values_ptr;
-
-class xlsx_data_range_values
-{
-public:
-	xlsx_data_range_values(size_t row, size_t col1, size_t col2) : withHeader(false), filter(false), row_header(row), start_column(col1), end_column(col2) 
-	{
-		for (size_t i = start_column; i <= end_column; i++)
-			values.push_back(L"");
-	}
-	
-	size_t row_header;
-	size_t start_column;
-	size_t end_column;
-
-	bool withHeader;
-	bool filter;
-
-	std::vector<std::wstring> values;
-
-	void set_value(size_t col, size_t row, const std::wstring& value)
-	{
-		while (col - start_column + 1 >= values.size())
-			values.push_back(L"");
-
-		values[col - start_column] = value;
-	}
-	bool in_range(size_t col, size_t row) {return (row_header == row && (col >= start_column && col <= end_column));}
-};
 
 class xlsx_data_range
 {
@@ -100,7 +70,7 @@ public:
 	bool			filter;
 	bool			withHeader;
 
-	std::vector<std::pair<size_t, bool>> bySort;  //field + order
+	std::vector<std::pair<int, bool>> bySort;  //field + order
 	
 	void serialize_sort			(std::wostream & _Wostream);
 	void serialize_autofilter	(std::wostream & _Wostream);
@@ -112,8 +82,6 @@ public:
     xlsx_table_state(xlsx_conversion_context * Context, std::wstring styleName, std::wstring tableName, int tableId);
     
 	std::wstring current_style() const { return table_style_; }
-
-	void set_rtl(bool val);
     
 	void start_column	(unsigned int repeated, const std::wstring & defaultCellStyleName);
     void start_row		(const std::wstring & StyleName, const std::wstring & defaultCellStyleName);
@@ -124,8 +92,8 @@ public:
 
 	void add_empty_row(int count);
 
-	void set_end_table(){ bEndTable_ = true; }
-	bool get_end_table(){ return bEndTable_; }
+	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;
@@ -179,18 +147,17 @@ public:
 	
 	struct _group_row
 	{
-		bool enabled = false;
-		int count = 0;
-		int level = 0;
-		bool collapsed = false;
+		bool enabled;
+		int count;
+		int level;
+		bool collapsed;
 	}group_row_;
 
 	friend class xlsx_conversion_context;
 	friend class xlsx_table_context;
 
 private:	
-	bool								bRTL_;
-	bool								bEndTable_;
+	bool								bEndTable;
     xlsx_conversion_context *			context_;    
 
     std::wstring						tableName_;

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -66,11 +66,11 @@ void xlsx_table_context::start_database_range(std::wstring tableName, std::wstri
 	ref	= convert.convert_named_ref(ref);
 
 	std::wstring ref1, ref2;
-	size_t pos = ref.find(L":");
+	int pos = ref.find(L":");
 
 	std::wstring xlsx_table_name;
 
-	if (pos != std::wstring::npos)
+	if (pos >= 0)
 	{
 		xlsx_data_ranges_.push_back(xlsx_data_range_ptr(new xlsx_data_range()));
 		xlsx_data_ranges_.back()->table_name = tableName;
@@ -90,15 +90,13 @@ void xlsx_table_context::start_database_range(std::wstring tableName, std::wstri
 	
 		xlsx_data_ranges_.back()->ref = ref1 + L":" + ref2;
 
-		size_t col1, col2, row1, row2;
+		size_t col, row;
 		
-		getCellAddressInv(ref1, col1, row1);
-		xlsx_data_ranges_.back()->cell_start = std::pair<int, int>(col1, row1);
+		getCellAddressInv(ref1, col, row);
+		xlsx_data_ranges_.back()->cell_start = std::pair<int, int>(col,row);
 
-		getCellAddressInv(ref2, col2, row2);
-		xlsx_data_ranges_.back()->cell_end = std::pair<int, int>(col2, row2);
-
-		xlsx_data_ranges_values_.push_back(xlsx_data_range_values_ptr(new xlsx_data_range_values(row1, col1, col2)));
+		getCellAddressInv(ref2, col, row);
+		xlsx_data_ranges_.back()->cell_end = std::pair<int, int>(col,row);
 	}
 
 	if (!xlsx_table_name.empty())
@@ -119,42 +117,17 @@ void xlsx_table_context::set_database_header (bool val)
 	if (xlsx_data_ranges_.empty()) return;
 
 	xlsx_data_ranges_.back()->withHeader = val;
-	xlsx_data_ranges_values_.back()->withHeader = val;
 }
 void xlsx_table_context::set_database_filter (bool val)
 {
 	if (xlsx_data_ranges_.empty()) return;
 
 	xlsx_data_ranges_.back()->filter = val;
-	xlsx_data_ranges_values_.back()->filter = val;
 }
 void xlsx_table_context::end_database_range()
 {
 }
 
-void xlsx_table_context::set_database_range_value(int index, const std::wstring& value)
-{
-	size_t col = state()->current_column();
-	size_t row = state()->current_row();
-
-	xlsx_data_ranges_values_[index]->set_value(col, row, value);
-}
-
-int xlsx_table_context::in_database_range()
-{
-	int col = state()->current_column();
-	int row = state()->current_row();
-
-	for (size_t i = 0; i < xlsx_data_ranges_values_.size(); i++)
-	{
-		if ((xlsx_data_ranges_values_[i]->withHeader || xlsx_data_ranges_values_[i]->filter)
-			&& xlsx_data_ranges_values_[i]->in_range(col, row))
-		{
-			return (int)i;
-		}
-	}
-	return -1;
-}
 void xlsx_table_context::add_database_sort(int field_number, int order)
 {
 	xlsx_data_ranges_.back()->bySort.push_back(std::pair<int, bool>(field_number, order == 1 ? false : true ));
@@ -285,83 +258,6 @@ void xlsx_table_context::serialize_sort(std::wostream & _Wostream)
 		xlsx_data_ranges_[it->second]->serialize_sort(_Wostream);
 	}
 }
-void xlsx_table_context::serialize_tableParts(std::wostream & _Wostream, rels & Rels)
-{
-	if (xlsx_data_ranges_.empty()) return;
-
-	std::pair<std::multimap<std::wstring, int>::iterator, std::multimap<std::wstring, int>::iterator> range;
-
-	range = xlsx_data_ranges_map_.equal_range(state()->tableName_);
-
-	for (std::multimap<std::wstring, int>::iterator it = range.first; it != range.second; ++it)
-	{
-		size_t id = xlsx_conversion_context_->get_table_parts_size() + 1;
-
-		std::wstring rId = L"tprtId" + std::to_wstring(id);
-		std::wstring ref = L"../tables/table" + std::to_wstring(id) + L".xml";
-		
-		CP_XML_WRITER(_Wostream)
-		{
-			CP_XML_NODE(L"tablePart")
-			{
-				CP_XML_ATTR(L"r:id", rId);
-			}
-		}
-		Rels.add( relationship(rId, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/table", ref));
-		
-		std::wstringstream strm;
-		CP_XML_WRITER(strm)
-		{			
-			CP_XML_NODE(L"table")
-			{
-				CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-				CP_XML_ATTR(L"id", id);
-				CP_XML_ATTR(L"name", xlsx_data_ranges_[it->second]->table_name);
-				CP_XML_ATTR(L"displayName", xlsx_data_ranges_[it->second]->table_name);
-				CP_XML_ATTR(L"ref", xlsx_data_ranges_[it->second]->ref);
-				
-				if (xlsx_data_ranges_[it->second]->withHeader == false && 
-					xlsx_data_ranges_[it->second]->filter == false)
-					CP_XML_ATTR(L"headerRowCount", 0);
-
-				CP_XML_ATTR(L"totalsRowCount", 0);
-				CP_XML_ATTR(L"totalsRowShown", 0);
-
-				xlsx_data_ranges_[it->second]->serialize_autofilter(CP_XML_STREAM());
-				xlsx_data_ranges_[it->second]->serialize_sort(CP_XML_STREAM());
-
-				CP_XML_NODE(L"tableColumns")
-				{
-					CP_XML_ATTR(L"count",	xlsx_data_ranges_[it->second]->cell_end.first - 
-											xlsx_data_ranges_[it->second]->cell_start.first + 1);
-					
-					for (int id = 0, i = xlsx_data_ranges_[it->second]->cell_start.first; i <= xlsx_data_ranges_[it->second]->cell_end.first; i++, id++)
-					{
-						CP_XML_NODE(L"tableColumn")
-						{
-							std::wstring column_name = xlsx_data_ranges_values_[it->second]->values[id];
-							if (column_name.empty())
-							{
-								column_name = L"Column_" + std::to_wstring(id + 1); 
-							}
-							CP_XML_ATTR(L"id", id + 1);
-							CP_XML_ATTR(L"name", column_name);
-						}
-					}
-				}
-				CP_XML_NODE(L"tableStyleInfo")
-				{
-					CP_XML_ATTR(L"showFirstColumn", 0);
-					CP_XML_ATTR(L"showLastColumn", 0);
-					CP_XML_ATTR(L"showRowStripes", 1);
-					CP_XML_ATTR(L"showColumnStripes", 0);				
-				}
-			}
-		}
-		xlsx_conversion_context_->add_table_part(strm.str());
-	}
-}
 void xlsx_table_context::serialize_autofilter(std::wostream & _Wostream)
 {
 	if (xlsx_data_ranges_.empty()) return;

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.h

@@ -82,7 +82,6 @@ public:
 
 	unsigned int columns_count();
 
-	void serialize_tableParts			(std::wostream & _Wostream, rels & Rels);
 	void serialize_sort					(std::wostream & _Wostream);
 	void serialize_autofilter			(std::wostream & _Wostream);
     void serialize_merge_cells			(std::wostream & _Wostream);
@@ -120,17 +119,15 @@ public:
 	void add_database_sort	(int field_number, int order);
 	void end_database_range();
 
-	int in_database_range();
-	void set_database_range_value(int index, const std::wstring& value);
+
 private:
     xlsx_conversion_context				*xlsx_conversion_context_;
     xlsx_text_context					&xlsx_text_context_;
 	
-	std::vector<xlsx_table_state_ptr>		xlsx_table_states_;
-	std::vector<xlsx_data_range_ptr>		xlsx_data_ranges_;
-	std::vector<xlsx_data_range_values_ptr>	xlsx_data_ranges_values_;
+	std::vector<xlsx_table_state_ptr>	 xlsx_table_states_;
+	std::vector<xlsx_data_range_ptr>	 xlsx_data_ranges_;
 	
-	std::multimap<std::wstring, int>		xlsx_data_ranges_map_;		
+	std::multimap<std::wstring, int>	 xlsx_data_ranges_map_;		
 
 };
 

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -71,7 +71,7 @@ xlsx_conversion_context::xlsx_conversion_context(odf_reader::odf_document * odfD
 	math_context_		(odf_document_->odf_context().fontContainer(), true),
 	xlsx_style_			(this),
 	
-	maxDigitSize_	(std::make_pair(-1.f, -1.f) ),
+	maxDigitSize_	(std::pair<float,float>(-1.0, -1.0) ),
 	default_style_	( (std::numeric_limits<size_t>::max)() ),
 	mediaitems_		(odf_document_->get_folder()),
 	xlsx_drawing_context_handle_(mediaitems_)
@@ -201,10 +201,6 @@ void xlsx_conversion_context::end_document()
 		
 		output_document_->get_xl_files().add_charts(content);
 	}
-    for (size_t i = 0; i < table_parts_.size(); i++)
-    {
-		output_document_->get_xl_files().add_table_part(table_parts_[i]);
-	}
     //workbook_content << L"<calcPr iterateCount=\"100\" refMode=\"A1\" iterate=\"false\" iterateDelta=\"0.0001\" />";
 
     {
@@ -440,9 +436,8 @@ void xlsx_conversion_context::end_table()
 	get_table_context().serialize_table_format			(current_sheet().sheetFormat());
 	get_table_context().serialize_page_properties		(current_sheet().page_properties());
 	get_table_context().serialize_conditionalFormatting	(current_sheet().conditionalFormatting());
-    get_table_context().serialize_tableParts			(current_sheet().tableParts(), current_sheet().sheet_rels());
-    //get_table_context().serialize_autofilter			(current_sheet().autofilter());
-    //get_table_context().serialize_sort				(current_sheet().sort());
+    get_table_context().serialize_autofilter			(current_sheet().autofilter());
+    get_table_context().serialize_sort					(current_sheet().sort());
     get_table_context().serialize_merge_cells			(current_sheet().mergeCells());
 	get_table_context().serialize_data_validation		(current_sheet().dataValidations());
     
@@ -652,36 +647,19 @@ std::pair<float,float> xlsx_conversion_context::getMaxDigitSize()
 		
 		odf_reader::odf_read_context & odfContext = root()->odf_context();
 		
-		odf_reader::style_instance *inst = odfContext.styleContainer().style_default_by_type(odf_types::style_family::TableCell);
-		if (inst) instances.push_back(inst);
-		
-		inst = odfContext.styleContainer().style_by_name(L"Default", odf_types::style_family::TableCell, false);
-		if (inst) instances.push_back(inst);
-		else
-		{
-			inst = odfContext.styleContainer().style_by_name(L"Normal", odf_types::style_family::TableCell, false);
-			if (inst) instances.push_back(inst);
-		}
+		instances.push_back(odfContext.styleContainer().style_default_by_type(odf_types::style_family::TableCell));
+		instances.push_back(odfContext.styleContainer().style_by_name(L"Default",odf_types::style_family::TableCell,false));
 
-		odf_reader::text_format_properties_content textFormatProperties	= calc_text_properties_content(instances);
+		odf_reader::text_format_properties_content			textFormatProperties	= calc_text_properties_content(instances);
 
-		if (textFormatProperties.fo_font_family_)
-			font_name = textFormatProperties.fo_font_family_.get();
+		if (textFormatProperties.style_font_name_)
+			font_name = textFormatProperties.style_font_name_.get();
+		else if (textFormatProperties.style_font_name_complex_)
+			font_name = textFormatProperties.style_font_name_complex_.get();
+		else if (textFormatProperties.style_font_name_asian_)
+			font_name = textFormatProperties.style_font_name_asian_.get();
 		else
-		{
-			std::wstring style_font_name;
-			if (textFormatProperties.style_font_name_)				style_font_name = textFormatProperties.style_font_name_.get();
-			else if (textFormatProperties.style_font_name_complex_)	style_font_name = textFormatProperties.style_font_name_complex_.get();
-			else if (textFormatProperties.style_font_name_asian_)	style_font_name = textFormatProperties.style_font_name_asian_.get();
-			
-			odf_reader::fonts_container & fonts = odf_document_->odf_context().fontContainer();
-			odf_reader::font_instance * font = fonts.font_by_style_name(style_font_name);
-			if (font)
-			{
-				font_name = font->name();
-			}
-		}
-		if (font_name.empty()) font_name = L"Arial";
+			font_name = L"Arial";
 
 		if ((textFormatProperties.fo_font_size_) && (textFormatProperties.fo_font_size_->get_type() == odf_types::font_size::Length))
 			font_size = (int)(0.5 + textFormatProperties.fo_font_size_->get_length().get_value_unit(odf_types::length::pt));

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -160,9 +160,6 @@ public:
 	void add_jsaProject	(const std::string &content);
 
 	void add_control_props(const std::wstring & rid, const std::wstring & target, const std::wstring & props);
-	
-	void add_table_part(const std::wstring & table) {table_parts_.push_back(table);}
-	size_t get_table_parts_size() {return table_parts_.size();}
 //------------------------------------------------------------------------------------
 
     odf_reader::odf_document * root()
@@ -209,8 +206,7 @@ private:
 
     std::vector<xlsx_xml_worksheet_ptr> sheets_;
     std::vector<oox_chart_context_ptr>  charts_;
-	std::vector<std::wstring>			table_parts_;
- 
+  
     std::wstringstream                  defaultOutput_;
     std::pair<float,float>              maxDigitSize_;
     num_format_context                  num_format_context_;

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -744,9 +744,6 @@ void process_build_object::visit(chart_title& val)
 	if (val.attlist_.common_draw_position_attlist_.svg_x_)
     {
         t.pos_x = val.attlist_.common_draw_position_attlist_.svg_x_->get_value_unit(length::pt);
-	}
-	if (val.attlist_.common_draw_position_attlist_.svg_y_)
-	{
 		t.pos_y = val.attlist_.common_draw_position_attlist_.svg_y_->get_value_unit(length::pt);
 	}
 	t.bEnabled = true;
@@ -1057,7 +1054,7 @@ void process_build_object::visit(table_table_cell& val)
 	if (cell_cash.empty())
 		cell_cash = cell_val;
 
-    object_odf_context::_cell cell_= {(size_t)object_odf_context_.current_table_column_, (size_t)object_odf_context_.current_table_row_, cell_cash};
+	object_odf_context::_cell cell_= {object_odf_context_.current_table_column_, object_odf_context_.current_table_row_, cell_cash};
 
 	object_odf_context_.cash_values.push_back(cell_);
 	

ASCOfficeOdfFile/src/odf/chart_build_oox.h

@@ -101,8 +101,8 @@ class object_odf_context
 public:
 	struct _cell
 	{
-		size_t col;
-		size_t row;
+		int col;
+		int row;
 		std::wstring val;
 	};
 

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp

@@ -106,13 +106,6 @@ void common_draw_fill_attlist::add_attributes( const xml::attributes_wc_ptr & At
 	CP_APPLY_ATTR(L"draw:fill-image-width",		draw_fill_image_width_);
 	CP_APPLY_ATTR(L"draw:fill-image-height",	draw_fill_image_height_);
 
-	CP_APPLY_ATTR(L"draw:color-mode",	draw_color_mode_);
-	CP_APPLY_ATTR(L"draw:contrast",		draw_contrast_);
-	CP_APPLY_ATTR(L"draw:luminance",	draw_luminance_);
-	CP_APPLY_ATTR(L"draw:gamma",		draw_gamma_);
-	CP_APPLY_ATTR(L"draw:red",			draw_red_);
-	CP_APPLY_ATTR(L"draw:green",		draw_green_);
-	CP_APPLY_ATTR(L"draw:blue",			draw_blue_);
 }
 void common_draw_fill_attlist::serialize(CP_ATTR_NODE)
 {
@@ -137,13 +130,6 @@ void common_draw_fill_attlist::serialize(CP_ATTR_NODE)
 	CP_XML_ATTR_OPT(L"draw:fill-image-width",		draw_fill_image_width_);
 	CP_XML_ATTR_OPT(L"draw:fill-image-height",		draw_fill_image_height_);
 
-	CP_XML_ATTR_OPT(L"draw:color-mode",		draw_color_mode_);
-	CP_XML_ATTR_OPT(L"draw:contrast",		draw_contrast_);
-	CP_XML_ATTR_OPT(L"draw:luminance",		draw_luminance_);
-	CP_XML_ATTR_OPT(L"draw:gamma",			draw_gamma_);
-	CP_XML_ATTR_OPT(L"draw:red",			draw_red_);
-	CP_XML_ATTR_OPT(L"draw:green",			draw_green_);
-	CP_XML_ATTR_OPT(L"draw:blue",			draw_blue_);
 }
 
 void common_draw_fill_attlist::apply_from(const common_draw_fill_attlist & Other)
@@ -164,14 +150,6 @@ void common_draw_fill_attlist::apply_from(const common_draw_fill_attlist & Other
 
 	_CP_APPLY_PROP2(draw_fill_image_width_);
 	_CP_APPLY_PROP2(draw_fill_image_height_);
-     
-    _CP_APPLY_PROP2(draw_color_mode_);
-    _CP_APPLY_PROP2(draw_contrast_);
-    _CP_APPLY_PROP2(draw_luminance_);
-    _CP_APPLY_PROP2(draw_gamma_);
-	_CP_APPLY_PROP2(draw_red_);
-    _CP_APPLY_PROP2(draw_green_);
-    _CP_APPLY_PROP2(draw_blue_);
 }
 
 void common_horizontal_margin_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.h

@@ -111,14 +111,6 @@ public:
 
 	_CP_OPT(length_or_percent)	draw_fill_image_width_;
 	_CP_OPT(length_or_percent)	draw_fill_image_height_;
-
-    _CP_OPT(std::wstring)		draw_color_mode_;
-    _CP_OPT(odf_types::percent)	draw_contrast_;
-    _CP_OPT(odf_types::percent)	draw_luminance_;
-    _CP_OPT(odf_types::percent)	draw_gamma_;
-    _CP_OPT(odf_types::percent)	draw_red_;
-    _CP_OPT(odf_types::percent)	draw_green_;
-    _CP_OPT(odf_types::percent)	draw_blue_;
 };
 
 // common-horizontal-margin-attlist

ASCOfficeOdfFile/src/odf/datatypes/custom_shape_types_convert.h

@@ -79,8 +79,8 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
 {L"up-down-arrow-callout"		,L"upDownArrowCallout"	,0	,0	,0	},
 {L"quad-arrow-callout"			,L"quadArrowCallout"	,0	,0	,0	},
 {L"circular-arrow"				,L"circularArrow"	,0	,0	,0	},
-{L"can"							,L"can"	,0	,0	,0	},
-{L"lightning"					,L"lightningBolt"	,0	,0	,0	},
+{L"can"							,L"lightningBolt"	,0	,0	,0	},
+{L"lightning"					,L"can"	,0	,0	,0	},
 {L"heart"						,L"heart"	,0	,0	,0	},
 {L"sun"							,L"sun"	,1	,46875	,12500	},
 {L"moon"						,L"moon"	,0	,0	,0	},
@@ -222,6 +222,7 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
 {L"concave-star6"			,L""	,0	,0	,0	},
 {L"signet"					,L""	,0	,0	,0	},
 {L"doorplate"				,L""	,0	,0	,0	},
+
 {L""						,L"round1Rect"		,0	,0	,0	},
 {L""						,L"round2DiagRect"	,0	,0	,0	},
 {L""						,L"snip2DiagRect"	,0	,0	,0	},

ASCOfficeOdfFile/src/odf/datatypes/mathvariant.cpp

@@ -86,7 +86,7 @@ math_variant::math_variant(const std::wstring & Value) :  none_(true)
 	std::vector< std::wstring > splitted;
 	boost::algorithm::split(splitted, Value, boost::algorithm::is_any_of(L" \t"), boost::algorithm::token_compress_on);
 
-	for (size_t i = 0 ; i < splitted.size(); i++)
+	for (int i = 0 ; i < splitted.size(); i++)
 	{
 		if (splitted[i] == L"bold")
 		{

ASCOfficeOdfFile/src/odf/draw_common.cpp

@@ -284,7 +284,7 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 		
 			point.pos = 0;
 			if (image_style->draw_start_color_)		point.color_ref = image_style->draw_start_color_->get_hex_value();
-			//if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
+			if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
 
 			fill->colors.push_back(point);
 
@@ -300,7 +300,7 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 			
 			point.pos = 0;
 			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
-			//if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 
@@ -312,7 +312,7 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 
 			point.pos = 100;
 			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
-			//if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 		}break;
@@ -328,13 +328,13 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 			
 			point.pos = 0;
 			if (image_style->draw_start_color_)		point.color_ref = image_style->draw_start_color_->get_hex_value();
-			//if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
+			if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 
 			point.pos = 100;
 			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
-			//if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 
 			fill->colors.push_back(point);
 
@@ -475,8 +475,6 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 				}
 			}
 		}
-		if ((props.draw_color_mode_) && (*props.draw_color_mode_ == L"greyscale"))
-			fill.bitmap->bGrayscale = true;
 	}
 	if (props.draw_fill_gradient_name_)
 	{

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -838,20 +838,12 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
 	} 
 	if (!drawing->isInline)
     {
-		drawing->relativeHeight	= L"2";
-        drawing->behindDoc		= L"0";
-
-		if (((drawing->styleWrap && drawing->styleWrap->get_type() == style_wrap::RunThrough) ||
-			!drawing->styleWrap) && styleRunThrough && styleRunThrough->get_type() == run_through::Background)
-        {
-           drawing->behindDoc = L"1";  
-		   if (!drawing->styleWrap)
-			   drawing->styleWrap = style_wrap(style_wrap::RunThrough);
-
-        }
 		if (!drawing->styleWrap)
 			drawing->styleWrap = style_wrap(style_wrap::Parallel);//у опен офис и мс разные дефолты
 
+        drawing->relativeHeight	= L"2";
+        drawing->behindDoc		= L"0";
+
         _CP_OPT(int) zIndex = attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_z_index_;
        
 		if (zIndex)//порядок отрисовки объектов
@@ -861,6 +853,14 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
             else
 				drawing->relativeHeight = std::to_wstring( 2 + *zIndex );
         }
+
+        if (drawing->styleWrap && drawing->styleWrap->get_type() == style_wrap::RunThrough 
+            && styleRunThrough && styleRunThrough->get_type() == run_through::Background
+            )
+        {
+           drawing-> behindDoc = L"1";            
+        }
+
         drawing->margin_rect[0] = GetMargin(graphicProperties, sideLeft);
         drawing->margin_rect[1] = GetMargin(graphicProperties, sideTop);
         drawing->margin_rect[2] = GetMargin(graphicProperties, sideRight);
@@ -874,14 +874,14 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
 			int type = attlists_.rel_size_.style_rel_width_->get_type();
 
 			if (type == odf_types::percent_or_scale::Percent)
-				drawing->pctWidth	= (int)attlists_.rel_size_.style_rel_width_->get_percent().get_value();
+				drawing->pctWidth	= attlists_.rel_size_.style_rel_width_->get_percent().get_value();
 		}
 		if (attlists_.rel_size_.style_rel_height_ )
 		{
 			int type = attlists_.rel_size_.style_rel_height_->get_type();
 
 			if (type == odf_types::percent_or_scale::Percent)
-				drawing->pctHeight	= (int)attlists_.rel_size_.style_rel_height_->get_percent().get_value();
+				drawing->pctHeight	= attlists_.rel_size_.style_rel_height_->get_percent().get_value();
 		}
 
     }
@@ -1038,9 +1038,7 @@ void draw_shape::docx_convert(oox::docx_conversion_context & Context)
 	drawing.sub_type	= sub_type_;
 	drawing.additional	= additional_;//сюда могут добавиться свойства ...
 
-	if (drawing.sub_type != 5 && 
-		drawing.sub_type != 11 && 
-		drawing.sub_type != 12 )//line, connectors
+	if (drawing.sub_type !=5 )//line
 	{
 		drawing.additional.push_back(_property(L"text-content", Context.get_drawing_context().get_text_stream_shape()));
 	}

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -546,9 +546,9 @@ void draw_enhanced_geometry::find_draw_type_oox()
 		if (!draw_type_oox_index_)
 		{
 			int count = sizeof(_OO_OOX_custom_shapes) / sizeof(_shape_converter);
-			size_t pos = odf_type.find(L"ooxml-");
+			int pos = odf_type.find(L"ooxml-");
 
-			if (pos == std::wstring::npos)
+			if (pos < 0)
 			{
 				for (long i = 0; i< count; i++)
 				{
@@ -562,7 +562,7 @@ void draw_enhanced_geometry::find_draw_type_oox()
 			else
 			{
 				std::wstring oox_type = odf_type.substr(pos + 6);
-				for (long i = 0; i < count; i++)
+				for (long i = 0; i< count; i++)
 				{
 					if (_OO_OOX_custom_shapes[i].oox == oox_type)
 					{
@@ -572,7 +572,7 @@ void draw_enhanced_geometry::find_draw_type_oox()
 					}	
 				}
 			}
-			if ((draw_type_oox_index_) && (*draw_type_oox_index_== 96))//L"textBox" "mso-spt24"
+			if ((draw_type_oox_index_) && (*draw_type_oox_index_== 179))//L"textBox"
 			{
 				sub_type_ = 1;//textBox
 			}
@@ -649,15 +649,17 @@ void draw_connector::add_attributes( const xml::attributes_wc_ptr & Attributes )
     draw_line_attlist_.add_attributes(Attributes);
 	draw_shape::add_attributes(Attributes);
 
-	sub_type_ = 10; //коннектор - линия, если ломаная (ниже определяется) - то путь
+	sub_type_ = 5; //коннектор - линия, если ломаная (ниже определяется) - то путь
 	
 }
 void draw_connector::reset_svg_path()
 {
-	if (draw_connector_attlist_.svg_d_)
+	if (!draw_connector_attlist_.svg_d_)
+	{
+		bad_shape_ = true;
+	}
+	else
 	{
-		sub_type_ = 8;
-
 		std::vector<::svg_path::_polyline> o_Polyline_pt;
 		std::vector<::svg_path::_polyline> o_Polyline_cm;
 	
@@ -705,7 +707,7 @@ void dr3d_scene::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 	draw_shape::add_attributes(Attributes);
 
-	sub_type_ = 12; 
+	sub_type_ = 10; 
 	
 }
 //-------------------------------------------------------------------------------------------

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -99,33 +99,10 @@ void draw_shape::common_docx_convert(oox::docx_conversion_context & Context)
 			oox::_oox_fill fill;
 			Compute_GraphicFill(graphicProp->common_draw_fill_attlist_, graphicProp->style_background_image_,
 																	Context.root()->odf_context().drawStyles(), fill);	
-			if ((fill.bitmap) && (fill.bitmap->rId.empty()))
-			{
-				std::wstring href = fill.bitmap->xlink_href_;
-				fill.bitmap->rId = Context.get_mediaitems().add_or_find(href, oox::typeImage, fill.bitmap->isInternal, href);
-				fill.bitmap->name_space = L"w14";
-			}
+			std::wstringstream strm;
+			oox::oox_serialize_fill(strm, fill, L"w14");
+			std::wstring textFill = strm.str();
 
-			std::wstringstream strm_fill, strm_ln;
-			oox::oox_serialize_fill(strm_fill, fill, L"w14");
-			std::wstring textFill = strm_fill.str();
-
-			std::vector<_property> props;
-			graphicProp->apply_to(props);
-
-			oox::oox_serialize_ln(strm_ln, props, false, L"w14");
-			std::wstring textLn = strm_ln.str();
-
-			std::wstring text_props;
-			if (!textLn.empty())
-			{
-				text_props += textLn;
-			}	
-			if (!textFill.empty())
-			{
-				text_props += L"<w14:textFill>" + textFill + L"</w14:textFill>";
-			}
-			Context.set_drawing_text_props(text_props);
 		}
 	}
 
@@ -215,18 +192,10 @@ void draw_path::docx_convert(oox::docx_conversion_context & Context)
 void draw_connector::docx_convert(oox::docx_conversion_context & Context)
 {
 	//if (Context.get_drawing_context().get_current_level() >0 )return;
-	if (draw_connector_attlist_.draw_type_)
-	{
-		if (*draw_connector_attlist_.draw_type_ == L"curve")
-		{
-			sub_type_ = 11;
-		}
-	}
-	reset_svg_attributes();	
+
 	common_docx_convert(Context);
 	//...
 	reset_svg_path();
-
 	draw_shape::docx_convert(Context);
 }
 void draw_polygon::docx_convert(oox::docx_conversion_context & Context)

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -298,13 +298,6 @@ void draw_connector::reset_svg_attributes()
 }
 void draw_connector::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	if (draw_connector_attlist_.draw_type_)
-	{
-		if (*draw_connector_attlist_.draw_type_ == L"curve")
-		{
-			sub_type_ = 11;
-		}
-	}
 	reset_svg_attributes();
 	reset_svg_path();
 ///////////////////////////////////////////////////////////////////////

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -211,15 +211,6 @@ void draw_path::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void draw_connector::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	if (draw_connector_attlist_.draw_type_)
-	{
-		if (*draw_connector_attlist_.draw_type_ == L"curve")
-		{
-			sub_type_ = 11;
-		}
-	}
-	reset_svg_attributes();	
-
 	reset_svg_path();
 ///////////////////////////////////////////////////////////////////////
 	Context.get_drawing_context().start_shape(6);

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -200,11 +200,7 @@ odf_document::Impl::Impl(const std::wstring & srcPath, const std::wstring & temp
 
 		if (false == map_encryptions_.empty())
 		{
-			if (password.empty())
-			{
-				bError = true;
-				return;
-			}
+			if (password.empty()) return;
 
 			//decrypt files
 			tmp_folder_ = NSDirectory::CreateDirectoryWithUniqueName(tempPath);
@@ -290,22 +286,17 @@ bool odf_document::Impl::decrypt_folder (const std::wstring &password, const std
 	bool result = true;
 	for (size_t i = 0; i < arFiles.size(); ++i)
 	{
-		result = false;
 		std::wstring sFileName = NSFile::GetFileName(arFiles[i]);
 		
-		std::map<std::wstring, std::pair<office_element_ptr, int>>::iterator pFind;
-		if (false == map_encryptions_.empty())
+		std::map<std::wstring, std::pair<office_element_ptr, int>>::iterator pFind = map_encryptions_.find(arFiles[i]);
+		if ( pFind != map_encryptions_.end() )
 		{
-			pFind = map_encryptions_.find(arFiles[i]);
-			if ( pFind != map_encryptions_.end() )
-			{
-				result = decrypt_file(password, arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName, pFind->second.first, pFind->second.second);
-				
-				if (false == result)
-					break;
-			}
+			result = decrypt_file(password, arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName, pFind->second.first, pFind->second.second);
+			
+			if (false == result)
+				break;
 		}
-		if (!result && false == map_encryptions_extra_.empty())
+		else 
 		{
 			pFind = map_encryptions_extra_.find(arFiles[i]);
 			if ( pFind != map_encryptions_.end() )
@@ -315,11 +306,10 @@ bool odf_document::Impl::decrypt_folder (const std::wstring &password, const std
 				if (false == result)
 					break;
 			}
-		}
-		if (!result) 
-		{
-			NSFile::CFileBinary::Copy(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName);
-			result = true;
+			else 
+			{
+				NSFile::CFileBinary::Copy(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName);
+			}
 		}
 	}
 	for (size_t i = 0; result && i < arDirectories.size(); ++i)

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -71,7 +71,7 @@ style_instance::style_instance(
    
 style_instance * styles_container::hyperlink_style()
 {
-    if (hyperlink_style_pos_ > 0 && hyperlink_style_pos_ < (int)instances_.size())
+    if (hyperlink_style_pos_ > 0 && hyperlink_style_pos_ < instances_.size())
         return instances_[hyperlink_style_pos_].get();
     else
         return NULL;

ASCOfficeOdfFile/src/odf/paragraph_elements.h

@@ -110,7 +110,7 @@ public:
 
     virtual void docx_convert(oox::docx_conversion_context & Context);
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context);
+    virtual void pptx_convert(oox::pptx_conversion_context & Context) ;
 
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
     

ASCOfficeOdfFile/src/odf/style_graphic_properties.cpp

@@ -122,10 +122,6 @@ void graphic_format_properties::apply_to(std::vector<_property> & properties)
 	if (draw_fit_to_size_)		properties.push_back(_property(L"fit-to-size",		*draw_fit_to_size_));
 	if (draw_fit_to_contour_)	properties.push_back(_property(L"fit-to-contour",	*draw_fit_to_contour_));
 
-	if (common_draw_fill_attlist_.draw_color_mode_)
-	{
-		properties.push_back(_property(L"color-mode", *common_draw_fill_attlist_.draw_color_mode_));
-	}
 	if (common_padding_attlist_.fo_padding_)
 	{
 		properties.push_back(_property(L"text-padding-left",	common_padding_attlist_.fo_padding_->get_value_unit(length::emu)));

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -109,8 +109,6 @@ std::wstring process_border(const border_style	& borderStyle,
         case border_style::inset:       w_val = L"inset";  break;
         case border_style::outset:      w_val = L"outset";  break;
         case border_style::hidden:      w_val = L"nil";     break;
-		default:
-			break;
         }
     }
     std::wstring res;

ASCOfficeOdfFile/src/odf/styles_lite_container.cpp

@@ -170,7 +170,7 @@ int settings_container::get_views_count()
 
 int settings_container::get_table_view_count(int ind, std::wstring name)
 {
-	if (ind < 0 || ind >= (int)impl_->views.size()) return 0;
+	if (ind < 0 || ind >= impl_->views.size()) return 0;
 	
     boost::unordered_map<std::wstring, int>::const_iterator i = impl_->views[ind].map_tables.find(name);
 	
@@ -211,13 +211,13 @@ std::pair<std::wstring, std::wstring> settings_container::get_table_view(int ind
 	
 	if (index		< 0) return value;
 	if (index_view	< 0 || 
-		index_view	>= (int)impl_->views.size()) return value;
+		index_view	>= impl_->views.size()) return value;
 	
     boost::unordered_map<std::wstring, int>::const_iterator i = impl_->views[index_view].map_tables.find(table_name);
 	
 	if (i == impl_->views[index_view].map_tables.end()) return value;
 		
-	if (index < (int)impl_->views[index_view].tables[i->second].array_.size())
+	if (index < impl_->views[index_view].tables[i->second].array_.size())
 	{
 		value.first		= impl_->views[index_view].tables[i->second].array_[index].name;
 		value.second	= impl_->views[index_view].tables[i->second].array_[index].value;
@@ -242,7 +242,7 @@ _CP_OPT(std::wstring) settings_container::find_view_by_name(const std::wstring &
 {
 	_CP_OPT(std::wstring) value;
 
-	if (ind < 0 || ind >= (int)impl_->views.size())
+	if (ind < 0 || ind >= impl_->views.size())
 	{
 		boost::unordered_map<std::wstring, int>::const_iterator i = impl_->common_view.map_.find(name);
 	    

ASCOfficeOdfFile/src/odf/svg_parser.cpp

@@ -817,11 +817,11 @@ namespace svg_path
 		
 		boost::algorithm::split(points_str,rPolygonStatement, boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
 
-		int last_x = 0, last_y = 0;
-		for (size_t i = 0; i < points_str.size(); i++)
+		int last_x=0,last_y=0;
+		for (long i=0; i< points_str.size();i++)
 		{
  			std::vector<std::wstring> point_str;
-			boost::algorithm::split(point_str, points_str[i], boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
+			boost::algorithm::split(point_str,points_str[i], boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
 			if (point_str.size()>0)last_x = boost::lexical_cast<int>(point_str[0]);
 			if (point_str.size()>1)last_y = boost::lexical_cast<int>(point_str[1]);

ASCOfficeOdfFile/src/odf/table.cpp

@@ -381,12 +381,11 @@ void table_table_cell::add_child_element( xml::sax * Reader, const std::wstring
 void table_table_cell::add_text(const std::wstring & Text)
 {
 }
-bool table_table_cell::empty(bool bWithStyle)
+bool table_table_cell::empty()
 {
 	if (!content_.elements_.empty()) return false;
 	if (attlist_.table_formula_) return false;
-	
-	if (bWithStyle && attlist_.table_style_name_) return false;
+	if (attlist_.table_style_name_) return false;
 	
 	if (attlist_extra_.table_number_columns_spanned_ > 1) return false;
 	if (attlist_extra_.table_number_rows_spanned_ > 1) return false;
@@ -455,7 +454,7 @@ bool table_table_row::empty()
 
 	return false;
 }
-bool table_table_row::empty_content_cells(bool bWithCellStyle)
+bool table_table_row::empty_content_cells()
 {
 	bool res = true;
 	
@@ -468,7 +467,7 @@ bool table_table_row::empty_content_cells(bool bWithCellStyle)
 			res = false;
 			break;
 		}
-		if (cell && cell->empty(bWithCellStyle) == false)
+		if (cell && cell->empty() == false)
 		{
 			res = false;
 			break;

ASCOfficeOdfFile/src/odf/table.h

@@ -362,7 +362,7 @@ private:
 
 public:
 	bool empty();
-	bool empty_content_cells(bool bWithCellStyle = true);
+	bool empty_content_cells();
 
     table_table_row_attlist		attlist_;
     office_element_ptr_array	content_;					// table-table-cell or table-covered-table-cell
@@ -411,7 +411,7 @@ private:
 
 public:
 	bool last_cell_;
-	bool empty(bool bWithStyle = true);
+	bool empty();
 
     table_table_cell_attlist		attlist_;
     table_table_cell_attlist_extra	attlist_extra_;

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -69,23 +69,9 @@ int table_table_cell_content::xlsx_convert(oox::xlsx_conversion_context & Contex
 	for (size_t i = 0 ; i < elements_.size(); i++)
     {
         elements_[i]->xlsx_convert(Context);
-	}
+    }
    
 	const int sharedStrId = Context.get_table_context().end_cell_content();
-
-	int index = Context.get_table_context().in_database_range();
-	
-	if (index >= 0)
-	{
-		std::wstringstream strm;
-		for (size_t i = 0 ; i < elements_.size(); i++)
-		{
-			elements_[i]->text_to_stream(strm);
-		}
-
-		Context.get_table_context().set_database_range_value(index, strm.str());
-
-	}
     return sharedStrId;
 }
 
@@ -98,7 +84,7 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 		Context.get_table_context().state()->add_empty_row(attlist_.table_number_rows_repeated_);
 		return;
 	}
-	if (attlist_.table_number_rows_repeated_ > 0x0f00 && empty_content_cells(false) || bEndTable)//0xf000 - conv_KDZO3J3xLIbZ5fC0HR0__xlsx.ods
+	if (attlist_.table_number_rows_repeated_ > 0x0f00 && empty_content_cells() || bEndTable)//0xf000 - conv_KDZO3J3xLIbZ5fC0HR0__xlsx.ods
 	{
 		Context.get_table_context().state()->set_end_table();
 		Context.get_table_context().state()->add_empty_row(attlist_.table_number_rows_repeated_);
@@ -445,8 +431,8 @@ namespace {
 // see ECMA-376 page 1768
 
 double pixToSize(double pixels, double maxDigitSize)
-{ 
-	return (int(( pixels /*/ 0.75*/ - 5)/ maxDigitSize * 100. + 0.5)) /100. * 0.9; // * 9525. * 72.0 / (360000.0 * 2.54);
+{
+	return (int(( pixels - 5)/ maxDigitSize * 100. + 0.5)) /100. * 0.9;
 }
 double cmToChars (double cm)
 {

ASCOfficeOdfFile/src/odf/text_elements.cpp

@@ -125,7 +125,7 @@ void process_paragraph_index(const paragraph_attrs & Attr, oox::docx_conversion_
 std::wostream & paragraph::text_to_stream(std::wostream & _Wostream) const
 {
     CP_SERIALIZE_TEXT(content_);
-    //_Wostream << L"\n";
+    _Wostream << L"\n";
     return _Wostream;
 }
 

ASCOfficeOdfFileW/OdfFileWTest/OdfFileWTest.cpp

@@ -96,7 +96,7 @@ HRESULT convert_single(std::wstring srcFileName)
 
 	Oox2Odf::Converter converter(srcTempPath, type, L"C:\\Windows\\Fonts", NULL);
 
-	std::wstring sPassword;// = L"password";
+	std::wstring sPassword = L"";//password";
 	
 	converter.convert();
 	converter.write(dstTempPath, srcTempPath, sPassword, L"hiuh56f56tfy7g");

ASCOfficeOdfFileW/source/OdfFormat/Shapes/odf_shape_mapping.h

@@ -42,9 +42,9 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeAccentBorderCallout1 = 0,
 	{	L""								,  7},			//	shapetypeAccentBorderCallout2,
 	{	L""								,  7},			//	shapetypeAccentBorderCallout3,
-	{	L""								,  7},			//	shapetypeAccentCallout1,
-	{	L""								,  7},			//	shapetypeAccentCallout2,
-	{	L""								,  7},			//	shapetypeAccentCallout3, 
+	{	L"mso-spt44"					,  7},			//	shapetypeAccentCallout1,
+	{	L"mso-spt45"					,  7},			//	shapetypeAccentCallout2,
+	{	L"mso-spt46"					,  7},			//	shapetypeAccentCallout3, 
 	{	L"actionButtonBackPrevious"		,  7},			//	shapetypeActionButtonBackPrevious,	//mso-spt194
 	{	L"mso-spt196"					,  7},			//	shapetypeActionButtonBeginning,
 	{	L"mso-spt189"					,  7},			//	shapetypeActionButtonBlank,
@@ -58,23 +58,23 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"mso-spt197"					,  7},			//	shapetypeActionButtonReturn,
 	{	L"mso-spt199"					,  7},			//	shapetypeActionButtonSound,
 	{	L""								,  7},			//	shapetypeArc,
-	{	L""								,  7},			//	shapetypeBentArrow,
-	{	L""								,  9},			//	shapetypeBentConnector2,
-	{	L""								,  9},			//	shapetypeBentConnector3,
-	{	L""								,  9},			//	shapetypeBentConnector4,
-	{	L""								,  9},			//	shapetypeBentConnector5,
+	{	L"mso-spt91"					,  7},			//	shapetypeBentArrow,
+	{	L"mso-spt33"					,  7},			//	shapetypeBentConnector2,
+	{	L"mso-spt34"					,  7},			//	shapetypeBentConnector3,
+	{	L"mso-spt35"					,  7},			//	shapetypeBentConnector4,
+	{	L"mso-spt36"					,  7},			//	shapetypeBentConnector5,
 	{	L""								,  7},			//	shapetypeBentUpArrow,
-	{	L""								,  7},			//	shapetypeBevel,
+	{	L"quad-bevel"					,  7},			//	shapetypeBevel,
 	{	L""								,  7},			//	shapetypeBlockArc,
-	{	L""								,  7},			//	shapetypeBorderCallout1,
-	{	L""								,  7},			//	shapetypeBorderCallout2,
-	{	L""								,  7},			//	shapetypeBorderCallout3,
-	{	L""								,  7},			//	shapetypeBracePair,
+	{	L"mso-spt49"					,  7},			//	shapetypeBorderCallout1,
+	{	L"mso-spt50"					,  7},			//	shapetypeBorderCallout2,
+	{	L"mso-spt51"					,  7},			//	shapetypeBorderCallout3,
+	{	L"brace-pair"					,  7},			//	shapetypeBracePair,
 	{	L""								,  7},			//	shapetypeBracketPair,
-	{	L""								,  7},			//	shapetypeCallout1,
-	{	L""								,  7},			//	shapetypeCallout2,
-	{	L""								,  7},			//	shapetypeCallout3,
-	{	L""								,  7},			//	shapetypeCan,
+	{	L"mso-spt41"					,  7},			//	shapetypeCallout1,
+	{	L"mso-spt42"					,  7},			//	shapetypeCallout2,
+	{	L"mso-spt43"					,  7},			//	shapetypeCallout3,
+	{	L"can"							,  7},			//	shapetypeCan,
 	{	L""								,  7},			//	shapetypeChartPlus,
 	{	L""								,  7},			//	shapetypeChartStar,
 	{	L""								,  7},			//	shapetypeChartX,
@@ -82,18 +82,18 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeChord,
 	{	L""								,  7},			//	shapetypeCircularArrow,
 	{	L"cloud"						,  7},			//	shapetypeCloud,
-	{	L""								,  7},			//	shapetypeCloudCallout,
+	{	L"cloud-callout"				,  7},			//	shapetypeCloudCallout,
 	{	L""								,  7},			//	shapetypeCorner,
 	{	L""								,  7},			//	shapetypeCornerTabs,
-	{	L""								,  7},			//	shapetypeCube,
-	{	L""								,  10},			//	shapetypeCurvedConnector2,
-	{	L""								,  10},			//	shapetypeCurvedConnector3,
-	{	L""								,  10},			//	shapetypeCurvedConnector4,
-	{	L""								,  10},			//	shapetypeCurvedConnector5,
+	{	L"cube"							,  7},			//	shapetypeCube,
+	{	L"mso-spt37"					,  7},			//	shapetypeCurvedConnector2,
+	{	L"mso-spt38"					,  7},			//	shapetypeCurvedConnector3,
+	{	L"mso-spt39"					,  7},			//	shapetypeCurvedConnector4,
+	{	L"mso-spt40"					,  7},			//	shapetypeCurvedConnector5,
 	{	L""								,  7},			//	shapetypeCurvedDownArrow,
 	{	L""								,  7},			//	shapetypeCurvedLeftArrow,
 	{	L""								,  7},			//	shapetypeCurvedRightArrow,
-	{	L""								,  7},			//	shapetypeCurvedUpArrow,
+	{	L"mso-spt104"					,  7},			//	shapetypeCurvedUpArrow,
 	{	L""								,  7},			//	shapetypeDecagon,
 	{	L""								,  7},			//	shapetypeDiagStripe,
 	{	L""								,  7},			//	shapetypeDiamond,
@@ -103,8 +103,8 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeDownArrow,
 	{	L""								,  7},			//	shapetypeDownArrowCallout,
 	{	L"ellipse"						,  3},			//	shapetypeEllipse,
-	{	L""								,  7},			//	shapetypeEllipseRibbon,
-	{	L""								,  7},			//	shapetypeEllipseRibbon2,
+	{	L"mso-spt107"					,  7},			//	shapetypeEllipseRibbon,
+	{	L"mso-spt108"					,  7},			//	shapetypeEllipseRibbon2,
 	{	L"flowchart-alternate-process"	,  7},			//	shapetypeFlowChartAlternateProcess,
 	{	L"flowchart-collate"			,  7},			//	shapetypeFlowChartCollate,
 	{	L"flowchart-connector"			,  7},			//	shapetypeFlowChartConnector,
@@ -134,23 +134,23 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"flowchart-sort"				,  7},			//	shapetypeFlowChartSort,
 	{	L"flowchart-summing-junction"	,  7},			//	shapetypeFlowChartSummingJunction,
 	{	L"flowchart-terminator"			,  7},			//	shapetypeFlowChartTerminator,
-	{	L""								,  7},			//	shapetypeFoldedCorner,
+	{	L"paper"						,  7},			//	shapetypeFoldedCorner,
 	{	L""								,  7},			//	shapetypeFrame,
 	{	L""								,  7},			//	shapetypeFunnel,
 	{	L""								,  7},			//	shapetypeGear6,
 	{	L""								,  7},			//	shapetypeGear9,
 	{	L""								,  7},			//	shapetypeHalfFrame,
-	{	L""								,  7},			//	shapetypeHeart,
+	{	L"heart"						,  7},			//	shapetypeHeart,
 	{	L""								,  7},			//	shapetypeHeptagon,
-	{	L""								,  7},			//	shapetypeHexagon,
+	{	L"hexagon"						,  7},			//	shapetypeHexagon,
 	{	L""								,  7},			//	shapetypeHomePlate,
 	{	L"horizontal-scroll"			,  7},			//	shapetypeHorizontalScroll,
 	{	L""								,  7},			//	shapetypeIrregularSeal1,
 	{	L""								,  7},			//	shapetypeIrregularSeal2,
 	{	L""								,  7},			//	shapetypeLeftArrow,
 	{	L""								,  7},			//	shapetypeLeftArrowCallout,
-	{	L""								,  7},			//	shapetypeLeftBrace,
-	{	L""								,  7},			//	shapetypeLeftBracket,
+	{	L"left-brace"					,  7},			//	shapetypeLeftBrace,
+	{	L"left-bracket"					,  7},			//	shapetypeLeftBracket,
 	{	L""								,  7},			//	shapetypeLeftCircularArrow,
 	{	L""								,  7},			//	shapetypeLeftRightArrow,
 	{	L"left-right-arrow-callout"		,  7},			//	shapetypeLeftRightArrowCallout,
@@ -158,7 +158,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeLeftRightRibbon,
 	{	L""								,  7},			//	shapetypeLeftRightUpArrow,
 	{	L""								,  7},			//	shapetypeLeftUpArrow,
-	{	L""								,  7},			//	shapetypeLightningBolt,
+	{	L"lightning"					,  7},			//	shapetypeLightningBolt,
 	{	L""								,  5},			//	shapetypeLine,
 	{	L""								,  7},			//	shapetypeLineInv,
 	{	L""								,  7},			//	shapetypeMathDivide,
@@ -167,27 +167,27 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeMathMultiply,
 	{	L""								,  7},			//	shapetypeMathNotEqual,
 	{	L""								,  7},			//	shapetypeMathPlus,
-	{	L""								,  7},			//	shapetypeMoon,
+	{	L"moon"							,  7},			//	shapetypeMoon,
 	{	L""								,  7},			//	shapetypeNonIsoscelesTrapezoid,
 	{	L"forbidden"					,  7},			//	shapetypeNoSmoking,
 	{	L""								,  7},			//	shapetypeNotchedRightArrow,
-	{	L""								,  7},			//	shapetypeOctagon,
+	{	L"octagon"						,  7},			//	shapetypeOctagon,
 	{	L""								,  7},			//	shapetypeParallelogram,
-	{	L""								,  7},			//	shapetypePentagon,
+	{	L"pentagon"						,  7},			//	shapetypePentagon,
 	{	L""								,  7},			//	shapetypePie,
 	{	L""								,  7},			//	shapetypePieWedge,
 	{	L""								,  7},			//	shapetypePlaque,
 	{	L""								,  7},			//	shapetypePlaqueTabs,
 	{	L""								,  7},			//	shapetypePlus,
 	{	L"quad-arrow"					,  7},			//	shapetypeQuadArrow,
-	{	L""								,  7},			//	shapetypeQuadArrowCallout,
+	{	L"quad-arrow-callout"			,  7},			//	shapetypeQuadArrowCallout,
 	{	L"rectangle"					,  2},			//	shapetypeRect,
-	{	L""								,  7},			//	shapetypeRibbon,
-	{	L""								,  7},			//	shapetypeRibbon2,
+	{	L"mso-spt53"					,  7},			//	shapetypeRibbon,
+	{	L"mso-spt54"					,  7},			//	shapetypeRibbon2,
 	{	L""								,  7},			//	shapetypeRightArrow,
 	{	L""								,  7},			//	shapetypeRightArrowCallout,
-	{	L""								,  7},			//	shapetypeRightBrace,
-	{	L""								,  7},			//	shapetypeRightBracket,
+	{	L"right-brace"					,  7},			//	shapetypeRightBrace,
+	{	L"right-bracket"				,  7},			//	shapetypeRightBracket,
 	{	L""								,  7},			//	shapetypeRound1Rect,
 	{	L""								,  7},			//	shapetypeRound2DiagRect,
 	{	L""								,  7},			//	shapetypeRound2SameRect,
@@ -209,7 +209,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeStar6,
 	{	L""								,  7},			//	shapetypeStar7,
 	{	L"star8"						,  7},			//	shapetypeStar8,
-	{	L""								,  5},			//	shapetypeStraightConnector1,
+	{	L"mso-spt32"					,  9},			//	shapetypeStraightConnector1,
 	{	L"striped-right-arrow"			,  7},			//	shapetypeStripedRightArrow,
 	{	L""								,  7},			//	shapetypeSun,
 	{	L""								,  7},			//	shapetypeSwooshArrow,
@@ -223,9 +223,9 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"mso-spt101"					,  7},			//	shapetypeUturnArrow,
 	{	L"vertical-scroll"				,  7},			//	shapetypeVerticalScroll,
 	{	L""								,  7},			//	shapetypeWave,
-	{	L""								,  7},			//	shapetypeWedgeEllipseCallout,
-	{	L""								,  7},			//	shapetypeWedgeRectCallout,
-	{	L""								,  7},			//	shapetypeWedgeRoundRectCallout,
+	{	L"round-callout"				,  7},			//	shapetypeWedgeEllipseCallout,
+	{	L"rectangular-callout"			,  7},			//	shapetypeWedgeRectCallout,
+	{	L"round-rectangular-callout"	,  7},			//	shapetypeWedgeRoundRectCallout,
 	{	L"mso-spt17"					,  7},			//	shapetypeBallon,
 	{	L"up-right-arrow"				,  7},			//	shapetypeRightUpArrow,
 	{	L"fontwork-arch-down-pour"		,  7},			//	shapetypeTextArchDownPour,