Commit c329f29e authored by ElenaSubbotina's avatar ElenaSubbotina

RtfFormatReader - fix hyperlink text

parent 0f3a02ca
...@@ -1622,7 +1622,7 @@ bool RtfFieldReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader, ...@@ -1622,7 +1622,7 @@ bool RtfFieldReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,
m_oField.m_pResult = oNewFieldInst; m_oField.m_pResult = oNewFieldInst;
} }
oReader.m_oLex.putString( "}{" );//чтобы не терять после fldrslt //oReader.m_oLex.putString( "}{" );//чтобы не терять после fldrslt
//{\field{\*\fldinst...}{\*\fldrslt...} ??? } //{\field{\*\fldinst...}{\*\fldrslt...} ??? }
//{\field{\*\fldinst...}{\*\fldrslt...}}{ ??? } //{\field{\*\fldinst...}{\*\fldrslt...}}{ ??? }
} }
......
...@@ -100,7 +100,10 @@ std::wstring RtfFieldInst::RenderToOOX(RenderParameter oRenderParameter) ...@@ -100,7 +100,10 @@ std::wstring RtfFieldInst::RenderToOOX(RenderParameter oRenderParameter)
RtfDocument* poRtfDocument = static_cast<RtfDocument*> (oRenderParameter.poDocument); RtfDocument* poRtfDocument = static_cast<RtfDocument*> (oRenderParameter.poDocument);
OOXWriter* poOOXWriter = static_cast<OOXWriter*> (oRenderParameter.poWriter); OOXWriter* poOOXWriter = static_cast<OOXWriter*> (oRenderParameter.poWriter);
return L""; if (m_pTextItems)
return m_pTextItems->RenderToOOX(oRenderParameter);
else
return L"";
} }
std::wstring RtfField::RenderToRtf(RenderParameter oRenderParameter) std::wstring RtfField::RenderToRtf(RenderParameter oRenderParameter)
{ {
......
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