[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |    3 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |    7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit dea7cb8a4fc926c4a399dc28f9fb868da231986c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Oct 14 09:16:03 2014 +0200

    Remove confusing TableReference::operator=()
    
    Confusing, because the class has 4 members, and only 2 was set in that
    method.
    
    Change-Id: I797872be8c60fa564cece66d8dd20e33248d4a0f

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8843331..2ad4a32 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2969,7 +2969,8 @@ void DocxAttributeOutput::switchHeaderFooter(bool isHeaderFooter, sal_Int32 inde
     {
        if (m_oldTableReference->m_pOldTablepInner)
        {
-           *m_tableReference = *m_oldTableReference;
+           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 ;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index eebee0e..9fd636b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -143,13 +143,6 @@ struct TableReference
         m_nTableDepth(0)
     {
     }
-
-    TableReference& operator= (const TableReference& rhs)
-    {
-        m_bTableCellOpen = rhs.m_bTableCellOpen ;
-        m_nTableDepth    = rhs.m_nTableDepth ;
-        return *this ;
-    }
 };
 
 /// The class that has handlers for various resource types when exporting as DOCX.