diff options
author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-16 22:22:42 +0200 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-16 22:25:38 +0200 |
commit | 9874db206eed84616e4e232b1b56c7b7532166a0 (patch) | |
tree | b1fcec00c94f19aa3c8650649bbc29e8118468d5 | |
parent | e06905df15ff03c6d3c84f61bd67860a91416c2d (diff) |
tdf#90072: No character background (highlight) tab in paragraph styles dialog
Background Tab was replaced with Area Tab on Paragraph Style
Dialog. With that we lost the opportunity to set character background
color. So bring back the Background tab as Highlighting.
Change-Id: I29925f72816fbd27243060231d551e6590f1b9d9
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 8 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/templatedialog2.ui | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index e29858a40d71..738eee2090fc 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -187,6 +187,10 @@ 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->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!"); + m_nBackgroundId = AddTabPage("highlighting", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND )); + OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!"); OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!"); m_nTabId = AddTabPage("tabs", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) ); @@ -467,9 +471,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) else if (nId == m_nBackgroundId) { SvxBackgroundTabFlags nFlagType = SvxBackgroundTabFlags::NONE; - if( SFX_STYLE_FAMILY_CHAR != nType ) - nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR; - if( SFX_STYLE_FAMILY_CHAR == nType ) + if( SFX_STYLE_FAMILY_CHAR == nType || SFX_STYLE_FAMILY_PARA == nType ) nFlagType |= SvxBackgroundTabFlags::SHOW_HIGHLIGHTING; aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType))); rPage.PageCreated(aSet); diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui index 6b9f61be9b98..017cbd3db74b 100644 --- a/sw/uiconfig/swriter/ui/templatedialog2.ui +++ b/sw/uiconfig/swriter/ui/templatedialog2.ui @@ -249,6 +249,19 @@ <placeholder/> </child> <child type="tab"> + <object class="GtkLabel" id="highlighting"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Highlighting</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child type="tab"> <object class="GtkLabel" id="outline"> <property name="visible">True</property> <property name="can_focus">False</property> |