From c9e1d0b9296dc13aa788b7a0d74a39e1190ac4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 19 Sep 2016 12:29:13 +0100 Subject: [PATCH] Related: rhbz#1353069 don't clear XATTR_FILL from in use styles --- ...3069-don-t-clear-XATTR_FILL-from-sty.patch | 63 +++++++++++++++++++ libreoffice.spec | 7 ++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch diff --git a/0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch b/0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch new file mode 100644 index 0000000..bba0501 --- /dev/null +++ b/0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch @@ -0,0 +1,63 @@ +From be1949efff0b11b5fe1fbca978ceedd8816679f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 19 Sep 2016 12:24:02 +0100 +Subject: [PATCH] Related: rhbz#1353069 don't clear XATTR_FILL* from stylesheet + if... + +This is similar to de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1 where + +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 +Date: Tue Apr 26 09:17:11 2016 +0200 + + rbhz#1326602 avoid exp. bg bitmaps from deleted slides + +Change-Id: I0a3a34ade2ad8464b1edb67a6e28dab45c761a2c +(cherry picked from commit 914d72ee1edb351e4975a516240a38696f619217) +--- + sd/source/core/drawdoc3.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx +index 4a77b7c..9bef42e 100644 +--- a/sd/source/core/drawdoc3.cxx ++++ b/sd/source/core/drawdoc3.cxx +@@ -1241,6 +1241,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl + { + // Do not delete master pages that have their precious flag set + bool bDeleteMaster = !pMaster->IsPrecious(); ++ bool bSoleOwnerOfStyleSheet = true; + OUString aLayoutName = pMaster->GetLayoutName(); + + if(bOnlyDuplicatePages ) +@@ -1255,6 +1256,10 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl + { + // duplicate page found -> remove it + bDeleteMaster = true; ++ ++ const SfxStyleSheet* pRefSheet = pMaster->getSdrPageProperties().GetStyleSheet(); ++ const SfxStyleSheet* pTestSheet = pMPg->getSdrPageProperties().GetStyleSheet(); ++ bSoleOwnerOfStyleSheet = pRefSheet != pTestSheet; + } + } + } +@@ -1288,7 +1293,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl + delete pNotesMaster; + + if( bUndo ) +- AddUndo(GetSdrUndoFactory().CreateUndoDeletePage(*pMaster)); ++ AddUndo(GetSdrUndoFactory().CreateUndoDeletePage(*pMaster, bSoleOwnerOfStyleSheet)); + + RemoveMasterPage( pMaster->GetPageNum() ); + +-- +2.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 8ac4530..1102ae5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -243,6 +243,7 @@ Patch12: 0001-Related-rhbz-1351369-gtk3-clipboards-have-to-live-to.patch Patch13: 0001-add-xdg-email-as-the-default-email-route.patch Patch14: 0001-Resolves-rhbz-1373933-gtk-3.21-emits-a-lot-more-styl.patch Patch15: 0001-Related-rhbz-1373933-gtk3-emits-a-lot-of-style-updat.patch +Patch16: 0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch %if 0%{?rhel} # not upstreamed @@ -2298,6 +2299,10 @@ done %endif %changelog +* Mon Sep 19 2016 Caolán McNamara - 1:5.2.2.1-3 +- Related: rhbz#1373933 do less on style-updated +- Related: rhbz#1353069 don't clear XATTR_FILL from in use styles + * Fri Sep 16 2016 Caolán McNamara - 1:5.2.2.1-2 - Resolves: rhbz#1373933 gtk 3.21 emits way too many "style-set" signals