diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-12-04 19:58:13 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-12-04 19:58:13 +0100 |
| commit | 0c84aea5c09c08c45a7e7a8ae07d73dd75608463 (patch) | |
| tree | a5883201aa7dfac7af23a05ef8bb9cfd48323db5 | |
| parent | f84accc996d718596277c079fa1afb588f2efee5 (diff) | |
Add widget variables, related get/dispose callsprivate/bubli/textboxchaining
+ mnemonic widgets
Change-Id: I1cfc4c096ea65db8d1b650225106db477b19cf4a
| -rw-r--r-- | cui/source/inc/textchaining.hxx | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/textchaining.cxx | 7 | ||||
| -rw-r--r-- | cui/uiconfig/ui/textchainingtabpage.ui | 8 |
3 files changed, 18 insertions, 3 deletions
diff --git a/cui/source/inc/textchaining.hxx b/cui/source/inc/textchaining.hxx index 86e73a36f924..6f8f66ca52e1 100644 --- a/cui/source/inc/textchaining.hxx +++ b/cui/source/inc/textchaining.hxx @@ -3,6 +3,8 @@ #include <sfx2/tabdlg.hxx> #include <svx/svdattr.hxx> +#include <vcl/lstbox.hxx> +#include <vcl/layout.hxx> class SdrView; @@ -11,6 +13,10 @@ class SvxTextChainingPage : public SfxTabPage private: static const sal_uInt16 pRanges[]; + VclPtr<VclGrid> mpBoxLinks; + VclPtr<ListBox> mpLBPrevLink; + VclPtr<ListBox> mpLBNextLink; + public: SvxTextChainingPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextChainingPage(); diff --git a/cui/source/tabpages/textchaining.cxx b/cui/source/tabpages/textchaining.cxx index c857178e6ddb..cffa7ebd7ca3 100644 --- a/cui/source/tabpages/textchaining.cxx +++ b/cui/source/tabpages/textchaining.cxx @@ -12,7 +12,9 @@ const sal_uInt16 SvxTextChainingPage::pRanges[] = SvxTextChainingPage::SvxTextChainingPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow,"TextChainingPage","cui/ui/textchainingtabpage.ui", &rInAttrs) { - SfxItemPool* pPool = rInAttrs.GetPool(); + get(mpBoxLinks, "box_textlink"); + get(mpLBPrevLink,"previouslink"); + get(mpLBNextLink, "nextlink"); } SvxTextChainingPage::~SvxTextChainingPage() @@ -22,6 +24,9 @@ SvxTextChainingPage::~SvxTextChainingPage() void SvxTextChainingPage::dispose() { + mpLBPrevLink.dispose(); + mpLBNextLInk.dispose(); + mpBoxLinks.dispose(); } void SvxTextChainingPage::Reset( const SfxItemSet* rAttrs ) diff --git a/cui/uiconfig/ui/textchainingtabpage.ui b/cui/uiconfig/ui/textchainingtabpage.ui index f5cb4f2dfdb7..2cdb163e0172 100644 --- a/cui/uiconfig/ui/textchainingtabpage.ui +++ b/cui/uiconfig/ui/textchainingtabpage.ui @@ -33,6 +33,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Previous link:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">previouslink</property> </object> <packing> <property name="left_attach">0</property> @@ -44,6 +46,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Next link:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nextlink</property> </object> <packing> <property name="left_attach">0</property> @@ -51,7 +55,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="combobox1"> + <object class="GtkComboBox" id="previouslink"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -61,7 +65,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="combobox2"> + <object class="GtkComboBox" id="nextlink"> <property name="visible">True</property> <property name="can_focus">False</property> </object> |