Commit 04362ea8 authored by ElenaSubbotina's avatar ElenaSubbotina Committed by Alexander Trofimov

linux 64 build

parent e726c50a
...@@ -207,7 +207,8 @@ HEADERS += \ ...@@ -207,7 +207,8 @@ HEADERS += \
../source/Writer/OOXSettingsWriter.h \ ../source/Writer/OOXSettingsWriter.h \
../source/Writer/OOXStylesWriter.h \ ../source/Writer/OOXStylesWriter.h \
../source/Writer/OOXThemeWriter.h \ ../source/Writer/OOXThemeWriter.h \
../source/Writer/OOXWriter.h ../source/Writer/OOXWriter.h \
../source/Ole1FormatReader.h
unix { unix {
target.path = /usr/lib target.path = /usr/lib
INSTALLS += target INSTALLS += target
......
...@@ -118,7 +118,8 @@ namespace Txt2Docx ...@@ -118,7 +118,8 @@ namespace Txt2Docx
{ {
OOX::Logic::CRunProperty *rPr_ = new OOX::Logic::CRunProperty(); OOX::Logic::CRunProperty *rPr_ = new OOX::Logic::CRunProperty();
rPr_->m_oRFonts = font; rPr_->m_oRFonts = font;
paragraph->AddText(PrepareToXML(s), rPr_); CString s_ = PrepareToXML(s);
paragraph->AddText(s_, rPr_);
} }
} }
paragraph->AddTab(); paragraph->AddTab();
...@@ -127,7 +128,8 @@ namespace Txt2Docx ...@@ -127,7 +128,8 @@ namespace Txt2Docx
if (!line->empty()) if (!line->empty())
{ {
paragraph->AddText(PrepareToXML(*line), rPr); CString s_ = PrepareToXML(*line);
paragraph->AddText(s_, rPr);
} }
pDocument->m_arrItems.push_back(paragraph); pDocument->m_arrItems.push_back(paragraph);
......
...@@ -294,7 +294,7 @@ namespace OOX ...@@ -294,7 +294,7 @@ namespace OOX
m_arrItems.push_back( pR ); m_arrItems.push_back( pR );
} }
void CParagraph::AddText(CString& sText, CRunProperty *pProperty) void CParagraph::AddText(CString& sText, CRunProperty * pProperty)
{ {
WritingElement *pR = new CRun(); WritingElement *pR = new CRun();
if ( !pR ) if ( !pR )
......
...@@ -82,7 +82,7 @@ namespace OOX ...@@ -82,7 +82,7 @@ namespace OOX
void AddRun(CRun *pRun); void AddRun(CRun *pRun);
void AddText(CString& sText); void AddText(CString& sText);
void AddText(CString& sText, CRunProperty *pProperty); void AddText(CString& sText, CRunProperty *pProperty);
void AddTab(); void AddTab();
void AddTab(CRunProperty *pProperty); void AddTab(CRunProperty *pProperty);
void AddBreak(SimpleTypes::EBrType eType); void AddBreak(SimpleTypes::EBrType eType);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.358 VERSION = 2.0.2.359
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
mac { mac {
......
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