Commit 3c73f692 authored by ElenaSubbotina's avatar ElenaSubbotina

x2t linux 64 build 2.0.2.409

parent 32d90264
...@@ -48,7 +48,8 @@ CString RtfBookmarkStart::RenderToRtf(RenderParameter oRenderParameter) ...@@ -48,7 +48,8 @@ CString RtfBookmarkStart::RenderToRtf(RenderParameter oRenderParameter)
sResult.AppendFormat(L"\\bkmkcoll%d", nLastColumn); sResult.AppendFormat(L"\\bkmkcoll%d", nLastColumn);
sResult += L" "; sResult += L" ";
sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, NULL ); RtfCharProperty* pCharProperty = NULL;
sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, pCharProperty );
sResult += L"}"; sResult += L"}";
return sResult; return sResult;
} }
...@@ -86,8 +87,11 @@ CString RtfBookmarkEnd::RenderToRtf(RenderParameter oRenderParameter) ...@@ -86,8 +87,11 @@ CString RtfBookmarkEnd::RenderToRtf(RenderParameter oRenderParameter)
sResult += L"{\\*\\bkmkend"; sResult += L"{\\*\\bkmkend";
sResult += L" "; sResult += L" ";
sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, NULL );
sResult += L"}"; RtfCharProperty* pCharProperty = NULL;
sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, pCharProperty );
sResult += L"}";
return sResult; return sResult;
} }
......
...@@ -1931,8 +1931,10 @@ CString RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter) ...@@ -1931,8 +1931,10 @@ CString RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter)
sResult += poLevelProp.m_oCharProp.RenderToRtf( oRenderParameter ); sResult += poLevelProp.m_oCharProp.RenderToRtf( oRenderParameter );
//пишем текст //пишем текст
CString strLevelProp = poLevelProp.GenerateListText(); CString strLevelProp = poLevelProp.GenerateListText();
CString strChar = RtfChar::renderRtfText( strLevelProp, oRenderParameter.poDocument, NULL );
sResult += strChar; RtfCharProperty* pCharProperty = NULL;
sResult += RtfChar::renderRtfText( strLevelProp, oRenderParameter.poDocument, pCharProperty );
//или картинку //или картинку
if( PROP_DEF != poLevelProp.m_nPictureIndex ) if( PROP_DEF != poLevelProp.m_nPictureIndex )
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.408 VERSION = 2.0.2.409
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