diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-14 09:16:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-14 09:16:30 +0200 |
| commit | dea7cb8a4fc926c4a399dc28f9fb868da231986c (patch) | |
| tree | 17770b0bef5dc626cb34c205eb1787fd6020df76 | |
| parent | a2c481457cd2d03263054a5fefe80da316e09a44 (diff) | |
Remove confusing TableReference::operator=()
Confusing, because the class has 4 members, and only 2 was set in that
method.
Change-Id: I797872be8c60fa564cece66d8dd20e33248d4a0f
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 88433313bf54..2ad4a32034e7 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 eebee0e8f72c..9fd636b512df 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. |