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

Kohei Yoshida kohei.yoshida at collabora.com
Wed May 7 11:07:14 PDT 2014


 sc/source/ui/docshell/docfunc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c369a60b60dfeaa12a688d2182c78bc8d4efb38e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed May 7 00:34:06 2014 -0400

    fdo#77944: No need to store updated formulas in undo document when moving.
    
    This causes crash with dbgutil build, and I'm sure would cause issues with the
    release build as well.
    
    We now use broadcasting to handle reference update during undo of block move,
    so this old way of handling undo for block move is redundant and obviously
    causes issues.
    
    (cherry picked from commit 6cc92a2fead337eef3d9cc3e5818cfcc505e4651)
    
    Conflicts:
    	sc/source/ui/docshell/docfunc.cxx
    
    Change-Id: I9dcbb9d9e3808da3f8510eab16ad21b626f881d9
    Reviewed-on: https://gerrit.libreoffice.org/9265
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index bcb45b6..2d85309 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2728,7 +2728,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos
         ScDrawLayer::MoveCells() which may move away inserted objects to wrong
         positions (e.g. if source and destination range overlaps).*/
     pDoc->CopyFromClip( aPasteDest, aDestMark, IDF_ALL & ~(IDF_OBJECTS),
-                        pRefUndoDoc, pClipDoc, sal_True, false, bIncludeFiltered );
+                        NULL, pClipDoc, true, false, bIncludeFiltered );
 
 
     // skipped rows and merged cells don't mix


More information about the Libreoffice-commits mailing list