sw/source/filter/ww8/docxattributeoutput.cxx | 40 --------------------------- sw/source/filter/ww8/docxattributeoutput.hxx | 2 - 2 files changed, 42 deletions(-)
New commits: commit 51d694ee802a13f773421ac78cfabdf7acab023b Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Oct 30 09:00:10 2014 +0100 Unused DocxAttributeOutput::switchHeaderFooter() Change-Id: If50922e238bebd9a02e9950ca27d99c2df9ab7d8 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 85b38bb..b3c3687 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2950,45 +2950,6 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t (sal_uInt16)nTblSz, false); } -/** - * As we are exporting Header and footer in between when we are exporting document.xml. - * In this case we are facing issue in table export for header and footer. Because - * flags for table is getting shared in both export. - * So we are switching between flags in between exporting "document.xml" and Header & footer - * export. - */ -void DocxAttributeOutput::switchHeaderFooter(bool isHeaderFooter, sal_Int32 index) -{ - if( isHeaderFooter && index == 1) - { - m_oldTableReference->m_bTableCellOpen = m_tableReference->m_bTableCellOpen; - m_oldTableReference->m_nTableDepth = m_tableReference->m_nTableDepth; - m_oldTableReference->m_pOldTablepInner = m_tableReference->m_pOldTablepInner; - m_tableReference->m_bTableCellOpen = false; - m_tableReference->m_nTableDepth = 0; - m_pSectionInfo.reset(); - } - else if( index == -1) - { - if (m_oldTableReference->m_pOldTablepInner) - { - m_tableReference->m_bTableCellOpen = m_oldTableReference->m_bTableCellOpen; - m_tableReference->m_nTableDepth = m_oldTableReference->m_nTableDepth; - - //Reset the oldReference, after copying it back to the original. - m_oldTableReference->m_bTableCellOpen = false ; - m_oldTableReference->m_nTableDepth = 0; - m_oldTableReference->m_pOldTablepInner.reset(); - } - - } - else - { - m_tableReference->m_bTableCellOpen = false; - m_tableReference->m_nTableDepth = 0; - } -} - void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { // In case any paragraph SDT's are open, close them here. @@ -8350,7 +8311,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri m_anchorId( 1 ), m_nextFontId( 1 ), m_tableReference(new TableReference()), - m_oldTableReference(new TableReference()), m_bIgnoreNextFill(false), m_bBtLr(false), m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)), diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 765d64d..e787e5a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -878,7 +878,6 @@ private: }; boost::scoped_ptr<TableReference> m_tableReference; - boost::scoped_ptr<TableReference> m_oldTableReference; std::map< OUString, EmbeddedFontRef > fontFilesMap; // font file url to data @@ -962,7 +961,6 @@ public: /// DMLTextExport virtual void WriteTextBox(css::uno::Reference<css::drawing::XShape> xShape) SAL_OVERRIDE; virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE; - virtual void switchHeaderFooter(bool isHeaderFooter, sal_Int32 index); void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits