summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-11 12:31:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-08-13 15:42:23 +0200
commitc2c3d86770efc1e39860441d625fcb3b4be7c58e (patch)
treebab76eda206773ac2beb935b53c941c5fadae16a /sd
parent6284804c2ccb3ad8bb6e1c1dac8d622f66b8c07d (diff)
add char highlighting (background) tab to graphics styles dialog
Change-Id: I2cf3872116ae59051847d73612a2f4f8385d34d8 Reviewed-on: https://gerrit.libreoffice.org/41030 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx7
-rw-r--r--sd/source/ui/inc/tabtempl.hxx1
-rw-r--r--sd/uiconfig/simpress/ui/templatedialog.ui14
3 files changed, 22 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index afe136f5c17e..1a060d252055 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -70,6 +70,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
, m_nTransparencyId(0)
, m_nFontId(0)
, m_nFontEffectId(0)
+ , m_nBackgroundId(0)
, m_nTextId(0)
, m_nDimensionId(0)
, m_nConnectorId(0)
@@ -82,6 +83,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
m_nTransparencyId = AddTabPage("transparency", RID_SVXPAGE_TRANSPARENCE);
m_nFontId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
m_nFontEffectId = AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS);
+ m_nBackgroundId = AddTabPage("background", RID_SVXPAGE_BACKGROUND);
AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH);
m_nTextId = AddTabPage("text", RID_SVXPAGE_TEXTATTR);
AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION);
@@ -144,6 +146,11 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
rPage.PageCreated(aSet);
}
+ else if (nId == m_nBackgroundId)
+ {
+ aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR)));
+ rPage.PageCreated(aSet);
+ }
else if (nId == m_nTextId)
{
rPage.PageCreated(aSet);
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index 72cd73456bd7..3bd765e64a69 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -49,6 +49,7 @@ private:
sal_uInt16 m_nTransparencyId;
sal_uInt16 m_nFontId;
sal_uInt16 m_nFontEffectId;
+ sal_uInt16 m_nBackgroundId;
sal_uInt16 m_nTextId;
sal_uInt16 m_nDimensionId;
sal_uInt16 m_nConnectorId;
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui
index 550c0042ff90..ddb067bff3de 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -204,6 +204,20 @@
<placeholder/>
</child>
<child type="tab">
+ <object class="GtkLabel" id="background">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="templatedialog|background">Highlighting</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
<object class="GtkLabel" id="indents">
<property name="visible">True</property>
<property name="can_focus">False</property>