svx/source/svdraw/svdmark.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 35bb22c1a834b306c910cb065bc006818c9fa9b3
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 20 14:52:52 2017 +0000
Resolves: tdf#106105 duplicate marks not merged when they are at the start
i.e. initial mark isn't compared which goes on to crash under some
circumstances
regression from...
commit aa11e7bae89fe691f914abb27d1c4a03d27a7ee5
Date: Tue Aug 14 16:31:53 2012 +0200
Convert maList in SdrMarkList from Container to std::vector
Change-Id: Ib3e9b02aad91c14971656af171d48154507da127
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 9d63bfb..7a76fd4 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -179,8 +179,9 @@ void SdrMarkList::ImpForceSort()
if(maList.size() > 1)
{
SdrMark* pAkt = maList.back();
- for (size_t i = maList.size() - 2; i; --i)
+ for (size_t count = maList.size() - 1; count; --count)
{
+ size_t i = count - 1;
SdrMark* pCmp = maList[i];
if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() &&
pAkt->GetMarkedSdrObj())
{
commit 329a6985a4ab94a3f899053dc84422af848bd47c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 20 14:00:34 2017 +0000
no need for return at end
Change-Id: I3fb2cc8d5d1c8853dc35b176030fc5d3292e4756
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 66e5f6e..9d63bfb 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -323,8 +323,6 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool
bChkSort)
}
}
}
-
- return;
}
void SdrMarkList::DeleteMark(size_t nNum)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
