| 1 |
From fc391766c29745209b65f067db2a88bb8a0323c9 Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Mon, 20 Feb 2017 14:52:52 +0000 |
| 4 |
Subject: [PATCH] Resolves: tdf#106105 duplicate marks not merged when they are |
| 5 |
at the start |
| 6 |
|
| 7 |
i.e. initial mark isn't compared which goes on to crash under some circumstances |
| 8 |
|
| 9 |
regression from... |
| 10 |
|
| 11 |
commit aa11e7bae89fe691f914abb27d1c4a03d27a7ee5 |
| 12 |
Date: Tue Aug 14 16:31:53 2012 +0200 |
| 13 |
|
| 14 |
Convert maList in SdrMarkList from Container to std::vector |
| 15 |
|
| 16 |
Change-Id: Ib3e9b02aad91c14971656af171d48154507da127 |
| 17 |
(cherry picked from commit 35bb22c1a834b306c910cb065bc006818c9fa9b3) |
| 18 |
--- |
| 19 |
svx/source/svdraw/svdmark.cxx | 3 ++- |
| 20 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx |
| 23 |
index bb164d7..4cbd4b5 100644 |
| 24 |
--- a/svx/source/svdraw/svdmark.cxx |
| 25 |
+++ b/svx/source/svdraw/svdmark.cxx |
| 26 |
@@ -258,8 +258,9 @@ void SdrMarkList::ImpForceSort() |
| 27 |
if(maList.size() > 1) |
| 28 |
{ |
| 29 |
SdrMark* pAkt = maList.back(); |
| 30 |
- for (size_t i = maList.size() - 2; i; --i) |
| 31 |
+ for (size_t count = maList.size() - 1; count; --count) |
| 32 |
{ |
| 33 |
+ size_t i = count - 1; |
| 34 |
SdrMark* pCmp = maList[i]; |
| 35 |
if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() && pAkt->GetMarkedSdrObj()) |
| 36 |
{ |
| 37 |
-- |
| 38 |
2.9.3 |
| 39 |
|
Parent Directory
| 
Revision Log