diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 12:39:11 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 12:49:33 +0200 |
commit | 769266a9b9f5464847ed7d240e15c1bb16ac3d80 (patch) | |
tree | 606910b9cb64277e7215916a4243a749aa0205be /writerfilter | |
parent | e210299bcba5ae87a5bee7973aef650b7c5df1e2 (diff) |
RTFDocumentImpl::replayShapetext is no longer needed
Change-Id: I3dce867e01049d815b61b5292ec7afacffa5b2e8
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 17 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e1bba0436079..45ebd43f8cb2 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2237,8 +2237,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) // Reset everything. m_aStates.top().aParagraphSprms = m_aDefaultState.aParagraphSprms; m_aStates.top().aParagraphAttributes = m_aDefaultState.aParagraphAttributes; - if (m_aStates.top().pCurrentBuffer != &m_aShapetextBuffer) - m_aStates.top().pCurrentBuffer = 0; + m_aStates.top().pCurrentBuffer = 0; } else { @@ -4147,7 +4146,6 @@ int RTFDocumentImpl::popState() if (!m_aStates.top().aDrawingObject.bHadShapeText) { Mapper().startShape(xShape); - replayShapetext(); } Mapper().endShape(); } @@ -4649,19 +4647,6 @@ void RTFDocumentImpl::setDestinationText(OUString& rString) m_aStates.top().aDestinationText.append(rString); } -void RTFDocumentImpl::replayShapetext() -{ - Mapper().startParagraphGroup(); - if (!m_aShapetextBuffer.empty()) - { - replayBuffer(m_aShapetextBuffer); - Mapper().startCharacterGroup(); - runBreak(); - Mapper().endCharacterGroup(); - } - Mapper().endParagraphGroup(); -} - bool RTFDocumentImpl::getSkipUnknown() { return m_bSkipUnknown; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index e59fac2e5fb2..a12000ab745f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -440,7 +440,6 @@ namespace writerfilter { void setDestinationText(OUString& rString); /// Resolve a picture: If not inline, then anchored. int resolvePict(bool bInline); - void replayShapetext(); bool getSkipUnknown(); void setSkipUnknown(bool bSkipUnknown); diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 08516d1cde7d..36c4cb1f602a 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -604,7 +604,6 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose) m_rImport.Mapper().startShape(xShape); if (bClose) { - m_rImport.replayShapetext(); m_rImport.Mapper().endShape(); } m_xShape = xShape; |