[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/data/table4.cxx |    2 +-
 sc/source/core/tool/token.cxx  |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 94311ca03b03936c59024c9e39a0920f67ab9131
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Dec 7 09:17:50 2014 +0100

    handle all fill cases correctly, fdo#86754
    
    That special case only works if the whole source range contains formula
    cells. For now we just limit it to the special case of a single source
    cell.
    
    Change-Id: I71ccfde06edd97e5a9c78da22053583d05aac411
    Reviewed-on: https://gerrit.libreoffice.org/13344
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 8176253a7f8b061eb18015763ca674ea959ddf37)

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 24effea..39f35f4 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1297,7 +1297,7 @@ void ScTable::FillAutoSimple(
                 if (bVertical)      // rInner&:=nRow, rOuter&:=nCol
                 {
                     aSrcCell = aCol[rCol].GetCellValue(nSource);
-                    if (aSrcCell.meType == CELLTYPE_FORMULA)
+                    if (nISrcStart == nISrcEnd && aSrcCell.meType == CELLTYPE_FORMULA)
                     {
                         FillFormulaVertical(*aSrcCell.mpFormula, rInner, rCol, nIStart, nIEnd, pProgress, rProgress);
                         return;
commit 50fbf7fef622e25fbb88183c8b9c7399cefa5d99
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Dec 8 08:05:34 2014 +0100

    don't update range name if ref not in update range, fdo#85304
    
    Change-Id: I1ccfacd98bd10f6ae1d4eaf7a705fe8863045697
    Reviewed-on: https://gerrit.libreoffice.org/13363
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit ba874864eb57e38b6368256ccadcb8274eec4f2c)

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index ebc072e..f7dbbfa 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3131,6 +3131,9 @@ bool adjustSingleRefInName(
         return false;
     }
 
+    if (!rCxt.maRange.In(rRef.toAbs(rPos)))
+        return false;
+
     bool bChanged = false;
 
     if (rCxt.mnColDelta)