From 0402ba63551b614c9742b198e48232ac87a2b32b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 30 Sep 2016 12:45:03 +0100
Subject: Resolves: tdf#101711 revert attempt to drop unused bg images

for 5-2/5-1 simply revert the effort

Revert "Related: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if..."

This reverts commit 914d72ee1edb351e4975a516240a38696f619217.

Revert "Resolves: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if..."

This reverts commit de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1.

Revert "use unique_ptr"

This reverts commit ee4f35090657fdce572c5bc6238aceb4098a6e4e.

Revert "fix typo"

This reverts commit a084962e8c3deaeb3c1b6b9119215b48cf27e76e.

Revert "rbhz#1326602 avoid exp. bg bitmaps from deleted slides"

This reverts commit b876bbe2cacce8af379b10d82da6c7e7d229b361.

Change-Id: I65a2f50d1087d6f8bb94d8bb73d54d3f378c6800
Reviewed-on: https://gerrit.libreoffice.org/29490
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
---
 include/svx/svdundo.hxx | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 9d63557f8fc6..8a9bb8ae64eb 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <memory>
 #include <vector>
 
 #include <svl/solar.hrc>
@@ -34,7 +33,6 @@
 #include <svx/svxdllapi.h>
 
 class SfxItemSet;
-class SfxPoolItem;
 class SfxStyleSheet;
 class SdrView;
 class SdrPageView;
@@ -586,12 +584,9 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
     // When deleting a MasterPage, we remember all relations of the
     // Character Page with the MasterPage in this UndoGroup.
     SdrUndoGroup*               pUndoGroup;
-    std::unique_ptr<SfxPoolItem> mpFillBitmapItem;
-    bool mbHasFillBitmap;
-    bool mbSoleOwnerOfFillBitmapProps;
 
 public:
-    SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps);
+    SdrUndoDelPage(SdrPage& rNewPg);
     virtual ~SdrUndoDelPage();
 
     virtual void Undo() override;
@@ -602,11 +597,6 @@ public:
 
     virtual void SdrRepeat(SdrView& rView) override;
     virtual bool CanSdrRepeat(SdrView& rView) const override;
-
-private:
-    void queryFillBitmap(const SfxItemSet &rItemSet);
-    void clearFillBitmap();
-    void restoreFillBitmap();
 };
 
 /**
@@ -763,7 +753,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);
-- 
cgit