From 0dfb0f09f5582a33d16c5ad8659fab198d530b31 Mon Sep 17 00:00:00 2001 From: Jim Raykowski Date: Fri, 6 Jul 2018 01:42:20 -0800 Subject: tdf#105225 new background tab page This patch allows the new background/highlighting tab page and derived from area tab page to work correctly in the same tab dialog. It also provides a cleaner way to use the new background tab page by setting brush item as fill attributes to target set in the background tab page created method. Previously if the new background tab page and the area tab page were used in the same tab page dialog one would affect the other due to the same use of pool fill items. This patch makes a local copy of the attribute item set passed and then passes that set along to the parent class area tab page on each activation/deactivation. Tab page dialogs that use both the background and area tab pages are: Writer Paragraph Styles, Impress Presentations Styles and Drawing/ Graphics Styles, and Draw Drawing/Graphics Styles. All new background tab page merged patches have been reworked in this patch and remaining old background tab pages, with the exception of Report Design, have been replaced by the new tab page. Change-Id: I47f9ae10a0fd967729ff6e83c1a312aa49e1d13c Reviewed-on: https://gerrit.libreoffice.org/57102 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- sd/source/ui/func/fuchar.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 4ad60edfdfa9..1e00b5803ac6 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -68,7 +68,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); - SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items{}); + SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items{}); aNewAttr.Put( aEditAttr, false ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); -- cgit