mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTFDocumentImpl::getShapetextBuffer can go as well

Browse Source 
Hopefully this was the last trace of buffered shape import in the RTF
filter.

Change-Id: I42a531954ef5832473c43c121d569635f144a4d1
This commit is contained in:
Miklos Vajna
2013-06-16 12:44:04 +02:00
parent 769266a9b9
commit be53bec4fa
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -239,7 +239,6 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
m_xStorage(), m_xStorage(),
m_aTableBuffer(), m_aTableBuffer(),
m_aSuperBuffer(), m_aSuperBuffer(),
m_aShapetextBuffer(),
m_bHasFootnote(false), m_bHasFootnote(false),
m_pSuperstream(0), m_pSuperstream(0),
m_nHeaderFooterPositions(), m_nHeaderFooterPositions(),
@@ -599,11 +598,6 @@ RTFParserState& RTFDocumentImpl::getDefaultState()
return m_pSuperstream->getDefaultState(); return m_pSuperstream->getDefaultState();
} }
RTFBuffer_t RTFDocumentImpl::getShapetextBuffer()
{
return m_aShapetextBuffer;
}
oox::GraphicHelper& RTFDocumentImpl::getGraphicHelper() oox::GraphicHelper& RTFDocumentImpl::getGraphicHelper()
{ {
return *m_pGraphicHelper; return *m_pGraphicHelper;
@@ -1161,7 +1155,6 @@ void RTFDocumentImpl::text(OUString& rString)
void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer) void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer)
{ {
bool bShapeText = !m_aShapetextBuffer.empty();
while (rBuffer.size()) while (rBuffer.size())
{ {
std::pair<RTFBufferTypes, RTFValue::Pointer_t> aPair = rBuffer.front(); 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) else if (aPair.first == BUFFER_ENDRUN)
Mapper().endCharacterGroup(); Mapper().endCharacterGroup();
else if (aPair.first == BUFFER_PAR) else if (aPair.first == BUFFER_PAR)
{ parBreak();
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();
}
else else
SAL_WARN("writerfilter", "should not happen"); SAL_WARN("writerfilter", "should not happen");
} }

4
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View File

@@ -465,8 +465,6 @@ namespace writerfilter {
rtl_TextEncoding getEncoding(sal_uInt32 nFontIndex); rtl_TextEncoding getEncoding(sal_uInt32 nFontIndex);
/// Get the default parser state. /// Get the default parser state.
RTFParserState& getDefaultState(); RTFParserState& getDefaultState();
/// Get the shape text buffer;
RTFBuffer_t getShapetextBuffer();
oox::GraphicHelper& getGraphicHelper(); oox::GraphicHelper& getGraphicHelper();
private: private:
@@ -541,8 +539,6 @@ namespace writerfilter {
RTFBuffer_t m_aTableBuffer; RTFBuffer_t m_aTableBuffer;
/// Buffered superscript, till footnote is reached (or not). /// Buffered superscript, till footnote is reached (or not).
RTFBuffer_t m_aSuperBuffer; RTFBuffer_t m_aSuperBuffer;
/// Buffered shape text.
RTFBuffer_t m_aShapetextBuffer;
bool m_bHasFootnote; bool m_bHasFootnote;
/// Superstream of this substream. /// Superstream of this substream.