[libreoffice/f20] Resolves: rhbz#1160924 do not clear the 3D flag on refupdate (fdo#82936)

Eike Rathke erack at fedoraproject.org
Fri Nov 7 18:36:13 UTC 2014


commit 5d7d96749516a00729973f761162a9fa7dad9c3b
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Nov 7 19:35:31 2014 +0100

    Resolves: rhbz#1160924 do not clear the 3D flag on refupdate (fdo#82936)

 ...o-82936-do-not-clear-the-3D-flag-on-refup.patch |   44 ++++++++++++++++++++
 libreoffice.spec                                   |    4 ++
 2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch b/0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch
new file mode 100644
index 0000000..1806c43
--- /dev/null
+++ b/0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch
@@ -0,0 +1,44 @@
+From d267785c1a63054eb3693045d955fcc01a66b4eb Mon Sep 17 00:00:00 2001
+Message-Id: <d267785c1a63054eb3693045d955fcc01a66b4eb.1415383988.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Fri, 22 Aug 2014 12:59:47 +0200
+Subject: [PATCH] resolved fdo#82936 do not clear the 3D flag on refupdate
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862
+(cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31)
+---
+ sc/source/core/tool/token.cxx | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch"
+
+diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
+index 77d7d1d..fd362e3 100644
+--- a/sc/source/core/tool/token.cxx
++++ b/sc/source/core/tool/token.cxx
+@@ -2847,7 +2847,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
+                 }
+ 
+                 rRef.SetAddress(aAbs, rNewPos);
+-                rRef.SetFlag3D(b3DFlag);
++                if (b3DFlag)
++                    rRef.SetFlag3D(b3DFlag);
+             }
+             break;
+             case svDoubleRef:
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c769dfb..9cf5ca5 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -317,6 +317,7 @@ Patch61: 0001-fdo-79602-sw-fix-text-formatting-of-proportional-lin.patch
 Patch62: 0002-fdo-79602-sw-add-new-compatibiltiy-flag-PropLineSpac.patch
 Patch63: 0001-fdo-85403-broadcast-changes-after-TextToColumn.patch
 Patch64: 0001-Resolves-fdo-37559-revert-adding-extra-dummy-polygon.patch
+Patch65: 0001-resolved-fdo-82936-do-not-clear-the-3D-flag-on-refup.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2258,6 +2259,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Nov 07 2014 Eike Rathke <erack at redhat.com> - 1:4.2.7.2-6-UNBUILT
+- Resolves: rhbz#1160924 do not clear the 3D flag on refupdate (fdo#82936)
+
 * Wed Nov 05 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.7.2-5
 - Resolves: fdo#37559 revert adding extra dummy polygons
 


More information about the scm-commits mailing list