From 950d42db9c70ce53ffb2dbfc155d63896fff7d71 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 31 Mar 2020 16:22:06 +0200 Subject: sw: remove m_setFootnote - obsoleted by checking m_nTextType Change-Id: I44e7864fc159edbef35083b09798b1e3254f6548 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91430 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/source/filter/ww8/docxattributeoutput.cxx | 6 ++---- sw/source/filter/ww8/docxattributeoutput.hxx | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'sw/source') diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1d64beab56d1..25fa1285d9b8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1031,7 +1031,7 @@ void DocxAttributeOutput::StartParagraphProperties() m_pSerializer->startElementNS(XML_w, XML_pPr); // and output the section break now (if it appeared) - if (m_pSectionInfo && !m_setFootnote && m_rExport.m_nTextTyp == TXT_MAINTEXT) + if (m_pSectionInfo && m_rExport.m_nTextTyp == TXT_MAINTEXT) { m_rExport.SectionProperties( *m_pSectionInfo ); m_pSectionInfo.reset(); @@ -7712,7 +7712,6 @@ static void WriteFootnoteSeparatorHeight( void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes ) { - m_setFootnote = true; const FootnotesVector& rVector = bFootnotes? m_pFootnotesList->getVector(): m_pEndnotesList->getVector(); sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes; @@ -9333,8 +9332,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, const FSHelperPtr m_bParaBeforeAutoSpacing(false), m_bParaAfterAutoSpacing(false), m_nParaBeforeSpacing(0), - m_nParaAfterSpacing(0), - m_setFootnote(false) + m_nParaAfterSpacing(0) , m_nParagraphSdtPrToken(0) , m_nRunSdtPrToken(0) , m_nStateOfFlyFrame( FLY_NOT_PROCESSED ) diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 4e86044bb9ff..ddd73764bfe0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -948,8 +948,6 @@ private: // store hardcoded value which was set during import. sal_Int32 m_nParaBeforeSpacing,m_nParaAfterSpacing; - bool m_setFootnote; - /// RelId <-> Graphic* cache, so that in case of alternate content, the same graphic only gets written once. std::stack< std::map > m_aRelIdCache; /// RelId <-> BitmapChecksum cache, similar to m_aRelIdCache, but used for non-Writer graphics, handled in oox. -- cgit v1.2.3