(2.0.0.159) theme передается раньше

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53135 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -6215,6 +6215,14 @@ namespace BinDocxRW
 
 				int nCurPos = 0;
 
+				LPSAFEARRAY pThemeData = NULL;
+				if(NULL != m_pTheme)
+				{
+					BSTR bstrThemePath = m_pTheme->m_oReadPath.GetPath().AllocSysString();
+					m_pOfficeDrawingConverter->GetThemeBinary(bstrThemePath, &pThemeData);
+					SysFreeString(bstrThemePath);
+				}
+
 				//Write Settings
 				OOX::CSettings* pSettings = oDocx.GetSettings();
 				if(NULL != pSettings)
@@ -6299,13 +6307,6 @@ namespace BinDocxRW
 				oBinaryDocumentTableWriter.Write(poDocument->m_arrItems);
 				this->WriteTableEnd(nCurPos);
 
-				LPSAFEARRAY pThemeData = NULL;
-				if(NULL != m_pTheme)
-				{
-					BSTR bstrThemePath = m_pTheme->m_oReadPath.GetPath().AllocSysString();
-					m_pOfficeDrawingConverter->GetThemeBinary(bstrThemePath, &pThemeData);
-					SysFreeString(bstrThemePath);
-				}
 				this->WriteMainTableEnd(pThemeData);
 			}
 			void ParagraphAddBreak(OOX::Logic::CParagraph* pParagraph)

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//158
-#define INTVER 2,0,0,158
-#define STRVER "2,0,0,158\0"
+//159
+#define INTVER 2,0,0,159
+#define STRVER "2,0,0,159\0"