XlsFormat(linux style fix) + OdfFormatWriter (->ods)

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

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -36,6 +36,10 @@ namespace odf_writer
 	{
         L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
         //todooo -  ....   
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
+        L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934",
         L"#355a86", L"#883533", L"#6e963c", L"#594573", L"#327a8d", L"#3d679a", L"#9d3e3b", L"#7e9945", L"#674f84", L"#398ba2", L"#cb7934"
 	};
 

ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp

@@ -571,7 +571,7 @@ const std::string toStdString(std::wstring wide_string, const unsigned int code_
             nconv = iconv (ic, &inptr, &insize, &outptr, &avail);
             if (nconv == 0)
             {
-                insize = ansi_string.length();
+                insize = size;
                 ((wchar_t*)out_str)[insize] = 0;
                 w_out = std::wstring((wchar_t*)out_str, insize);
                 bAnsi = false;

ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp

@@ -89,12 +89,12 @@ const bool ChartSheetSubstream::loadContent(BinProcessor& proc)
 	if(!proc.mandatory<BOF>())
 	{
 		return false;
-	}
+    }
 	int count = 0 ;
 	
 	proc.optional<WriteProtect>();
 	proc.optional<SheetExt>();
-	proc.optional<WebPub>();
+    proc.optional<WebPub>();
 	proc.repeated<HFPicture>(0, 0);
 	proc.mandatory<PAGESETUP>();
 	proc.mandatory<PrintSize>();

DesktopEditor/Qt_build/graphics/project/graphics.pro

@@ -642,7 +642,6 @@ SOURCES += \
     ../../../raster/ImageFileFormatChecker.cpp \
     ../../../cximage/libpsd/test.c \
     ../../../raster/JBig2/source/LeptonLib/blend1.cpp \
-    ../../../raster/JBig2/source/LeptonLib/blend1.cpp \
     ../../../raster/Metafile/StarView/SvmClip.cpp \
     ../../../raster/Metafile/StarView/SvmFile.cpp \
     ../../../raster/Metafile/StarView/SvmObjects.cpp \

DesktopEditor/raster/BgraFrame.cpp

 #include "BgraFrame.h"
 #include "../common/File.h"
 #include "../cximage/CxImage/ximage.h"
+#include "ImageFileFormatChecker.h"
 
 #include "Jp2/J2kFile.h"
 #include "JBig2/source/JBig2File.h"
@@ -14,6 +15,11 @@ bool CBgraFrame::OpenFile(const std::wstring& strFileName, unsigned int nFileTyp
     }
 	else
 	{
+		if (nFileType == 0)
+		{
+			CImageFileFormatChecker checker(strFileName);
+			nFileType = checker.eFileType;
+		}
 		NSFile::CFileBinary oFile;
 		if (!oFile.OpenFile(strFileName))
 			return false;