summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-02-01 21:51:09 +0100
committerMichael Stahl <mstahl@redhat.com>2017-02-01 21:56:03 +0100
commit4ec3d8cedebb83700e3254486d6d3a502584c9b1 (patch)
tree5f86c06032aa9b0cb27669f046a4117723f3b14c /sd
parentupload libjpeg-turbo 1.5.1 (diff)
downloadcore-4ec3d8cedebb83700e3254486d6d3a502584c9b1.tar.gz
core-4ec3d8cedebb83700e3254486d6d3a502584c9b1.zip
tdf#105677: sd: fix crash in FuPage::ApplyItemSet
(regression from f3a90d13056ca23708cc4fd9562c99d0b41a4b6f) Change-Id: I54e3f06a74b2ac715061b5da54ac4db2b0a1010a
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/func/fupage.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 59c7cf29b460..15682c460eb1 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