diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-20 14:52:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-20 14:55:13 +0000 |
| commit | 35bb22c1a834b306c910cb065bc006818c9fa9b3 (patch) | |
| tree | 51921e78a23642d6a5097935f4ca1ec24c64f012 | |
| parent | 329a6985a4ab94a3f899053dc84422af848bd47c (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
| -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 9d63bfbeb112..7a76fd4d1401 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()) { |