summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2024-04-25 18:20:20 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2024-04-29 18:39:44 +0200
commitf6fb5dedc3926ce214560a4053815f692b29b934 (patch)
tree3b364885f15752042c9414cb7ff3f9e4eeb9bfa2
parent58b85fc5e4ebe6c8a77e2b1935c23bf0ebebad0a (diff)
tdf#154581 tdf#157411 tdf#158549 sw: HTML import: fix SfxItemIter reuse
This is obviously wrong, as ALG just pointed out: the aIter is at the end after the 1st loop, so the 2nd loop does nothing. Thx Gabor for checking all the reported bugs. (regression from commit db115bec9254417ef7a3faf687478fe5424ab378) Change-Id: Iae37b9ab5c630d0ee774f42c84d5e76349b92a90 Tested-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166643 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit ac05822b8957d80018d3ce1cbf97cd9faa0dfe99) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166713 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/filter/html/htmlctxt.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 80245ba2ea6a..0e87b83644f8 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -656,7 +656,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
}
#endif
- for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem())
+ SfxItemIter aIter2(rItemSet);
+ for (const SfxPoolItem* pItem = aIter2.GetCurItem(); pItem; pItem = aIter2.NextItem())
{
HTMLAttr **ppAttr = nullptr;