summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-30 12:45:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-03 15:46:28 +0100
commit1c1d9867b0f789b21730faf76c02d2f86fcee43c (patch)
treec306acc5a2bf74ae7a8a9c87c5159be23930b5f5 /include
parent9e1ee599e00751bc2454a9e2549286f4afca81e5 (diff)
Resolves: tdf#101711 problems with attempt to remove unused bg images
only do the save, unset (and possibly restore) of a bg image on the stylesheet if it has one owner, this continue to make the original scenario function without (so far anyway) the various reported problems Change-Id: I73382961973b1c53bf2ceff205615727dd378c77
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdundo.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 504dc818f4f1..4773a39fb2c3 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -590,10 +590,9 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
SdrUndoGroup* pUndoGroup;
std::unique_ptr<SfxPoolItem> mpFillBitmapItem;
bool mbHasFillBitmap;
- bool mbSoleOwnerOfFillBitmapProps;
public:
- SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps);
+ SdrUndoDelPage(SdrPage& rNewPg);
virtual ~SdrUndoDelPage() override;
virtual void Undo() override;
@@ -765,7 +764,7 @@ public:
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
// Page
- virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps = true);
+ virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1);