From 73ef4140a208d57e7af453808f351403af0cabf9 Mon Sep 17 00:00:00 2001 From: Alexey Musinov Date: Fri, 9 Nov 2018 14:33:25 +0300 Subject: [PATCH] [x2t] rename String.h -> StringExt.h --- .../DocDocxConverter/VMLPictureMapping.cpp | 2 +- .../DocDocxConverter/VMLShapeMapping.cpp | 2 +- .../XlsxFormat/Chart/ChartSerialize.cpp | 2 +- .../Source/XlsxFormat/SharedStrings/Text.h | 2 +- .../common/{String.cpp => StringExt.cpp} | 2 +- .../common/{String.h => StringExt.h} | 0 DesktopEditor/graphics/MetafileToRenderer.cpp | 2 +- .../metafile.xcodeproj/project.pbxproj | 12 +- .../raster/Metafile/Common/MetaFileTypes.h | 2 +- DesktopEditor/raster/Metafile/Emf/EmfFile.cpp | 2 +- .../raster/Metafile/StarView/SvmObjects.cpp | 2 +- DesktopEditor/raster/Metafile/Wmf/WmfFile.h | 2 +- DjVuFile/DjVuFileImplementation.cpp | 2 +- DjVuFile/DjVuFileTest/DjVuFileTest.cpp | 2 +- HtmlFile/HtmlFile.cpp | 2 +- PdfReader/Src/StringExt.h | 2 +- PdfWriter/OnlineOfficeBinToPdf.cpp | 2 +- .../X2tConverter/X2tConverter/X2tConverter.h | 7 + .../X2tConverter/X2tConverter/X2tConverter.mm | 109 ++++++++++++++- X2tConverter/src/ASCConverters_ios.cpp | 128 ++++++++++-------- XpsFile/XpsFileTest/XpsFileTest.cpp | 2 +- XpsFile/XpsLib/Page.cpp | 2 +- XpsFile/XpsLib/Utils.cpp | 2 +- XpsFile/XpsLib/WString.cpp | 2 +- 24 files changed, 211 insertions(+), 83 deletions(-) rename DesktopEditor/common/{String.cpp => StringExt.cpp} (99%) rename DesktopEditor/common/{String.h => StringExt.h} (100%) diff --git a/ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp index 1130508a94..44d14c918c 100644 --- a/ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp @@ -38,7 +38,7 @@ #include "OfficeDrawing/GroupShapeBooleanProperties.h" #include "OfficeDrawing/MetafilePictBlip.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../Common/DocxFormat/Source/DocxFormat/Document.h" #include "../../DesktopEditor/common/File.h" diff --git a/ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp b/ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp index 9a04d40741..ddd65f60a2 100644 --- a/ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp +++ b/ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp @@ -55,7 +55,7 @@ #include "DrawingPrimitives.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../Common/FormatUtils.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp b/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp index a1ac68c15d..2d2bc1a5b5 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp +++ b/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp @@ -31,7 +31,7 @@ */ //Generated code #include "ChartSerialize.h" -#include "../../../../../DesktopEditor/common/String.h" +#include "../../../../../DesktopEditor/common/StringExt.h" namespace OOX{ namespace Spreadsheet{ diff --git a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h index 2e9ead1d2a..71175bb677 100644 --- a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h +++ b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/Text.h @@ -34,7 +34,7 @@ #define OOX_TEXT_FILE_INCLUDE_H_ #include "../CommonInclude.h" -#include "../../../../../DesktopEditor/common/String.h" +#include "../../../../../DesktopEditor/common/StringExt.h" namespace OOX { diff --git a/DesktopEditor/common/String.cpp b/DesktopEditor/common/StringExt.cpp similarity index 99% rename from DesktopEditor/common/String.cpp rename to DesktopEditor/common/StringExt.cpp index 8e4d5f3533..67137381f0 100644 --- a/DesktopEditor/common/String.cpp +++ b/DesktopEditor/common/StringExt.cpp @@ -30,7 +30,7 @@ * */ #include "CPEncodings/CodePage.h" -#include "String.h" +#include "StringExt.h" namespace NSStringExt { diff --git a/DesktopEditor/common/String.h b/DesktopEditor/common/StringExt.h similarity index 100% rename from DesktopEditor/common/String.h rename to DesktopEditor/common/StringExt.h diff --git a/DesktopEditor/graphics/MetafileToRenderer.cpp b/DesktopEditor/graphics/MetafileToRenderer.cpp index fdc8d23c5a..b0906e2924 100644 --- a/DesktopEditor/graphics/MetafileToRenderer.cpp +++ b/DesktopEditor/graphics/MetafileToRenderer.cpp @@ -35,7 +35,7 @@ #include "agg_math.h" #if !defined(_WIN32) && !defined(_WIN64) -#include "../common/String.h" +#include "../common/StringExt.h" #endif IMetafileToRenderter::IMetafileToRenderter(IRenderer* pRenderer) diff --git a/DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj b/DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj index fcdb79b2e1..1c952a0ef1 100644 --- a/DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj +++ b/DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj @@ -173,7 +173,7 @@ 17A7F02B1B13154500760AFB /* SvmPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17A7F0221B13154500760AFB /* SvmPlayer.cpp */; }; 17DD67B71B7E2778000F800F /* lepton_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17DD67B51B7E2778000F800F /* lepton_utils.cpp */; }; 697B72D41E3B78D90054C17C /* EmfFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 697B72D31E3B78D90054C17C /* EmfFile.cpp */; }; - 8A404FD1208A00F100F2D5CF /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A404FCF208A00F000F2D5CF /* String.cpp */; }; + 8AC2819D2195A582006FA3D7 /* StringExt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AC2819B2195A582006FA3D7 /* StringExt.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -436,8 +436,8 @@ 17A7F0231B13154500760AFB /* SvmPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SvmPlayer.h; sourceTree = ""; }; 17DD67B51B7E2778000F800F /* lepton_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lepton_utils.cpp; sourceTree = ""; }; 697B72D31E3B78D90054C17C /* EmfFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmfFile.cpp; sourceTree = ""; }; - 8A404FCF208A00F000F2D5CF /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = String.cpp; path = ../../../common/String.cpp; sourceTree = ""; }; - 8A404FD0208A00F100F2D5CF /* String.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = String.h; path = ../../../common/String.h; sourceTree = ""; }; + 8AC2819B2195A582006FA3D7 /* StringExt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringExt.cpp; path = ../../../common/StringExt.cpp; sourceTree = ""; }; + 8AC2819C2195A582006FA3D7 /* StringExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringExt.h; path = ../../../common/StringExt.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -478,8 +478,8 @@ 17A762EF1B0F36790046BC0B /* Wmf */, 17A762EB1B0F366F0046BC0B /* MetaFile.cpp */, 17A762EC1B0F366F0046BC0B /* MetaFile.h */, - 8A404FCF208A00F000F2D5CF /* String.cpp */, - 8A404FD0208A00F100F2D5CF /* String.h */, + 8AC2819B2195A582006FA3D7 /* StringExt.cpp */, + 8AC2819C2195A582006FA3D7 /* StringExt.h */, ); path = metafile; sourceTree = ""; @@ -914,6 +914,7 @@ 17A764131B0F39370046BC0B /* ccthin.cpp in Sources */, 17A764091B0F39370046BC0B /* boxbasic.cpp in Sources */, 17A764211B0F39370046BC0B /* colorseg.cpp in Sources */, + 8AC2819D2195A582006FA3D7 /* StringExt.cpp in Sources */, 17A764F51B0F39370046BC0B /* tiffiostub.cpp in Sources */, 17A764011B0F39370046BC0B /* blend1.cpp in Sources */, 17A7641D1B0F39370046BC0B /* colorquant1.cpp in Sources */, @@ -988,7 +989,6 @@ 17A764E51B0F39370046BC0B /* selgen.cpp in Sources */, 17A7630E1B0F38480046BC0B /* EmfPath.cpp in Sources */, 17A764831B0F39370046BC0B /* partition.cpp in Sources */, - 8A404FD1208A00F100F2D5CF /* String.cpp in Sources */, 17A763FF1B0F39370046BC0B /* binreducelow.cpp in Sources */, 17A764E31B0F39370046BC0B /* sel2.cpp in Sources */, 17A764E91B0F39370046BC0B /* skew.cpp in Sources */, diff --git a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h index ba61807a01..f3b57c5e29 100644 --- a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h +++ b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h @@ -33,7 +33,7 @@ #define _METAFILE_COMMON_METAFILETYPES_H #include -#include "../../../common/String.h" +#include "../../../common/StringExt.h" #ifndef BYTE typedef unsigned char BYTE; diff --git a/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp b/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp index dee259c0a0..0bcb526c24 100644 --- a/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp +++ b/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp @@ -30,7 +30,7 @@ * */ -#include "../../../common/String.h" +#include "../../../common/StringExt.h" #include "../../../fontengine/FontManager.h" #include "EmfFile.h" diff --git a/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp b/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp index d12f0336af..3596399b04 100644 --- a/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp +++ b/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp @@ -31,7 +31,7 @@ */ #include "SvmObjects.h" -#include "../../../common/String.h" +#include "../../../common/StringExt.h" #include "../../../../UnicodeConverter/UnicodeConverter.h" static const char* CodingCharsets[95] = diff --git a/DesktopEditor/raster/Metafile/Wmf/WmfFile.h b/DesktopEditor/raster/Metafile/Wmf/WmfFile.h index 92a7947920..4968cbf04b 100644 --- a/DesktopEditor/raster/Metafile/Wmf/WmfFile.h +++ b/DesktopEditor/raster/Metafile/Wmf/WmfFile.h @@ -32,7 +32,7 @@ #ifndef _METAFILE_WMF_WMFFILE_H #define _METAFILE_WMF_WMFFILE_H -#include "../../../common/String.h" +#include "../../../common/StringExt.h" #include "../../../fontengine/FontManager.h" #include "../Common/IOutputDevice.h" diff --git a/DjVuFile/DjVuFileImplementation.cpp b/DjVuFile/DjVuFileImplementation.cpp index d44f50f530..9f68180408 100644 --- a/DjVuFile/DjVuFileImplementation.cpp +++ b/DjVuFile/DjVuFileImplementation.cpp @@ -40,7 +40,7 @@ #include "../DesktopEditor/graphics/pro/Graphics.h" #include "../DesktopEditor/graphics/pro/Image.h" -#include "../DesktopEditor/common/String.h" +#include "../DesktopEditor/common/StringExt.h" #define VER_DPI 96 #define HOR_DPI 96 diff --git a/DjVuFile/DjVuFileTest/DjVuFileTest.cpp b/DjVuFile/DjVuFileTest/DjVuFileTest.cpp index 2d6da1e270..3999c51dbb 100644 --- a/DjVuFile/DjVuFileTest/DjVuFileTest.cpp +++ b/DjVuFile/DjVuFileTest/DjVuFileTest.cpp @@ -39,7 +39,7 @@ #include #include "windows.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../DesktopEditor/fontengine/ApplicationFonts.h" #include #include diff --git a/HtmlFile/HtmlFile.cpp b/HtmlFile/HtmlFile.cpp index 27f67dac12..01d2b98eea 100644 --- a/HtmlFile/HtmlFile.cpp +++ b/HtmlFile/HtmlFile.cpp @@ -38,7 +38,7 @@ #include "../DesktopEditor/common/File.h" #include "../DesktopEditor/common/Directory.h" #include "../DesktopEditor/common/StringBuilder.h" -#include "../DesktopEditor/common/String.h" +#include "../DesktopEditor/common/StringExt.h" #include "../DesktopEditor/xml/include/xmlutils.h" #include "../DesktopEditor/fontengine/application_generate_fonts_common.h" diff --git a/PdfReader/Src/StringExt.h b/PdfReader/Src/StringExt.h index d02dd5b2a5..03162eaf19 100644 --- a/PdfReader/Src/StringExt.h +++ b/PdfReader/Src/StringExt.h @@ -34,7 +34,7 @@ #include #include -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include namespace PdfReader diff --git a/PdfWriter/OnlineOfficeBinToPdf.cpp b/PdfWriter/OnlineOfficeBinToPdf.cpp index 8bff474ef6..ed5c5ac34b 100644 --- a/PdfWriter/OnlineOfficeBinToPdf.cpp +++ b/PdfWriter/OnlineOfficeBinToPdf.cpp @@ -34,7 +34,7 @@ #include "../DesktopEditor/common/File.h" #include "../DesktopEditor/common/Directory.h" #include "../DesktopEditor/common/Base64.h" -#include "../DesktopEditor/common/String.h" +#include "../DesktopEditor/common/StringExt.h" #include "../DesktopEditor/graphics/MetafileToRenderer.h" #include "../DesktopEditor/raster/BgraFrame.h" diff --git a/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h b/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h index e6f2a32f27..c6affcff9f 100644 --- a/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h +++ b/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h @@ -72,6 +72,13 @@ - (int)sdk_xlst2csv:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; - (int)sdk_xlsx2csv:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlsx:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlsx_dir:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlst:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlst_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlsm:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; +- (int)sdk_xls2xlsm_dir:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; + - (int)txt2doct_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath; - (int)sdk_dir2zip:(NSString*)nsFrom nsTo:(NSString*)nsTo; diff --git a/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm b/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm index 8a080ac89c..5b151a8d68 100644 --- a/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm +++ b/X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm @@ -100,7 +100,7 @@ static std::wstring nsstring_to_wstring(NSString* nsstring) oInputParams.m_sSavePassword = new std::wstring(nsstring_to_wstring(self.password)); std::wstring sResultDecryptFile = temp + FILE_SEPARATOR_STR + L"uncrypt_file.docx"; - + if ((int)AVS_FILEUTILS_ERROR_CONVERT != NExtractTools::doct_bin2docx(from, sResultDecryptFile, temp, bFromChanges, themeDir, oInputParams)) { return oox2mscrypt(sResultDecryptFile, to, temp, oInputParams); } @@ -175,7 +175,7 @@ static std::wstring nsstring_to_wstring(NSString* nsstring) oInputParams.m_sSavePassword = new std::wstring(nsstring_to_wstring(self.password)); std::wstring sResultDecryptFile = temp + FILE_SEPARATOR_STR + L"uncrypt_file.xlsx"; - + if ((int)AVS_FILEUTILS_ERROR_CONVERT != NExtractTools::xlst_bin2xlsx(from, sResultDecryptFile, temp, bFromChanges, themeDir, oInputParams)) { return oox2mscrypt(sResultDecryptFile, to, temp, oInputParams); } @@ -349,6 +349,109 @@ static std::wstring nsstring_to_wstring(NSString* nsstring) return NExtractTools::xlsx2csv(from, to, temp, oInputParams); } +- (int)sdk_xls2xlsx:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlsx(from, to, temp, oInputParams); +} +- (int)sdk_xls2xlsx_dir:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlsx_dir(from, to, temp, oInputParams); +} +- (int)sdk_xls2xlst:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlst(from, to, temp, oInputParams); +} +- (int)sdk_xls2xlst_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlst_bin(from, to, temp, oInputParams); +} +- (int)sdk_xls2xlsm:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlsm(from, to, temp, oInputParams); +} +- (int)sdk_xls2xlsm_dir:(NSString*)nsFrom nsTo:(NSString*)nsTo xmlOptions:(NSString*)xmlOptions nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { + std::wstring from = nsstring_to_wstring(nsFrom); + std::wstring to = nsstring_to_wstring(nsTo); + std::wstring temp = nsstring_to_wstring(nsTemp); + + // TODO: extract xml options + + NExtractTools::InputParams oInputParams; + oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); + oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); + + if (self.password) { + oInputParams.m_sPassword = new std::wstring(nsstring_to_wstring(self.password)); + } + + return NExtractTools::xls2xlsm_dir(from, to, temp, oInputParams); +} + - (int)txt2doct_bin:(NSString*)nsFrom nsTo:(NSString*)nsTo nsTemp:(NSString*)nsTemp nsFontPath:(NSString*)nsFontPath { std::wstring from = nsstring_to_wstring(nsFrom); std::wstring to = nsstring_to_wstring(nsTo); @@ -357,7 +460,7 @@ static std::wstring nsstring_to_wstring(NSString* nsstring) NExtractTools::InputParams oInputParams; oInputParams.m_sFontDir = new std::wstring(nsstring_to_wstring(nsFontPath)); oInputParams.m_bIsNoBase64 = new bool(self.isNoBase64); - + if (self.encoding != nil) { oInputParams.m_nCsvTxtEncoding = new int(self.encoding.intValue); } diff --git a/X2tConverter/src/ASCConverters_ios.cpp b/X2tConverter/src/ASCConverters_ios.cpp index e18091fce6..75cc2d44a4 100644 --- a/X2tConverter/src/ASCConverters_ios.cpp +++ b/X2tConverter/src/ASCConverters_ios.cpp @@ -3560,77 +3560,95 @@ namespace NExtractTools // xls -> xlsx _UINT32 xls2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) { - std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked"); - - NSDirectory::CreateDirectory(sResultDocxDir); - - _UINT32 nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sTemp, params); - if(SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, true)) - return 0; - } +// std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked"); +// +// NSDirectory::CreateDirectory(sResultDocxDir); +// +// _UINT32 nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sTemp, params); +// if(SUCCEEDED_X2T(nRes)) +// { +// COfficeUtils oCOfficeUtils(NULL); +// if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDocxDir, sTo, true)) +// return 0; +// } return AVS_FILEUTILS_ERROR_CONVERT; } _UINT32 xls2xlsx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { -// long hRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), NULL); -// if (AVS_ERROR_DRM == hRes) -// { -// if(!params.getDontSaveAdditional()) -// { -// copyOrigin(sFrom, *params.m_sFileTo); -// } -// return AVS_FILEUTILS_ERROR_CONVERT_DRM; -// } -// else if (AVS_ERROR_PASSWORD == hRes) -// { -// return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD; -// } -// return 0 == hRes ? 0 : AVS_FILEUTILS_ERROR_CONVERT; - return AVS_FILEUTILS_ERROR_CONVERT; - } - + {return 0; +// bool bMacros = false; +// +// _UINT32 nRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), sTemp, NULL, bMacros); +// +// nRes = processEncryptionError(nRes, sFrom, params); +// return nRes; + } + // xls -> xlsm + _UINT32 xls2xlsm (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) + { +// std::wstring sResultXlsmDir = sTemp + FILE_SEPARATOR_STR + _T("xlsm_unpacked"); +// +// NSDirectory::CreateDirectory(sResultXlsmDir); +// +// _UINT32 nRes = xls2xlsm_dir(sFrom, sResultXlsmDir, sTemp, params); +// +// if(SUCCEEDED_X2T(nRes)) +// { +// COfficeUtils oCOfficeUtils(NULL); +// if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultXlsmDir, sTo, true)) + return 0; +// } +// return nRes; + } + _UINT32 xls2xlsm_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) + {return 0; +// bool bMacros = true; +// +// _UINT32 nRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), sTemp, NULL, bMacros); +// +// nRes = processEncryptionError(nRes, sFrom, params); +// return nRes; + } // xls -> xlst _UINT32 xls2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { + { return 0; // Extract xlsx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked"); - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); - - NSDirectory::CreateDirectory(sResultDoctDir); - - _UINT32 nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params); - - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } - - return nRes; +// std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked"); +// std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); +// +// NSDirectory::CreateDirectory(sResultDoctDir); +// +// _UINT32 nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params); +// +// if (SUCCEEDED_X2T(nRes)) +// { +// COfficeUtils oCOfficeUtils(NULL); +// nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; +// } +// +// return nRes; } - // xls -> xlst_bin - _UINT32 xls2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { -// std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked"; + // xls -> xlst_bin + _UINT32 xls2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) + {return 0; +// std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked"); // // NSDirectory::CreateDirectory(sResultXlsxDir); // -// if (ConvertXls2Xlsx( sFrom, sResultXlsxDir, params.getPassword(), params.getFontPath(), NULL)== S_OK) +// bool bMacros = true; +// _UINT32 nRes = ConvertXls2Xlsx( sFrom, sResultXlsxDir, params.getPassword(), params.getFontPath(), sTemp, NULL, bMacros); +// +// nRes = processEncryptionError(nRes, sFrom, params); +// if (SUCCEEDED_X2T(nRes)) // { // BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; // // m_oCXlsxSerializer.setFontDir(params.getFontPath()); // -// int res = m_oCXlsxSerializer.saveToFile (sTo, sResultXlsxDir, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; -// -// return res; -// +// return m_oCXlsxSerializer.saveToFile (sTo, sResultXlsxDir, params.getXmlOptions()); // } - return AVS_FILEUTILS_ERROR_CONVERT; - } +// return nRes; + } + } diff --git a/XpsFile/XpsFileTest/XpsFileTest.cpp b/XpsFile/XpsFileTest/XpsFileTest.cpp index 7d6f0653d0..b32059a4fe 100644 --- a/XpsFile/XpsFileTest/XpsFileTest.cpp +++ b/XpsFile/XpsFileTest/XpsFileTest.cpp @@ -40,7 +40,7 @@ #include #include "windows.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../DesktopEditor/fontengine/ApplicationFonts.h" #include diff --git a/XpsFile/XpsLib/Page.cpp b/XpsFile/XpsLib/Page.cpp index f6155385eb..084784a6cc 100644 --- a/XpsFile/XpsLib/Page.cpp +++ b/XpsFile/XpsLib/Page.cpp @@ -31,7 +31,7 @@ */ #include "Page.h" #include -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../DesktopEditor/graphics/structures.h" #include "../../PdfWriter/PdfRenderer.h" diff --git a/XpsFile/XpsLib/Utils.cpp b/XpsFile/XpsLib/Utils.cpp index ae53d5ba11..174ee7a366 100644 --- a/XpsFile/XpsLib/Utils.cpp +++ b/XpsFile/XpsLib/Utils.cpp @@ -30,7 +30,7 @@ * */ #include "Utils.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../DesktopEditor/common/Types.h" #include "../../DesktopEditor/xml/include/xmlutils.h" #include "../../DesktopEditor/graphics/IRenderer.h" diff --git a/XpsFile/XpsLib/WString.cpp b/XpsFile/XpsLib/WString.cpp index 5f7a6e76ca..a8394f81b5 100644 --- a/XpsFile/XpsLib/WString.cpp +++ b/XpsFile/XpsLib/WString.cpp @@ -32,7 +32,7 @@ #include "WString.h" #include "Utils.h" -#include "../../DesktopEditor/common/String.h" +#include "../../DesktopEditor/common/StringExt.h" #include "../../DesktopEditor/common/Types.h" #define MAX_STRING_LEN 2147483648