diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 18:50:01 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-14 18:50:01 +0200 |
| commit | 3588a04f438b001cb64aa1fd86b28869f2c4e70b (patch) | |
| tree | 841202b71953905130d499354b2b97cd9de577fe /sw | |
| parent | 63ca46a0dc064de0bba52224449effeec3e90efc (diff) | |
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
Change-Id: Ie81d25651e5998a35b4e2646089b8f2c590cfb98
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/characterproperties.ui | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/templatedialog1.ui | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 2483fda9b746..35ae0d0eaef5 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -125,6 +125,11 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER)); rPage.PageCreated(aSet); } + else if (nId == m_nCharBgdId) + { + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); + rPage.PageCreated(aSet); + } } SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index f8d6b724d6cf..468b9fec1f39 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -476,6 +476,8 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) nFlagType |= SvxBackgroundTabFlags::SHOW_PARACTL; if( SFX_STYLE_FAMILY_CHAR != nType ) nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR; + if( SFX_STYLE_FAMILY_CHAR == 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/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui index e8c74904bc12..0efad8cc3f91 100644 --- a/sw/uiconfig/swriter/ui/characterproperties.ui +++ b/sw/uiconfig/swriter/ui/characterproperties.ui @@ -166,7 +166,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">5</property> diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui index 6436282b7cbc..9b3da4119e22 100644 --- a/sw/uiconfig/swriter/ui/templatedialog1.ui +++ b/sw/uiconfig/swriter/ui/templatedialog1.ui @@ -196,7 +196,7 @@ <object class="GtkLabel" id="background"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes">Highlighting</property> </object> <packing> <property name="position">5</property> |