Commit c1a9f82a authored by ElenaSubbotina's avatar ElenaSubbotina

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

parents 5d2e5b8f 60757178
......@@ -54,6 +54,9 @@ SOURCES += \
../source/RtfSection.cpp \
../source/RtfShape.cpp \
../source/RtfWriter.cpp \
../source/RtfMath.cpp \
../source/Reader/OOXMathReader.cpp \
../source/Reader/OOXDrawingGraphicReader.cpp \
../source/Reader/OOXHeaderReader.cpp \
../source/Reader/OOXParagraphElementReaders.cpp \
../source/Reader/OOXReader.cpp \
......@@ -155,8 +158,3 @@ HEADERS += \
../source/Writer/OOXThemeWriter.h \
../source/Writer/OOXWriter.h \
../source/Ole1FormatReader.h
SOURCES += \
../source/RtfMath.cpp \
../source/Reader/OOXMathReader.cpp \
../source/Reader/OOXDrawingGraphicReader.cpp
......@@ -37,7 +37,7 @@
#include "IdGenerator.h"
#include "RtfDefine.h"
#include <boost/shared_ptr.hpp>
#include "boost/shared_ptr.hpp"
enum _MetricUnits{ mu_none, mu_Auto, mu_Percent, mu_Twips };
......
......@@ -65,7 +65,10 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
m_oCharProperty.m_nRevauth = oParam.oRtf->m_oRevisionTable.AddAuthor( pIns->m_sAuthor.get2() ) + 1;
if (pIns->m_oDate.IsInit())
m_oCharProperty.m_nRevdttm = RtfUtility::convertDateTime( string2std_string(pIns->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(pIns->m_oDate->GetValue());
m_oCharProperty.m_nRevdttm = RtfUtility::convertDateTime( sVal );
}
ParseElement( oParam, pIns->m_oRun.GetPointer(), rtfMath);
}
......@@ -77,7 +80,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
m_oCharProperty.m_nRevauthDel = oParam.oRtf->m_oRevisionTable.AddAuthor( pDel->m_sAuthor.get2() ) + 1;
if (pDel->m_oDate.IsInit())
m_oCharProperty.m_nRevdttmDel = RtfUtility::convertDateTime( string2std_string(pDel->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(pDel->m_oDate->GetValue());
m_oCharProperty.m_nRevdttmDel = RtfUtility::convertDateTime( sVal );
}
ParseElement( oParam, pDel->m_oRun.GetPointer(), rtfMath);
}
......
......@@ -128,7 +128,10 @@ bool OOXParagraphReader::Parse2( ReaderParameter oParam , RtfParagraph& oOutputP
oSubParReader.m_oCharProperty.m_nRevauth = oParam.oRtf->m_oRevisionTable.AddAuthor( pIns->m_sAuthor.get2() ) + 1;
if (pIns->m_oDate.IsInit())
oSubParReader.m_oCharProperty.m_nRevdttm = RtfUtility::convertDateTime( string2std_string(pIns->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(pIns->m_oDate->GetValue());
oSubParReader.m_oCharProperty.m_nRevdttm = RtfUtility::convertDateTime( sVal );
}
oSubParReader.Parse2( oParam, oOutputParagraph, oConditionalTableStyle, poStyle);
}break;
......@@ -144,7 +147,10 @@ bool OOXParagraphReader::Parse2( ReaderParameter oParam , RtfParagraph& oOutputP
oSubParReader.m_oCharProperty.m_nRevauthDel = oParam.oRtf->m_oRevisionTable.AddAuthor( pDel->m_sAuthor.get2() ) + 1;
if (pDel->m_oDate.IsInit())
oSubParReader.m_oCharProperty.m_nRevdttmDel = RtfUtility::convertDateTime( string2std_string(pDel->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(pDel->m_oDate->GetValue());
oSubParReader.m_oCharProperty.m_nRevdttmDel = RtfUtility::convertDateTime( sVal );
}
oSubParReader.Parse2( oParam, oOutputParagraph, oConditionalTableStyle, poStyle);
}break;
......@@ -1246,7 +1252,10 @@ bool OOXpPrReader::Parse( ReaderParameter oParam ,RtfParagraphProperty& oOutputP
oOutputProperty.m_nPrAuth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxParaProps->m_oPPrChange->m_sAuthor.get2() ) + 1;
if (m_ooxParaProps->m_oPPrChange->m_oDate.IsInit())
oOutputProperty.m_nPrDate = RtfUtility::convertDateTime( string2std_string(m_ooxParaProps->m_oPPrChange->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(m_ooxParaProps->m_oPPrChange->m_oDate->GetValue());
oOutputProperty.m_nPrDate = RtfUtility::convertDateTime( sVal );
}
RtfParagraphPropertyPtr props( new RtfParagraphProperty() );
OOXpPrReader opPrReader(m_ooxParaProps->m_oPPrChange->m_pParPr.GetPointer());
......@@ -1480,7 +1489,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper
oOutputProperty.m_nCrAuth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxRunProps->m_oRPrChange->m_sAuthor.get2() ) + 1;
if (m_ooxRunProps->m_oRPrChange->m_oDate.IsInit())
oOutputProperty.m_nCrDate = RtfUtility::convertDateTime( string2std_string(m_ooxRunProps->m_oRPrChange->m_oDate->GetValue()) );
{
std::wstring sVal = string2std_string(m_ooxRunProps->m_oRPrChange->m_oDate->GetValue());
oOutputProperty.m_nCrDate = RtfUtility::convertDateTime( sVal );
}
OOXrPrReader orPrReader(m_ooxRunProps->m_oRPrChange->m_pRunPr.GetPointer());
RtfCharPropertyPtr props( new RtfCharProperty() );
......@@ -1928,7 +1940,10 @@ bool OOXSectionPropertyReader::Parse( ReaderParameter oParam , RtfSectionPropert
oOutput.m_nSrAuth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxSectionProperty->m_oSectPrChange->m_sAuthor.get2() ) + 1;
if (m_ooxSectionProperty->m_oSectPrChange->m_oDate.IsInit())
oOutput.m_nSrDate = RtfUtility::convertDateTime( string2std_string(m_ooxSectionProperty->m_oSectPrChange->m_oDate->GetValue()));
{
std::wstring sVal = string2std_string(m_ooxSectionProperty->m_oSectPrChange->m_oDate->GetValue());
oOutput.m_nSrDate = RtfUtility::convertDateTime( sVal );
}
RtfSectionPropertyPtr props = RtfSectionPropertyPtr( new RtfSectionProperty() );
OOXSectionPropertyReader opPrReader(m_ooxSectionProperty->m_oSectPrChange->m_pSecPr.GetPointer());
......
......@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.406
VERSION = 2.0.2.407
DEFINES += INTVER=$$VERSION
TARGET = x2t
......
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