diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-20 14:52:52 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-02-21 13:42:55 +0000 |
| commit | 213c129049f0bfa36a843f59be8614e4fc5fc362 (patch) | |
| tree | fb718268e14dc2a6941d8282fc15e23c5d56ca3b | |
| parent | 4524d3fa3dcbcbba2a9e8111e27e6301d33de5d2 (diff) | |
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
(cherry picked from commit 35bb22c1a834b306c910cb065bc006818c9fa9b3)
Reviewed-on: https://gerrit.libreoffice.org/34477
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | svx/source/svdraw/svdmark.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 66e5f6eb71b0..6cf64c9e1da6 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()) { |