summaryrefslogtreecommitdiff
path: root/sw/source/ui/fmtui
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-07-06 01:42:20 -0800
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-11-05 08:45:18 +0100
commit0dfb0f09f5582a33d16c5ad8659fab198d530b31 (patch)
tree8a651f0a9ad81004d85626b88c13d43e2c49aad9 /sw/source/ui/fmtui
parentd9013f6a3961c8651ca3d024acef67428884726e (diff)
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 <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/source/ui/fmtui')
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index c9370c1e5e9e..43a520866966 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -129,9 +129,9 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");
m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ));
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!");
- m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+ m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
SAL_WARN_IF(!pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageCreatorFunc fail!");
SAL_WARN_IF(!pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "sw.ui", "GetTabPageRangesFunc fail!");
@@ -177,9 +177,9 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");
m_nAsianLayoutId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
- OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+ OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!");
- m_nBackgroundId = AddTabPage("highlighting", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
+ m_nBackgroundId = AddTabPage("highlighting", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ));
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");