[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

Markus Mohrhard markus.mohrhard at collabora.co.uk
Thu Dec 4 05:58:58 PST 2014


 sc/source/core/tool/token.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3e40e71761e710f9226f6c9772143daf29cf454a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Dec 1 04:05:46 2014 +0100

    avoid modifying range name references that are not affected, fdo#86518
    
    Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5
    Reviewed-on: https://gerrit.libreoffice.org/13239
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 74c61a5..ebc072e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3236,6 +3236,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
                         // column range of the reference is not entirely in the deleted column range.
                         break;
 
+                    if (aAbs.aStart.Tab() > rCxt.maRange.aEnd.Tab() || aAbs.aEnd.Tab() < rCxt.maRange.aStart.Tab())
+                        // wrong tables
+                        break;
+
                     ScRange aDeleted = rCxt.maRange;
                     aDeleted.aStart.IncRow(rCxt.mnRowDelta);
                     aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);


More information about the Libreoffice-commits mailing list