порядок определения формата Checker

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

ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro

@@ -831,6 +831,8 @@ SOURCES +=  \
     ../XlsXlsxConverter/xlsx_tablecontext.cpp \
     ../XlsXlsxConverter/xlsx_textcontext.cpp \
     ../XlsXlsxConverter/xlsx_chart_context.cpp \
+    ../XlsXlsxConverter/xlsx_comments.cpp \
+    ../XlsXlsxConverter/xlsx_comments_context.cpp \
     ../XlsFormat/Logic/AnyObject.cpp \
     ../XlsFormat/Logic/AnySubstream.cpp \
     ../XlsFormat/Logic/BinProcessor.cpp \

Common/OfficeFileFormatChecker2.cpp

@@ -192,15 +192,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & fileName)
 		else if ( isBinaryPpttFormatFile(buffer,sizeRead) )
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
-		}
-        else if (isHtmlFormatFile(buffer,sizeRead) )
-        {
-            nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML;
-        }
-        else if (isFB2FormatFile(buffer,sizeRead) )
-        {
-            nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2;
-        }
+		}        
         else if (isPdfFormatFile(buffer,sizeRead) )
         {
             nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF;
@@ -209,6 +201,14 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & fileName)
         {
             nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU;
         }
+        else if (isHtmlFormatFile(buffer,sizeRead) )
+        {
+            nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML;
+        }
+        else if (isFB2FormatFile(buffer,sizeRead) )
+        {
+            nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2;
+        }
 	/////////////////////////////////////////////////////////////////////////
 		if (buffer)delete []buffer;
 		buffer = NULL;

DesktopEditor/doctrenderer/docbuilder.cpp

@@ -317,7 +317,7 @@ namespace NSDoctRenderer
 
             m_nFileType = -1;
 
-#if 1
+#if 0
             m_sX2tPath += L"/converter";
 #endif