diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-17 11:04:19 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-17 12:21:26 +0100 |
| commit | f53189e02c6017f2ba6d7d83ead69f763d3b29aa (patch) | |
| tree | 7f54aaf0f59d4498a3d0a713bd3367e023d18618 | |
| parent | postgresql: upgrade to release 13.5 (diff) | |
| download | core-f53189e02c6017f2ba6d7d83ead69f763d3b29aa.tar.gz core-f53189e02c6017f2ba6d7d83ead69f763d3b29aa.zip | |
oops, fix merge error in commit 08abcae56b13b11d699a30553f7edfc54225d687
"ofz#40593 remove Objects from m_xResizeDrawObjects if deleted during parse"
Change-Id: I715530cc19b670eef109e59148db2aac05bd33be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125376
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | sw/source/filter/html/htmltab.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index f90b77522319..670ed3ae7aeb 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1069,19 +1069,15 @@ bool SwHTMLParser::IsReqIF() const } // if any m_pResizeDrawObjects members are deleted during parse, remove them -// from m_pResizeDrawObjects and m_xDrawObjectPercentWidths +// from m_pResizeDrawObjects and m_pDrawObjectPrcWidths void HTMLTable::ObjectInDestruction(const SdrObject& rObject) { auto it = std::find(m_pResizeDrawObjects->begin(), m_pResizeDrawObjects->end(), &rObject); assert(it != m_pResizeDrawObjects->end()); -#if 0 auto nIndex = std::distance(m_pResizeDrawObjects->begin(), it); -#endif m_pResizeDrawObjects->erase(it); -#if 0 - auto otherit = m_xDrawObjectPercentWidths->begin() + nIndex * 3; - m_xDrawObjectPercentWidths->erase(otherit, otherit + 3); -#endif + auto otherit = m_pDrawObjectPrcWidths->begin() + nIndex * 3; + m_pDrawObjectPrcWidths->erase(otherit, otherit + 3); } HTMLTable::~HTMLTable() |