diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-30 12:45:03 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-10-05 06:47:34 +0000 |
| commit | 0402ba63551b614c9742b198e48232ac87a2b32b (patch) | |
| tree | fe5efd4ae77973c34b20c525cc1ed8f62cbf0165 /reportdesign | |
| parent | f102e2391a913acef117aed6106e635b7ab1853d (diff) | |
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>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/inc/ReportUndoFactory.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/ReportUndoFactory.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 1839f1f70472..88d0024044ee 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -59,7 +59,7 @@ namespace rptui virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) override; // page - virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps = true) override; + virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override; virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage) override; virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage) override; virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) override; diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 566400cc009a..cbb5a8a305bf 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -133,9 +133,9 @@ SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage, bool bSoleOwnerOfFillBitmapProps) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { - return m_pUndoFactory->CreateUndoDeletePage(rPage, bSoleOwnerOfFillBitmapProps); + return m_pUndoFactory->CreateUndoDeletePage( rPage ); } SdrUndoAction* OReportUndoFactory::CreateUndoNewPage(SdrPage& rPage) |