Commit b782624f authored by ElenaSubbotina's avatar ElenaSubbotina

..

parent c1a9f82a
...@@ -1470,7 +1470,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper ...@@ -1470,7 +1470,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper
oOutputProperty.m_nRevauth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxRunProps->m_oIns->m_sAuthor.get2() ) + 1; oOutputProperty.m_nRevauth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxRunProps->m_oIns->m_sAuthor.get2() ) + 1;
if (m_ooxRunProps->m_oIns->m_oDate.IsInit()) if (m_ooxRunProps->m_oIns->m_oDate.IsInit())
oOutputProperty.m_nRevdttm = RtfUtility::convertDateTime( string2std_string(m_ooxRunProps->m_oIns->m_oDate->GetValue()) ); {
std::wstring sVal = string2std_string(m_ooxRunProps->m_oIns->m_oDate->GetValue());
oOutputProperty.m_nRevdttm = RtfUtility::convertDateTime( sVal );
}
} }
if (m_ooxRunProps->m_oDel.IsInit()) if (m_ooxRunProps->m_oDel.IsInit())
{ {
...@@ -1480,7 +1483,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper ...@@ -1480,7 +1483,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper
oOutputProperty.m_nRevauthDel = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxRunProps->m_oDel->m_sAuthor.get2() ) + 1; oOutputProperty.m_nRevauthDel = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxRunProps->m_oDel->m_sAuthor.get2() ) + 1;
if (m_ooxRunProps->m_oDel->m_oDate.IsInit()) if (m_ooxRunProps->m_oDel->m_oDate.IsInit())
oOutputProperty.m_nRevdttmDel = RtfUtility::convertDateTime( string2std_string(m_ooxRunProps->m_oDel->m_oDate->GetValue()) ); {
std::wstring sVal = string2std_string(m_ooxRunProps->m_oDel->m_oDate->GetValue());
oOutputProperty.m_nRevdttmDel = RtfUtility::convertDateTime( sVal );
}
} }
if (m_ooxRunProps->m_oRPrChange.IsInit()) if (m_ooxRunProps->m_oRPrChange.IsInit())
......
...@@ -102,7 +102,10 @@ bool OOXtrPrReader::Parse( ReaderParameter oParam , RtfRowProperty& oOutputPrope ...@@ -102,7 +102,10 @@ bool OOXtrPrReader::Parse( ReaderParameter oParam , RtfRowProperty& oOutputPrope
oOutputProperty.m_nTrAuth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxTableRowProps->m_oTrPrChange->m_sAuthor.get2() ) + 1; oOutputProperty.m_nTrAuth = oParam.oRtf->m_oRevisionTable.AddAuthor( m_ooxTableRowProps->m_oTrPrChange->m_sAuthor.get2() ) + 1;
if (m_ooxTableRowProps->m_oTrPrChange->m_oDate.IsInit()) if (m_ooxTableRowProps->m_oTrPrChange->m_oDate.IsInit())
oOutputProperty.m_nTrDate = RtfUtility::convertDateTime( string2std_string(m_ooxTableRowProps->m_oTrPrChange->m_oDate->GetValue())); {
std::wstring sVal = string2std_string(m_ooxTableRowProps->m_oTrPrChange->m_oDate->GetValue());
oOutputProperty.m_nTrDate = RtfUtility::convertDateTime( sVal);
}
RtfRowPropertyPtr props ( new RtfRowProperty() ); RtfRowPropertyPtr props ( new RtfRowProperty() );
OOXtrPrReader oTrReader(m_ooxTableRowProps->m_oTrPrChange->m_pTrPr.GetPointer()); OOXtrPrReader oTrReader(m_ooxTableRowProps->m_oTrPrChange->m_pTrPr.GetPointer());
...@@ -217,4 +220,4 @@ void OOXTableReader::ApplyParagraphProperty( RtfTable& oOutputTable ) ...@@ -217,4 +220,4 @@ void OOXTableReader::ApplyParagraphProperty( RtfTable& oOutputTable )
} }
} }
} }
} }
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.407 VERSION = 2.0.2.408
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TARGET = x2t 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