From 2ff0280c6927e0500f950f41b8e7fd462e35d56f Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Tue, 28 Apr 2015 16:44:13 +0000 Subject: [PATCH] =?UTF-8?q?X2t=20-=20FileConverter=20linux=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20rtf,=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62346 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro | 15 +++++++++++-- .../DocFormatLib/DocFormatLib.cpp | 8 +++---- ASCOfficeDocFile/DocFormatLib/DocFormatLib.h | 18 +++++++-------- ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp | 6 +++-- .../raster/Metafile/Common/IOutputDevice.h | 3 ++- .../raster/Metafile/Common/MetaFileTypes.h | 22 ++++++++++++++----- DesktopEditor/raster/Metafile/MetaFile.cpp | 2 +- DesktopEditor/raster/Metafile/MetaFile.h | 2 +- DesktopEditor/raster/Metafile/Wmf/WmfFile.h | 2 +- 9 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro b/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro index 9b3b481919..34fa1b4b41 100644 --- a/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro +++ b/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro @@ -30,7 +30,10 @@ SOURCES += ../ASCSVGWriter.cpp \ ../../DesktopEditor/raster/Metafile/Emf/EmfObjects.cpp \ ../../DesktopEditor/raster/Metafile/Emf/EmfPath.cpp \ ../../DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp \ - ../../DesktopEditor/raster/Metafile/Emf/EmfClip.cpp + ../../DesktopEditor/raster/Metafile/Emf/EmfClip.cpp \ + ../../DesktopEditor/raster/Metafile/Common/MetaFileTypes.cpp \ + ../../DesktopEditor/raster/Metafile/Wmf/WmfObjects.cpp \ + ../../DesktopEditor/raster/Metafile/Wmf/WmfPlayer.cpp HEADERS += ../ASCSVGWriter.h \ ../CASCImage.h \ @@ -67,7 +70,15 @@ HEADERS += ../ASCSVGWriter.h \ ../../DesktopEditor/raster/Metafile/Wmf/WmfRegion.h \ ../../DesktopEditor/raster/Metafile/Wmf/WmfTypes.h \ ../../DesktopEditor/raster/Metafile/Wmf/WmfUtils.h \ - ../../DesktopEditor/raster/Metafile/Emf/EmfClip.h + ../../DesktopEditor/raster/Metafile/Emf/EmfClip.h \ + ../../DesktopEditor/raster/Metafile/Common/IOutputDevice.h \ + ../../DesktopEditor/raster/Metafile/Common/MetaFile.h \ + ../../DesktopEditor/raster/Metafile/Common/MetaFileClip.h \ + ../../DesktopEditor/raster/Metafile/Common/MetaFileObjects.h \ + ../../DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h \ + ../../DesktopEditor/raster/Metafile/Common/MetaFileTypes.h \ + ../../DesktopEditor/raster/Metafile/Wmf/WmfObjects.h \ + ../../DesktopEditor/raster/Metafile/Wmf/WmfPlayer.h unix { target.path = /usr/lib diff --git a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp index b54876a226..df868b8d73 100644 --- a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp +++ b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp @@ -6,17 +6,17 @@ #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h" #include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h" -HRESULT COfficeDocFile::LoadFromFile(CString bsDocFile, CString bsDocxDirectory, CString bsXMLOptions, ProgressCallback *ffCallBack ) +HRESULT COfficeDocFile::LoadFromFile(std::wstring bsDocFile, std::wstring bsDocxDirectory, ProgressCallback *ffCallBack ) { HRESULT hr = S_FALSE; DocFileFormat::Converter docToDocx; - hr= docToDocx.LoadAndConvert(bsDocFile, bsDocxDirectory, ffCallBack); + hr= docToDocx.LoadAndConvert(std_string2string(bsDocFile), std_string2string(bsDocxDirectory), ffCallBack); return hr; } -HRESULT COfficeDocFile::SaveToFile (CString sDstFileName, CString sSrcFileName, CString sXMLOptions, ProgressCallback *ffCallBack ) +HRESULT COfficeDocFile::SaveToFile (std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack ) { - return S_OK; + return S_OK; } diff --git a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h index ed6690aacd..d2d6ca7b98 100644 --- a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h +++ b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.h @@ -1,12 +1,10 @@ #ifndef DOC_FORMAT_LIB #define DOC_FORMAT_LIB -#if defined(_WIN32) || defined(_WIN64) - #include - #include -#else +#include + +#if !defined(_WIN32) && !defined(_WIN64) #include "../../DesktopEditor/common/ASCVariant.h" - #include "../../Common/DocxFormat/Source/Base/ASCString.h" #endif struct ProgressCallback; @@ -26,23 +24,23 @@ public: private: - CString m_strTempDirectory; + std::wstring m_strTempDirectory; public: - HRESULT put_TempDirectory(CString sDir) + HRESULT put_TempDirectory(std::wstring sDir) { m_strTempDirectory = sDir; return S_OK; } - CString get_TempDirectory() + std::wstring get_TempDirectory() { return m_strTempDirectory; } - HRESULT LoadFromFile(CString sSrcFileName, CString sDstFileName, CString sXMLOptions, ProgressCallback *ffCallBack = NULL); - HRESULT SaveToFile(CString sDstFileName, CString sSrcFileName, CString sXMLOptions, ProgressCallback *ffCallBack =NULL); + HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack); + HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack); }; diff --git a/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp b/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp index fa428b73fa..fc403f8f7d 100644 --- a/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp +++ b/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp @@ -396,9 +396,11 @@ namespace ZLibZipUtils std::wstring filenameW = codepage_issue_fixFromOEM(filename_inzip); - if (wcscmp(filename, filenameW.c_str())) + //todooo есть ли необходимость свести все к нижнему ??? + if (wcscmp(filename, filenameW.c_str()) == 0) return true; - return false; + + return false; } /*========================================================================================================*/ diff --git a/DesktopEditor/raster/Metafile/Common/IOutputDevice.h b/DesktopEditor/raster/Metafile/Common/IOutputDevice.h index 483fc986cc..18c7cf9057 100644 --- a/DesktopEditor/raster/Metafile/Common/IOutputDevice.h +++ b/DesktopEditor/raster/Metafile/Common/IOutputDevice.h @@ -2,6 +2,7 @@ #define _METAFILE_COMMON_IOUTPUTDEVICE_H #include "../Wmf/WmfTypes.h" +#include namespace MetaFile { @@ -40,4 +41,4 @@ namespace MetaFile } -#endif //_METAFILE_COMMON_IOUTPUTDEVICE_H \ No newline at end of file +#endif //_METAFILE_COMMON_IOUTPUTDEVICE_H diff --git a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h index 79ce18590e..12ada85a69 100644 --- a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h +++ b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h @@ -1,6 +1,21 @@ #ifndef _METAFILE_COMMON_METAFILETYPES_H #define _METAFILE_COMMON_METAFILETYPES_H + +#if !defined (_WIN32) && !defined(_WIN64) + #define BLACKONWHITE 1 + #define WHITEONBLACK 2 + #define COLORONCOLOR 3 + #define HALFTONE 4 + #define MAXSTRETCHBLTMODE 4 +#endif + +#define MWT_IDENTITY 0x01 +#define MWT_LEFTMULTIPLY 0x02 +#define MWT_RIGHTMULTIPLY 0x03 +#define MWT_SET 0x04 + + namespace MetaFile { struct TEmfPointL; @@ -82,11 +97,6 @@ namespace MetaFile unsigned char b; }; -#define MWT_IDENTITY 0x01 -#define MWT_LEFTMULTIPLY 0x02 -#define MWT_RIGHTMULTIPLY 0x03 -#define MWT_SET 0x04 - struct TXForm { double M11; @@ -172,4 +182,4 @@ namespace MetaFile }; } -#endif //_METAFILE_COMMON_METAFILETYPES_H \ No newline at end of file +#endif //_METAFILE_COMMON_METAFILETYPES_H diff --git a/DesktopEditor/raster/Metafile/MetaFile.cpp b/DesktopEditor/raster/Metafile/MetaFile.cpp index a1c5ec7235..f3424aa651 100644 --- a/DesktopEditor/raster/Metafile/MetaFile.cpp +++ b/DesktopEditor/raster/Metafile/MetaFile.cpp @@ -149,7 +149,7 @@ namespace MetaFile if (c_lMetaWmf == m_lType) { #ifdef NEW_WMF - TRectD& oRect = m_oWmfFile.GetBounds(); + const TRectD& oRect = m_oWmfFile.GetBounds(); *pdX = oRect.dLeft; *pdY = oRect.dTop; *pdW = oRect.dRight - oRect.dLeft; diff --git a/DesktopEditor/raster/Metafile/MetaFile.h b/DesktopEditor/raster/Metafile/MetaFile.h index aed2ede405..1d47fc00a0 100644 --- a/DesktopEditor/raster/Metafile/MetaFile.h +++ b/DesktopEditor/raster/Metafile/MetaFile.h @@ -40,4 +40,4 @@ namespace MetaFile }; } -#endif //_METAFILE_H \ No newline at end of file +#endif //_METAFILE_H diff --git a/DesktopEditor/raster/Metafile/Wmf/WmfFile.h b/DesktopEditor/raster/Metafile/Wmf/WmfFile.h index be8f44dd38..6417b1ce99 100644 --- a/DesktopEditor/raster/Metafile/Wmf/WmfFile.h +++ b/DesktopEditor/raster/Metafile/Wmf/WmfFile.h @@ -28,7 +28,7 @@ namespace MetaFile ClearFile(); } - TRectD GetBounds() + TRectD GetBounds() { TRect oBB; if (IsPlaceable())