убрано раздвоение

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

ASCOfficeDocxFile2/BinReader/FileWriter.h

@@ -12,12 +12,8 @@
 #include "ChartWriter.h"
 #include "DocumentRelsWriter.h"
 #include "webSettingsWriter.h"
+#include "DefaultThemeWriter.h"
 
-#if defined(_WIN32) || defined (_WIN64)
-	#include "DefaultThemeWriterWin.h"
-#else
-	#include "DefaultThemeWriterLinux.h"
-#endif
 namespace BinDocxRW {
 	class CComments;
 }

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -186,8 +186,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const CString& sSrcFileName, const
 			CStringA sCurSig((char*)pBase64Data, nSigLength);
 			if((CStringA)sSignature == sCurSig)
 			{
-				bValidFormat = true;
-			}
+                bValidFormat = true;
+            }
 		}
 		if(bValidFormat)
 		{
@@ -207,7 +207,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const CString& sSrcFileName, const
 						nType = 1;
 						continue;
 					}
-					else
+                    else
 					{
 						nIndex++;
 						break;

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -7,11 +7,7 @@
 #include "../../XlsxSerializerCom/Writer/BinaryReader.h"
 #include "../../ASCOfficePPTXFile/Editor/FontPicker.h"
 
-#if defined(_WIN32) || defined (_WIN64)
-	#include "../BinReader/DefaultThemeWriterWin.h"
-#else
-	#include "../BinReader/DefaultThemeWriterLinux.h"
-#endif
+#include "../BinReader/DefaultThemeWriter.h"
 
 namespace BinXlsxRW{
 	int g_nCurFormatVersion = 0;

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -73,8 +73,8 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
     ../../XlsxSerializerCom/Writer/BinaryReader.h \
     ../../XlsxSerializerCom/Writer/CSVWriter.h \
     ../BinReader/webSettingsWriter.h \
-    ../BinReader/DefaultThemeWriterLinux.h \
-    ../../Common/FileDownloader.h
+    ../../Common/FileDownloader.h \
+    ../BinReader/DefaultThemeWriter.h
 
 unix {
     target.path = /usr/lib

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -491,7 +491,6 @@ namespace NSBinPptxRW
 
             if (conversionOK != eUnicodeConversionResult)
             {
-                return;
             }
         }
         else
@@ -597,7 +596,6 @@ namespace NSBinPptxRW
 
         if (conversionOK != eUnicodeConversionResult)
         {
-            return;
         }
         m_lPosition += lSizeMem;
 		m_pStreamCur += lSizeMem;
@@ -652,7 +650,6 @@ namespace NSBinPptxRW
 
         if (conversionOK != eUnicodeConversionResult)
         {
-            return;
         }
 
         m_lPosition += lSizeMem;
@@ -761,7 +758,6 @@ namespace NSBinPptxRW
 
             if (conversionOK != eUnicodeConversionResult)
             {
-                return;
             }
         }else
         {
@@ -806,7 +802,6 @@ namespace NSBinPptxRW
 
             if (conversionOK != eUnicodeConversionResult)
             {
-                return;
             }
         }else
         {
@@ -847,7 +842,6 @@ namespace NSBinPptxRW
 
             if (conversionOK != eUnicodeConversionResult)
             {
-                return;
             }
         }else
         {

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -527,7 +527,10 @@ HEADERS += pptxformatlib.h \
     ../../../../Common/FileDownloader.h \
     ../../../PPTXFormat/DocxFormat/Drawing/LegacyDiagramText.h \
     ../../../PPTXFormat/DocxFormat/Drawing/VmlDrawing.h \
-    ../../../PPTXFormat/Logic/Controls.h
+    ../../../PPTXFormat/Logic/Controls.h \
+    ../../../../ASCOfficeDocxFile2/BinReader/DefaultThemeWriter.h \
+    ../../../../ASCOfficeDocxFile2/BinReader/FileWriter.h \
+    ../../../../ASCOfficeDocxFile2/BinReader/SettingWriter.h
 unix {
     target.path = /usr/lib
     INSTALLS += target