[Libreoffice-commits] core.git: sd/source

Michael Stahl mstahl at redhat.com
Wed Feb 1 20:59:39 UTC 2017


 sd/source/ui/func/fupage.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4ec3d8cedebb83700e3254486d6d3a502584c9b1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 1 21:51:09 2017 +0100

    tdf#105677: sd: fix crash in FuPage::ApplyItemSet
    
    (regression from f3a90d13056ca23708cc4fd9562c99d0b41a4b6f)
    
    Change-Id: I54e3f06a74b2ac715061b5da54ac4db2b0a1010a

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 59c7cf2..15682c4 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -621,8 +621,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
     if( mpBackgroundObjUndoAction )
     {
         // set merge flag, because a SdUndoGroupAction could have been inserted before
-        mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction.get(), true );
-        mpBackgroundObjUndoAction = nullptr;
+        mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction.release(), true );
     }
 
     // Objects can not be bigger than ViewSize


More information about the Libreoffice-commits mailing list