[Libreoffice-commits] core.git: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/tool/dbdata.cxx   |    3 ++-
 sc/source/core/tool/interpr3.cxx |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit eefe13c77d01be37c911e75af191717a944fedb3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 9 22:13:24 2017 +0200

    shrinking the DB area just causes problems, tdf#89546
    
    Change-Id: Ic7a736141bc78e36c71b639244c6f5cf0d145073
    Reviewed-on: https://gerrit.libreoffice.org/36391
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index ccc19bcd1b49..30fe568f8837 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -625,9 +625,10 @@ void ScDBData::UpdateReference(ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
 void ScDBData::ExtendDataArea(ScDocument* pDoc)
 {
     // Extend the DB area to include data rows immediately below.
-    // or shrink it if all cells are empty
     SCCOL nOldCol1 = nStartCol, nOldCol2 = nEndCol;
+    SCROW nOldEndRow = nEndRow;
     pDoc->GetDataArea(nTable, nStartCol, nStartRow, nEndCol, nEndRow, false, true);
+    nEndRow = std::max(nEndRow, nOldEndRow);
     if (nStartCol != nOldCol1 || nEndCol != nOldCol2)
     {
         SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", "ScDBData::ExtendDataArea - invalidating column names/offsets");
commit 091a0dd416171393d939aac924433063a68967b0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Apr 10 23:04:15 2017 +0200

    fix indentation
    
    Change-Id: I58fb76084fe06d38828fbdf4ab53d297e8da6d3f
    Reviewed-on: https://gerrit.libreoffice.org/36392
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index aa4b94899f10..8502f1e76fa7 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2241,9 +2241,9 @@ void ScInterpreter::ScBetaInv()
         PushDouble(fA + fVal*(fB-fA));                  // scale to (A,B)
 }
 
-                                                            // Note: T, F, and Chi are
-                                                            // monotonically decreasing,
-                                                            // therefore 1-Dist as function
+// Note: T, F, and Chi are
+// monotonically decreasing,
+// therefore 1-Dist as function
 
 class ScTDistFunction : public ScDistFunc
 {