diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-06 10:10:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-07-08 11:50:04 +0000 |
| commit | 30c152836419f7fabd128142c3ce266b07ba5210 (patch) | |
| tree | c972656541f6ebdbce6db1600f9acbd60ce5d7d7 /include/svx | |
| parent | 18a7d6423db379ce9b4ba146aea20c55f1bda32f (diff) | |
Resolves: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if...
the master page is not the sole owner. Which happens when copying
and pasting slides which bring along a duplicate master page to
an already existing one, and the attempt to remove the duplicate
strips the fill properties from the shared stylesheet in use by
the other
regression from...
commit b876bbe2cacce8af379b10d82da6c7e7d229b361
Author: David Tardon <dtardon@redhat.com>
Date: Tue Apr 26 09:17:11 2016 +0200
rbhz#1326602 avoid exp. bg bitmaps from deleted slides
Change-Id: I91fb8f622a0e35741ecc37cef14fc93199bb730b
(cherry picked from commit de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1)
Reviewed-on: https://gerrit.libreoffice.org/26975
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdundo.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index dc09f22be701..9d63557f8fc6 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -588,9 +588,10 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList SdrUndoGroup* pUndoGroup; std::unique_ptr<SfxPoolItem> mpFillBitmapItem; bool mbHasFillBitmap; + bool mbSoleOwnerOfFillBitmapProps; public: - SdrUndoDelPage(SdrPage& rNewPg); + SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps); virtual ~SdrUndoDelPage(); virtual void Undo() override; @@ -762,7 +763,7 @@ public: virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1); // Page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage); + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps = true); virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage); virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1); |