diff options
| author | Susobhan Ghosh <susobhang70@gmail.com> | 2016-08-18 18:51:58 +0530 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-08-29 13:18:12 +0000 |
| commit | 8393d4642273bfb3eb0cd0b68157e2b8674b70df (patch) | |
| tree | e896339cebf19b6479e58d58cced7739cb87889b /sw | |
| parent | 4ef79854ea1219186296480d69fb10b05d1810c3 (diff) | |
tdf#83830: Use samecontentlistbox in Header/Footer Panel
Change-Id: Ib24f6e6ac91859467f105c4db9b094454443ff9d
Reviewed-on: https://gerrit.libreoffice.org/28218
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/sidebar/PageFooterPanel.hxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageHeaderPanel.hxx | 3 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/pagefooterpanel.ui | 11 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/pageheaderpanel.ui | 11 |
4 files changed, 6 insertions, 22 deletions
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index 10d645955bf5..adc647951f9c 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -44,6 +44,7 @@ #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <svx/spacinglistbox.hxx> +#include <svx/samecontentlistbox.hxx> namespace sw { namespace sidebar { @@ -83,7 +84,7 @@ private: VclPtr<CheckBox> mpFooterToggle; VclPtr<SpacingListBox> mpFooterSpacingLB; VclPtr<SpacingListBox> mpFooterMarginPresetLB; - VclPtr<ListBox> mpFooterLayoutLB; + VclPtr<SameContentListBox> mpFooterLayoutLB; VclPtr<FixedText> mpCustomEntry; OUString aCustomEntry; diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index 2cfde07ceb20..754fbc41bfdb 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -44,6 +44,7 @@ #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <svx/spacinglistbox.hxx> +#include <svx/samecontentlistbox.hxx> namespace sw { namespace sidebar { @@ -83,7 +84,7 @@ private: VclPtr<CheckBox> mpHeaderToggle; VclPtr<SpacingListBox> mpHeaderSpacingLB; VclPtr<SpacingListBox> mpHeaderMarginPresetLB; - VclPtr<ListBox> mpHeaderLayoutLB; + VclPtr<SameContentListBox> mpHeaderLayoutLB; VclPtr<FixedText> mpCustomEntry; OUString aCustomEntry; diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui index 0297daf05786..dc0d3e745297 100644 --- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui +++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui @@ -93,7 +93,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="model">spacinglist</property> </object> <packing> <property name="left_attach">1</property> @@ -105,7 +104,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="model">spacinglist</property> </object> <packing> <property name="left_attach">1</property> @@ -113,17 +111,10 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="samecontentLB"> - <property name="width_request">150</property> + <object class="svxcorelo-SameContentListBox" id="samecontentLB"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <items> - <item translatable="yes">All Pages</item> - <item translatable="yes">First Page</item> - <item translatable="yes">Left and Right Pages</item> - <item translatable="yes">First, Left and Right Pages</item> - </items> </object> <packing> <property name="left_attach">1</property> diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui index ae0de2874b83..d3a63d03e35b 100644 --- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui +++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui @@ -93,7 +93,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="model">spacinglist</property> </object> <packing> <property name="left_attach">1</property> @@ -105,7 +104,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="model">spacinglist</property> </object> <packing> <property name="left_attach">1</property> @@ -113,17 +111,10 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="samecontentLB"> - <property name="width_request">150</property> + <object class="svxcorelo-SameContentListBox" id="samecontentLB"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <items> - <item translatable="yes">All Pages</item> - <item translatable="yes">First Page</item> - <item translatable="yes">Left and Right Pages</item> - <item translatable="yes">First, Left and Right Pages</item> - </items> </object> <packing> <property name="left_attach">1</property> |