From e3bcf3a03a97812a8c9eebd2ba3e6721b1b80979 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Nov 21 2016 23:03:57 +0000 Subject: Resolves: tdf#103994 AdjustReferenceOnMove: handle external references --- diff --git a/0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch b/0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch new file mode 100644 index 0000000..9e83665 --- /dev/null +++ b/0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch @@ -0,0 +1,59 @@ +From e13677d84bef10195b9733b8ae101e31b7c92c57 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Eike Rathke +Date: Thu, 17 Nov 2016 22:13:19 +0100 +Subject: [PATCH] Resolves: tdf#103994 AdjustReferenceOnMove: handle external + references +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: I8b104b0c843dd268d8760a2a73cdd3e672e6efd6 +(cherry picked from commit 4665be3af48587505bb7f49a53e8422945ec49eb) +Reviewed-on: https://gerrit.libreoffice.org/30941 +Tested-by: Jenkins +Reviewed-by: Markus Mohrhard +--- + sc/source/core/tool/token.cxx | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + + +--------------erAck-patch-parts +Content-Type: text/x-patch; name="0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch" + +diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx +index ffb9a29..fb53185 100644 +--- a/sc/source/core/tool/token.cxx ++++ b/sc/source/core/tool/token.cxx +@@ -3115,6 +3115,20 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( + rRef.Ref1.SetFlag3D(true); + } + break; ++ case svExternalSingleRef: ++ { ++ ScSingleRefData& rRef = *p->GetSingleRef(); ++ ScAddress aAbs = rRef.toAbs(rOldPos); ++ rRef.SetAddress(aAbs, rNewPos); ++ } ++ break; ++ case svExternalDoubleRef: ++ { ++ ScComplexRefData& rRef = *p->GetDoubleRef(); ++ ScRange aAbs = rRef.toAbs(rOldPos); ++ rRef.SetRange(aAbs, rNewPos); ++ } ++ break; + default: + ; + } + +--------------erAck-patch-parts-- + + diff --git a/libreoffice.spec b/libreoffice.spec index 906c80e..d9fc084 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -301,6 +301,7 @@ Patch63: 0001-drawing-shapes-aren-t-tracking-style-name-changes-co.patch Patch64: 0001-set-the-search-toolbar-so-it-doesn-t-move-around-wrt.patch Patch65: 0001-Resolves-tdf-104096-reset-also-rRawRes-if-trailing-c.patch Patch66: 0001-ODF-do-not-write-an-empty-style-text-position-attrib.patch +Patch67: 0001-Resolves-tdf-103994-AdjustReferenceOnMove-handle-ext.patch %if ! 0%{?rhel} Patch400: 0001-Update-liborcus-to-0.11.0.patch @@ -2374,6 +2375,7 @@ done * Mon Nov 21 2016 Eike Rathke - 1:5.1.6.2-5-UNBUILT - Resolves: tdf#104096 reset also rRawRes if trailing characters are present - ODF: do not write an empty style:text-position="" attribute for CharEscapement +- Resolves: tdf#103994 AdjustReferenceOnMove: handle external references * Mon Nov 21 2016 David Tardon - 1:5.1.6.2-4 - allow abrt to work again