Commit 32c35803 authored by ElenaSubbotina's avatar ElenaSubbotina

x2t fix linux build

parent 89211eb2
......@@ -8,6 +8,10 @@
#include "../../Common/DocxFormat/Source/Base/Nullable.h"
#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
#if !defined(_WIN32) && !defined(_WIN64)
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
#endif
namespace NSBinPptxRW
{
static std::wstring g_bstr_nodeopen = L"<";
......@@ -74,7 +78,7 @@ namespace NSBinPptxRW
m_lSize += (std::max)(nSize, (size_t) 1024);
}
int size_alloc = m_lSize * sizeof(wchar_t);
#if defined(_WIN32) || defined (_WIN64)
#if defined(_WIN32) || defined (_WIN64)
wchar_t* pRealloc = (wchar_t*)realloc(m_pData, size_alloc );
if (NULL != pRealloc)
{
......@@ -122,15 +126,15 @@ namespace NSBinPptxRW
{
size_t nLen = (size_t)sString.GetLength();
#ifdef _UNICODE
#ifdef _UNICODE
CString* pString = const_cast<CString*>(&sString);
WriteString(pString->GetBuffer(), nLen);
pString->ReleaseBuffer();
#else
#else
CStringW str = (CStringW)sString;
WriteString(str.GetBuffer(), nLen);
str.ReleaseBuffer();
#endif
#endif
}
AVSINLINE void WriteStringXML(const CString& strValue)
{
......@@ -271,15 +275,16 @@ namespace NSBinPptxRW
LONG m_lObjectId;
LONG m_lObjectIdVML;
LONG m_lObjectIdOle;
public:
bool m_bIsUseOffice2007;
CString m_strStyleMain;
CString m_strAttributesMain;
CString m_strNodes;
CString m_strOleXlsx;
IRenderer* m_pOOXToVMLRenderer;
bool m_bIsTop;
CString m_strOleXlsx;
public:
bool m_bIsUseOffice2007;
CXmlWriter() : m_oWriter()
{
......@@ -295,10 +300,10 @@ namespace NSBinPptxRW
m_strStyleMain = _T("");
m_strAttributesMain = _T("");
m_strNodes = _T("");
m_strOleXlsx = _T("");
m_pOOXToVMLRenderer = NULL;
m_bIsTop = false;
m_strOleXlsx = L"";
}
~CXmlWriter()
{
......
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