From 3c73f692d05eb69935f7a0fc8a3835a198ed5b1f Mon Sep 17 00:00:00 2001 From: ElenaSubbotina <Elena.Subbotina@onlyoffice.com> Date: Thu, 17 Nov 2016 18:21:15 +0300 Subject: [PATCH] x2t linux 64 build 2.0.2.409 --- ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp | 10 +++++++--- ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp | 6 ++++-- X2tConverter/build/Qt/X2tConverter.pri | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp index 6d2dd719d..06e40afb3 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp +++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp @@ -48,7 +48,8 @@ CString RtfBookmarkStart::RenderToRtf(RenderParameter oRenderParameter) sResult.AppendFormat(L"\\bkmkcoll%d", nLastColumn); sResult += L" "; - sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, NULL ); + RtfCharProperty* pCharProperty = NULL; + sResult += RtfChar::renderRtfText( m_sName, oRenderParameter.poDocument, pCharProperty ); sResult += L"}"; return sResult; } @@ -86,8 +87,11 @@ CString RtfBookmarkEnd::RenderToRtf(RenderParameter oRenderParameter) sResult += L"{\\*\\bkmkend"; 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; } diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp index 0f4afd041..369dce294 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp +++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp @@ -1931,8 +1931,10 @@ CString RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter) sResult += poLevelProp.m_oCharProp.RenderToRtf( oRenderParameter ); //пишем текÑÑ‚ 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 ) { diff --git a/X2tConverter/build/Qt/X2tConverter.pri b/X2tConverter/build/Qt/X2tConverter.pri index c69eed1e4..3a0c1f503 100644 --- a/X2tConverter/build/Qt/X2tConverter.pri +++ b/X2tConverter/build/Qt/X2tConverter.pri @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.0.2.408 +VERSION = 2.0.2.409 DEFINES += INTVER=$$VERSION TARGET = x2t -- 2.30.9