summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-25 15:08:51 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-09-29 12:04:41 +0200
commit60723da529bbbac7067a86715752e4dbe7c6a291 (patch)
tree71dfb6ac70b775d9210fe8895277270999e97008
parente397c3775303fc2eb850ae8d1cb1ab2cc271a446 (diff)
Related: tdf#136985 SfxStringListItem::GetString() crash in empty case
probably since... commit a573b8b21688d9681f4fa129ec37cf89954e9d1c Date: Sat May 21 16:14:56 2011 -0430 Replace List for std::vector in SfxStringListItem. Change-Id: I7060b5693ba08fa5f70cc5cb3ae1b7a4722a31a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103340 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 7c8f997321e136208e8983ab6ad78cc33891125f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103571 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--svl/source/items/slstitm.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 05e5401db18e..54af346254d6 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -125,13 +125,12 @@ OUString SfxStringListItem::GetString()
OUStringBuffer aStr;
if ( mpList )
{
- std::vector<OUString>::const_iterator iter = mpList->begin();
- for (;;)
+ for (auto iter = mpList->begin(), end = mpList->end(); iter != end;)
{
aStr.append(*iter);
++iter;
- if (iter == mpList->end())
+ if (iter == end)
break;
aStr.append("\r");