Commit 6d712598 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@58565 954022d7-b5bf-4e40-9824-e11837661b57
parent 452f8c51
...@@ -90,9 +90,11 @@ typedef wchar_t WCHAR; ...@@ -90,9 +90,11 @@ typedef wchar_t WCHAR;
#define _wtoi64(p) std::wcstoll((p),NULL,10) #define _wtoi64(p) std::wcstoll((p),NULL,10)
#ifdef UNICODE #ifdef UNICODE
#define _ttoi _wtoi #define _ttoi _wtoi
#define _tstof _wtof
#define _stscanf swscanf #define _stscanf swscanf
#else #else
#define _ttoi atoi #define _ttoi atoi
#define _tstof atof
#define _stscanf scanf #define _stscanf scanf
#endif // #ifdef UNICODE #endif // #ifdef UNICODE
#endif // #ifndef _wtof #endif // #ifndef _wtof
......
...@@ -41,7 +41,8 @@ namespace OOX ...@@ -41,7 +41,8 @@ namespace OOX
} }
virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
{ {
write2(oPath.GetPath()); CString sPath = oPath.GetPath();
write2(sPath);
oContent.Registration( type().OverrideType(), oDirectory, oPath.GetFilename() ); oContent.Registration( type().OverrideType(), oDirectory, oPath.GetFilename() );
IFileContainer::Write(oPath, oDirectory, oContent); IFileContainer::Write(oPath, oDirectory, oContent);
} }
...@@ -53,7 +54,8 @@ namespace OOX ...@@ -53,7 +54,8 @@ namespace OOX
} }
void toXML(XmlUtils::CStringWriter& writer) const void toXML(XmlUtils::CStringWriter& writer) const
{ {
m_oChartSpace.toXML(CString(_T("c:chartSpace")), writer); CString sNodeName = _T("c:chartSpace");
m_oChartSpace.toXML (sNodeName, writer);
} }
bool isValid() const bool isValid() const
{ {
......
#include "CommonInclude.h" #include "CommonInclude.h"
#include "Common.h" #include "Common.h"
#ifndef _gcvt
#include "stdlib.h"
#define _CVTBUFSIZE 128
#define _gcvt gcvt
#endif
#define DBL_MAX 15 #define DBL_MAX 15
#define DBL_MAXDIG10 17 #define DBL_MAXDIG10 17
......
...@@ -28,7 +28,8 @@ namespace OOX ...@@ -28,7 +28,8 @@ namespace OOX
} }
virtual void toXML(XmlUtils::CStringWriter& writer) const virtual void toXML(XmlUtils::CStringWriter& writer) const
{ {
toXML2(writer, CString(_T("numFmt"))); CString sHeader = _T("numFmt");
toXML2(writer, sHeader);
} }
void toXML2(XmlUtils::CStringWriter& writer, CString& sHeader) const void toXML2(XmlUtils::CStringWriter& writer, CString& sHeader) const
{ {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "CellStyles.h" #include "CellStyles.h"
#include "Xfs.h" #include "Xfs.h"
#include "Colors.h" #include "Colors.h"
#include "Dxf.h" #include "dxf.h"
#include "Fills.h" #include "Fills.h"
#include "Fonts.h" #include "Fonts.h"
#include "NumFmts.h" #include "NumFmts.h"
......
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