From 257987e9871cc6e7faa101fdfbd1e09babc489ba Mon Sep 17 00:00:00 2001
From: "Ivan.Shulga" <Ivan.Shulga@onlyoffice.com>
Date: Mon, 20 Oct 2014 09:51:16 +0000
Subject: [PATCH] linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59015 954022d7-b5bf-4e40-9824-e11837661b57
---
 ASCOfficePPTXFile/PPTXFormat/Slide.h                        | 6 +++---
 .../PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro           | 2 +-
 .../PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user      | 2 +-
 Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ASCOfficePPTXFile/PPTXFormat/Slide.h b/ASCOfficePPTXFile/PPTXFormat/Slide.h
index 3cdc011e91..411c3e4c12 100644
--- a/ASCOfficePPTXFile/PPTXFormat/Slide.h
+++ b/ASCOfficePPTXFile/PPTXFormat/Slide.h
@@ -380,8 +380,8 @@ namespace PPTX
 		}
 		const OOX::CPath GetPathBySpid(const CString& spid)const
 		{
-			OOX::CPath filename = _T("");
-			if((Vml.is_init()) && (spid != ""))
+            OOX::CPath filename (_T(""));
+            if((Vml.is_init()) && (spid != _T("")))
 			{
 				std::map<CString, OOX::CPath>::const_iterator pPair = Vml->SpIds.find(spid);
 
@@ -393,4 +393,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_SLIDES_SLIDE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_SLIDES_SLIDE_INCLUDE_H_
diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
index 4c44803577..b3d469437f 100644
--- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
+++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
@@ -488,7 +488,7 @@ HEADERS += pptxformatlib.h \
     ../../../Editor/BinWriters.h \
     ../../../Editor/CalculatorCRC32.h \
     ../../../Editor/Converter.h \
-    ../../../Editor/FontCutter.h \
+    #../../../Editor/FontCutter.h \
     ../../../Editor/FontPicker.h \
     ../../../Editor/imagemanager.h \
     ../../../Editor/PPTXWriter.h \
diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user
index 74e69621c1..81a0e59ed6 100644
--- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user
+++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-10-15T19:40:19. -->
+<!-- Written by QtCreator 3.1.1, 2014-10-17T16:55:21. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
index 80361f96b0..6c4df11513 100644
--- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
+++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-10-15T19:40:19. -->
+<!-- Written by QtCreator 3.1.1, 2014-10-17T16:55:21. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>