Commit 929252f6 authored by ElenaSubbotina's avatar ElenaSubbotina

RtfFormatReader -fix read spec char in field

parent 2207cee0
......@@ -1597,7 +1597,7 @@ bool RtfFieldReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,C
if ( oNewFieldInst->IsValid() )
{
m_oField.m_pInsert = oNewFieldInst;
m_oField.m_pInsert = oNewFieldInst;
}
}
else if ( L"datafield" == sCommand )
......@@ -1611,7 +1611,7 @@ bool RtfFieldReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,C
if ( oNewFieldInst->IsValid() )
{
m_oField.m_pResult = oNewFieldInst;
m_oField.m_pResult = oNewFieldInst;
}
oReader.m_oLex.putString( "}{" );//чтобы не терять после fldrslt
......
......@@ -1417,8 +1417,9 @@ private:
RtfAbstractReader reader;
CString sResultSymbol = reader.ExecuteTextInternal( oDocument, oReader, sCharA, false, 0, nSkipChar );
m_oField.m_pResult = RtfFieldInstPtr ( new RtfFieldInst() );
//свойства копировать ? ващето есть дубль - проверить
m_oField.m_pResult = RtfFieldInstPtr ( new RtfFieldInst() );
m_oField.m_pResult->SetDefault();
RtfParagraphPtr pNewPar ( new RtfParagraph() );
RtfCharPtr pNewChar( new RtfChar() );
......
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