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 /reportdesign | |
| parent | 63ca46a0dc064de0bba52224449effeec3e90efc (diff) | |
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
Change-Id: Ie81d25651e5998a35b4e2646089b8f2c590cfb98
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> |