diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 12:44:04 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 12:49:33 +0200 |
commit | be53bec4fa8e6d08ceac0496585bbf64f69b4a19 (patch) | |
tree | ef2c4741f84827b255f3c705c5aefea1bae7318a /writerfilter | |
parent | 769266a9b9f5464847ed7d240e15c1bb16ac3d80 (diff) |
RTFDocumentImpl::getShapetextBuffer can go as well
Hopefully this was the last trace of buffered shape import in the RTF
filter.
Change-Id: I42a531954ef5832473c43c121d569635f144a4d1
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 15 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4 |
2 files changed, 1 insertions, 18 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 45ebd43f8cb2..a2bf11e53b00 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -239,7 +239,6 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_xStorage(), m_aTableBuffer(), m_aSuperBuffer(), - m_aShapetextBuffer(), m_bHasFootnote(false), m_pSuperstream(0), m_nHeaderFooterPositions(), @@ -599,11 +598,6 @@ RTFParserState& RTFDocumentImpl::getDefaultState() return m_pSuperstream->getDefaultState(); } -RTFBuffer_t RTFDocumentImpl::getShapetextBuffer() -{ - return m_aShapetextBuffer; -} - oox::GraphicHelper& RTFDocumentImpl::getGraphicHelper() { return *m_pGraphicHelper; @@ -1161,7 +1155,6 @@ void RTFDocumentImpl::text(OUString& rString) void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer) { - bool bShapeText = !m_aShapetextBuffer.empty(); while (rBuffer.size()) { std::pair<RTFBufferTypes, RTFValue::Pointer_t> aPair = rBuffer.front(); @@ -1199,13 +1192,7 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer) else if (aPair.first == BUFFER_ENDRUN) Mapper().endCharacterGroup(); else if (aPair.first == BUFFER_PAR) - { - if (!rBuffer.empty() || !bShapeText) - // RTF may have a fake paragraph at the end of the shape text, - // that would cause an additional empty paragraph at the end of - // the shape text. - parBreak(); - } + parBreak(); else SAL_WARN("writerfilter", "should not happen"); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index a12000ab745f..7ca1c24fb86d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -465,8 +465,6 @@ namespace writerfilter { rtl_TextEncoding getEncoding(sal_uInt32 nFontIndex); /// Get the default parser state. RTFParserState& getDefaultState(); - /// Get the shape text buffer; - RTFBuffer_t getShapetextBuffer(); oox::GraphicHelper& getGraphicHelper(); private: @@ -541,8 +539,6 @@ namespace writerfilter { RTFBuffer_t m_aTableBuffer; /// Buffered superscript, till footnote is reached (or not). RTFBuffer_t m_aSuperBuffer; - /// Buffered shape text. - RTFBuffer_t m_aShapetextBuffer; bool m_bHasFootnote; /// Superstream of this substream. |