[libreoffice/f20] Resolves: fdo#84043 don't create duplicate Mirrored props

[Caolán McNamara]

commit d21358e9fe3ad5f6f4cba690c27b993ce2fb921a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 27 11:40:42 2014 +0000

    Resolves: fdo#84043 don't create duplicate Mirrored props

 ...o-84043-don-t-create-duplicate-Mirrored-X.patch |   78 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +-
 2 files changed, 83 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch b/0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
new file mode 100644
index 0000000..7943bb7
--- /dev/null
+++ b/0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
@@ -0,0 +1,78 @@
+From 10924e1e0c3b88f5650994b6943193d23f99109d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 27 Nov 2014 11:30:45 +0000
+Subject: [PATCH] Resolves: fdo#84043 don't create duplicate Mirrored[X|Y]
+ properties
+
+regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09
+
+commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
+Author: Armin Le Grand <alg at apache.org>
+Date:   Wed Nov 21 13:23:01 2012 +0000
+
+    For backward compatibility take mirrorings in setTransformation into account
+
+    Also found an error in SdrObjCustomShape::TRGetBaseGeometry when MirrorY was used
+
+    (cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)
+
+Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
+(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
+---
+ xmloff/source/draw/ximpshap.cxx | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
+index 74bb00c..6a8c77a 100644
+--- a/xmloff/source/draw/ximpshap.cxx
++++ b/xmloff/source/draw/ximpshap.cxx
+@@ -3832,22 +3832,38 @@ void SdXMLCustomShapeContext::EndElement()
+ 
+         if(bFlippedX || bFlippedY)
+         {
+-            beans::PropertyValue aNewPoroperty;
++            OUString sName;
+ 
+             if(bFlippedX)
++                sName = "MirroredX";
++            else
++                sName = "MirroredY";
++
++            //fdo#84043 overwrite the property if it already exists, otherwise append it
++            beans::PropertyValue* pItem;
++            std::vector< beans::PropertyValue >::iterator aI(maCustomShapeGeometry.begin());
++            std::vector< beans::PropertyValue >::iterator aE(maCustomShapeGeometry.end());
++            while (aI != aE)
++            {
++                if (aI->Name == sName)
++                    break;
++                ++aI;
++            }
++            if (aI != aE)
+             {
+-                aNewPoroperty.Name = "MirroredX";
++                beans::PropertyValue& rItem = *aI;
++                pItem = &rItem;
+             }
+             else
+             {
+-                aNewPoroperty.Name = "MirroredY";
++                maCustomShapeGeometry.push_back(beans::PropertyValue());
++                pItem = &maCustomShapeGeometry.back();
+             }
+ 
+-            aNewPoroperty.Handle = -1;
+-            aNewPoroperty.Value <<= sal_True;
+-            aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
+-
+-            maCustomShapeGeometry.push_back(aNewPoroperty);
++            pItem->Name = sName;
++            pItem->Handle = -1;
++            pItem->Value <<= sal_True;
++            pItem->State = beans::PropertyState_DIRECT_VALUE;
+         }
+     }
+ 
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 96b4c9e..b3634e1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -36,7 +36,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        10%{?libo_prerelease}%{?dist}
+Release:        11%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -332,6 +332,7 @@ Patch76: 0005-fdo-85215-Don-t-adjust-references-wrt-cell-position-.patch
 Patch77: 0006-fdo-83765-do-not-update-references-in-SortReorderByC.patch
 Patch78: 0007-fix-fdo-79441-again-and-keep-references-to-other-she.patch
 Patch79: 0008-fdo-86708-paint-after-Undo-of-Sort.patch
+Patch80: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2273,6 +2274,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.7.2-11-unbuilt
+- Resolves: fdo#84043 don't create duplicate Mirrored props
+
 * Wed Nov 26 2014 Eike Rathke <erack at redhat.com> - 1:4.2.7.2-10
 - Resolves: rhbz#1167250 Crash in clipboard code
 - Resolves: rhbz#1164898 and various other Calc sorting issues