diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-06-16 21:43:56 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-06-16 23:08:36 +0000 |
| commit | 94e9ad75943c39af548fc4b094c1e67df900e8a1 (patch) | |
| tree | f17f025b1f65fcbb0f92a29c41f05b439c21330a /reportdesign | |
| parent | ab6be8b2b01f9657f105d5ec9b027c9fa99d4325 (diff) | |
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
(cherry picked from commit 3588a04f438b001cb64aa1fd86b28869f2c4e70b)
Options: Background -> Highlighting
(cherry picked from commit b47151f5d1e287425511b45c5474e10eb0ba3a9d)
Search By Format: Background -> Highlighting
(cherry picked from commit 16d202f29cafbdc8d0648b830d2209f5c61c878f)
Make this string localizable
(cherry picked from commit a676ad5ec8348a6c8074e3a8d42590e8fd189cf5)
Change-Id: Ifa48799bb9e415d17f4e323008fac57270bae34b
Reviewed-on: https://gerrit.libreoffice.org/16322
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/dlgpage.cxx | 12 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/dlgpage.hxx | 3 | ||||
| -rw-r--r-- | reportdesign/uiconfig/dbreport/ui/chardialog.ui | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index e4e76283ca55..3e8ff6627859 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -60,7 +60,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 ); AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); + m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); } else @@ -71,6 +71,16 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c RemoveTabPage("asianlayout"); } +void ORptPageDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +{ + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); + if (nId == m_nCharBgdId) + { + aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); + rPage.PageCreated(aSet); + } +} + } // namespace rptui diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 5085aabc4dc1..1b577a482569 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -33,9 +33,12 @@ class ORptPageDialog : public SfxTabDialog private: ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION; void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION; + + sal_uInt16 m_nCharBgdId; public: ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; }; } // namespace rptui diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index a9a8b5e5ca29..47491da9b178 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -151,7 +151,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">4</property> |