[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 5 03:29:31 PDT 2012


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

New commits:
commit 66d0a488979facf43b3e236fe4ac025776b1582b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Oct 4 20:46:54 2012 +0200

    workaround broken uno implementatiion with ScRangeList
    
    Change-Id: Ied665e59ada98c25651be562c4a2fe54ffd1ec6a
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 19321b5..e99e47f 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -438,6 +438,9 @@ bool ScRangeList::UpdateReference(
         }
     }
 
+    if(maRanges.empty())
+        return true;
+
     vector<ScRange*>::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
     for (; itr != itrEnd; ++itr)
     {
@@ -460,6 +463,16 @@ bool ScRangeList::UpdateReference(
             pR->aEnd.Set( theCol2, theRow2, theTab2 );
         }
     }
+
+    if(eUpdateRefMode == URM_INSDEL)
+    {
+        if(nDx < 0 || nDy < 0)
+        {
+            size_t n = maRanges.size();
+            Join(*maRanges[n-1], true);
+        }
+    }
+
     return bChanged;
 }
 


More information about the Libreoffice-commits mailing list