Commit 257987e9 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59015 954022d7-b5bf-4e40-9824-e11837661b57
parent 697af46e
...@@ -380,8 +380,8 @@ namespace PPTX ...@@ -380,8 +380,8 @@ namespace PPTX
} }
const OOX::CPath GetPathBySpid(const CString& spid)const const OOX::CPath GetPathBySpid(const CString& spid)const
{ {
OOX::CPath filename = _T(""); OOX::CPath filename (_T(""));
if((Vml.is_init()) && (spid != "")) if((Vml.is_init()) && (spid != _T("")))
{ {
std::map<CString, OOX::CPath>::const_iterator pPair = Vml->SpIds.find(spid); std::map<CString, OOX::CPath>::const_iterator pPair = Vml->SpIds.find(spid);
...@@ -393,4 +393,4 @@ namespace PPTX ...@@ -393,4 +393,4 @@ namespace PPTX
}; };
} // namespace PPTX } // namespace PPTX
#endif // PPTX_SLIDES_SLIDE_INCLUDE_H_ #endif // PPTX_SLIDES_SLIDE_INCLUDE_H_
\ No newline at end of file
...@@ -488,7 +488,7 @@ HEADERS += pptxformatlib.h \ ...@@ -488,7 +488,7 @@ HEADERS += pptxformatlib.h \
../../../Editor/BinWriters.h \ ../../../Editor/BinWriters.h \
../../../Editor/CalculatorCRC32.h \ ../../../Editor/CalculatorCRC32.h \
../../../Editor/Converter.h \ ../../../Editor/Converter.h \
../../../Editor/FontCutter.h \ #../../../Editor/FontCutter.h \
../../../Editor/FontPicker.h \ ../../../Editor/FontPicker.h \
../../../Editor/imagemanager.h \ ../../../Editor/imagemanager.h \
../../../Editor/PPTXWriter.h \ ../../../Editor/PPTXWriter.h \
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!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> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!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> <qtcreator>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment