diff options
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 6 |
3 files changed, 0 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7df189d5ea37..31a8b7cc9176 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5389,8 +5389,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) m_xLstManager.reset(); } - SAL_WARN_IF(m_pTableEndPaM, "sw.ww8", "document ended without table ending"); - m_pTableEndPaM.reset(); //ensure this is deleted before pPaM mpCursor.reset(); m_pPaM = nullptr; m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 3eb92100d532..784bb7dc0a62 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1338,7 +1338,6 @@ private: bool m_bBidi; bool m_bReadTable; - std::shared_ptr<SwPaM> m_pTableEndPaM; // Indicate that currently on loading a TOC, managed by Read_F_TOX() and End_Field() bool m_bLoadingTOXCache; int m_nEmbeddedTOXLevel; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c0f8f1cbb164..3cbd764fa6d6 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3603,7 +3603,6 @@ void SwWW8ImplReader::TabCellEnd() m_bFirstPara = true; // We have come to the end of a cell so FirstPara flag m_bReadTable = false; - m_pTableEndPaM.reset(); } void SwWW8ImplReader::Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, short nLen) @@ -3649,11 +3648,6 @@ void SwWW8ImplReader::StopTable() PopTableDesc(); m_bReadTable = true; - // #i101116# - Keep PaM on table end only for nested tables - if ( m_nInTable > 1 ) - { - m_pTableEndPaM.reset(new SwPaM(*m_pPaM, m_pPaM)); - } } bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const |