[ios] pdf

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

DesktopEditor/ios_projects/PdfWriter/AscEditorPDFPrinter.mm

@@ -51,7 +51,7 @@ bool CAscEditorPDFPrinter::Print(std::string strBase64, std::wstring strDstFile)
     CPdfRenderer oRender(&oFonts);
     oRender.SetTempFolder(GetTempPath());
     
-    bool status = false;
+    HRESULT hr = S_FALSE;
     int	len = NSBase64::Base64DecodeGetRequiredLength((int)strBase64.length());
     BYTE* dstArray	= new BYTE[len];
     if (NSBase64::Base64Decode(strBase64.c_str(), (int)strBase64.length(), dstArray, &len))
@@ -69,13 +69,13 @@ bool CAscEditorPDFPrinter::Print(std::string strBase64, std::wstring strDstFile)
         oFile.WriteFile(dstArray, len);
         oFile.CloseFile();
         
-        status = oRender.OnlineWordToPdfFromBinary(sFile, strDstFile);
+        hr = oRender.OnlineWordToPdfFromBinary(sFile, strDstFile);
         
         NSFile::CFileBinary::Remove(sFile);
-        
-        RELEASEARRAYOBJECTS(dstArray);
-        RELEASEOBJECT(pFontManager);
     }
+   
+    RELEASEARRAYOBJECTS(dstArray);
+    RELEASEOBJECT(pFontManager);
     
-    return status;
+    return (hr == S_OK);
 }

DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj

@@ -41,10 +41,10 @@
 		176285FC1BAAFC3B00AEDA07 /* Shading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176285E41BAAFC3B00AEDA07 /* Shading.cpp */; settings = {ASSET_TAGS = (); }; };
 		176285FD1BAAFC3B00AEDA07 /* Streams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176285E61BAAFC3B00AEDA07 /* Streams.cpp */; settings = {ASSET_TAGS = (); }; };
 		176285FE1BAAFC3B00AEDA07 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176285E91BAAFC3B00AEDA07 /* Utils.cpp */; settings = {ASSET_TAGS = (); }; };
+		176E573F1BB0057700276C19 /* BgraFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176E573B1BB0057700276C19 /* BgraFrame.cpp */; settings = {ASSET_TAGS = (); }; };
+		176E57401BB0057700276C19 /* ImageFileFormatChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176E573D1BB0057700276C19 /* ImageFileFormatChecker.cpp */; settings = {ASSET_TAGS = (); }; };
 		17FFC2C21BAB15CE00D91F59 /* PdfRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17FFC2C01BAB15CE00D91F59 /* PdfRenderer.cpp */; settings = {ASSET_TAGS = (); }; };
 		17FFC2C51BAB163500D91F59 /* OnlineOfficeBinToPdf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17FFC2C31BAB163500D91F59 /* OnlineOfficeBinToPdf.cpp */; settings = {ASSET_TAGS = (); }; };
-		17FFC2CB1BAB198500D91F59 /* BgraFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17FFC2C71BAB198500D91F59 /* BgraFrame.cpp */; settings = {ASSET_TAGS = (); }; };
-		17FFC2CC1BAB198500D91F59 /* ImageFileFormatChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17FFC2C91BAB198500D91F59 /* ImageFileFormatChecker.cpp */; settings = {ASSET_TAGS = (); }; };
 		7C560FF41AA71E27000E5860 /* unicode_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C560FF31AA71E27000E5860 /* unicode_util.cpp */; };
 		7C560FF61AA71E51000E5860 /* DirectoryPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C560FF51AA71E51000E5860 /* DirectoryPosix.cpp */; };
 		7C560FF81AA71E70000E5860 /* stringcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C560FF71AA71E70000E5860 /* stringcommon.cpp */; };
@@ -107,16 +107,16 @@
 		176285E81BAAFC3B00AEDA07 /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Types.h; path = ../../../PdfWriter/Src/Types.h; sourceTree = "<group>"; };
 		176285E91BAAFC3B00AEDA07 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utils.cpp; path = ../../../PdfWriter/Src/Utils.cpp; sourceTree = "<group>"; };
 		176285EA1BAAFC3B00AEDA07 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../../../PdfWriter/Src/Utils.h; sourceTree = "<group>"; };
+		176E573B1BB0057700276C19 /* BgraFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BgraFrame.cpp; path = ../../raster/BgraFrame.cpp; sourceTree = "<group>"; };
+		176E573C1BB0057700276C19 /* BgraFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BgraFrame.h; path = ../../raster/BgraFrame.h; sourceTree = "<group>"; };
+		176E573D1BB0057700276C19 /* ImageFileFormatChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ImageFileFormatChecker.cpp; path = ../../raster/ImageFileFormatChecker.cpp; sourceTree = "<group>"; };
+		176E573E1BB0057700276C19 /* ImageFileFormatChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageFileFormatChecker.h; path = ../../raster/ImageFileFormatChecker.h; sourceTree = "<group>"; };
 		17BE26F71BAAD78F00128D72 /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Types.h; path = ../../common/Types.h; sourceTree = "<group>"; };
 		17FFC2C01BAB15CE00D91F59 /* PdfRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PdfRenderer.cpp; path = ../../../PdfWriter/PdfRenderer.cpp; sourceTree = "<group>"; };
 		17FFC2C11BAB15CE00D91F59 /* PdfRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PdfRenderer.h; path = ../../../PdfWriter/PdfRenderer.h; sourceTree = "<group>"; };
 		17FFC2C31BAB163500D91F59 /* OnlineOfficeBinToPdf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OnlineOfficeBinToPdf.cpp; path = ../../../PdfWriter/OnlineOfficeBinToPdf.cpp; sourceTree = "<group>"; };
 		17FFC2C41BAB163500D91F59 /* OnlineOfficeBinToPdf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OnlineOfficeBinToPdf.h; path = ../../../PdfWriter/OnlineOfficeBinToPdf.h; sourceTree = "<group>"; };
 		17FFC2C61BAB170200D91F59 /* unicode_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unicode_util.h; path = ../../../Common/DocxFormat/Source/Base/unicode_util.h; sourceTree = "<group>"; };
-		17FFC2C71BAB198500D91F59 /* BgraFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BgraFrame.cpp; path = /Users/alexey.musinov/Office/Docx2DoctConverter/ServerComponents/DesktopEditor/raster/BgraFrame.cpp; sourceTree = "<absolute>"; };
-		17FFC2C81BAB198500D91F59 /* BgraFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BgraFrame.h; path = /Users/alexey.musinov/Office/Docx2DoctConverter/ServerComponents/DesktopEditor/raster/BgraFrame.h; sourceTree = "<absolute>"; };
-		17FFC2C91BAB198500D91F59 /* ImageFileFormatChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ImageFileFormatChecker.cpp; path = /Users/alexey.musinov/Office/Docx2DoctConverter/ServerComponents/DesktopEditor/raster/ImageFileFormatChecker.cpp; sourceTree = "<absolute>"; };
-		17FFC2CA1BAB198500D91F59 /* ImageFileFormatChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageFileFormatChecker.h; path = /Users/alexey.musinov/Office/Docx2DoctConverter/ServerComponents/DesktopEditor/raster/ImageFileFormatChecker.h; sourceTree = "<absolute>"; };
 		7C560F6F1AA71A91000E5860 /* libPdfWriter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPdfWriter.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		7C560FF01AA71C5C000E5860 /* AscEditorPDFPrinter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AscEditorPDFPrinter.h; sourceTree = "<group>"; };
 		7C560FF31AA71E27000E5860 /* unicode_util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = unicode_util.cpp; path = ../../../Common/DocxFormat/Source/Base/unicode_util.cpp; sourceTree = "<group>"; };
@@ -161,10 +161,10 @@
 				7C560FF51AA71E51000E5860 /* DirectoryPosix.cpp */,
 				17FFC2C61BAB170200D91F59 /* unicode_util.h */,
 				7C560FF31AA71E27000E5860 /* unicode_util.cpp */,
-				17FFC2C71BAB198500D91F59 /* BgraFrame.cpp */,
-				17FFC2C81BAB198500D91F59 /* BgraFrame.h */,
-				17FFC2C91BAB198500D91F59 /* ImageFileFormatChecker.cpp */,
-				17FFC2CA1BAB198500D91F59 /* ImageFileFormatChecker.h */,
+				176E573B1BB0057700276C19 /* BgraFrame.cpp */,
+				176E573C1BB0057700276C19 /* BgraFrame.h */,
+				176E573D1BB0057700276C19 /* ImageFileFormatChecker.cpp */,
+				176E573E1BB0057700276C19 /* ImageFileFormatChecker.h */,
 			);
 			name = Common;
 			sourceTree = "<group>";
@@ -313,7 +313,7 @@
 				176285F11BAAFC3B00AEDA07 /* Font.cpp in Sources */,
 				176285F21BAAFC3B00AEDA07 /* Font14.cpp in Sources */,
 				7C560FF81AA71E70000E5860 /* stringcommon.cpp in Sources */,
-				17FFC2CC1BAB198500D91F59 /* ImageFileFormatChecker.cpp in Sources */,
+				176E57401BB0057700276C19 /* ImageFileFormatChecker.cpp in Sources */,
 				176285FD1BAAFC3B00AEDA07 /* Streams.cpp in Sources */,
 				176285FA1BAAFC3B00AEDA07 /* Pages.cpp in Sources */,
 				17FFC2C21BAB15CE00D91F59 /* PdfRenderer.cpp in Sources */,
@@ -332,7 +332,7 @@
 				176285FC1BAAFC3B00AEDA07 /* Shading.cpp in Sources */,
 				176285EF1BAAFC3B00AEDA07 /* Encrypt.cpp in Sources */,
 				176285F31BAAFC3B00AEDA07 /* FontCidTT.cpp in Sources */,
-				17FFC2CB1BAB198500D91F59 /* BgraFrame.cpp in Sources */,
+				176E573F1BB0057700276C19 /* BgraFrame.cpp in Sources */,
 				176285EB1BAAFC3B00AEDA07 /* Annotation.cpp in Sources */,
 				7C560FF41AA71E27000E5860 /* unicode_util.cpp in Sources */,
 				176285F61BAAFC3B00AEDA07 /* Image.cpp in Sources */,