From 0c84aea5c09c08c45a7e7a8ae07d73dd75608463 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Fri, 4 Dec 2015 19:58:13 +0100 Subject: Add widget variables, related get/dispose calls + mnemonic widgets Change-Id: I1cfc4c096ea65db8d1b650225106db477b19cf4a --- cui/source/inc/textchaining.hxx | 6 ++++++ cui/source/tabpages/textchaining.cxx | 7 ++++++- 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 #include +#include +#include class SdrView; @@ -11,6 +13,10 @@ class SvxTextChainingPage : public SfxTabPage private: static const sal_uInt16 pRanges[]; + VclPtr mpBoxLinks; + VclPtr mpLBPrevLink; + VclPtr 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 @@ True False Previous link: + True + previouslink 0 @@ -44,6 +46,8 @@ True False Next link: + True + nextlink 0 @@ -51,7 +55,7 @@ - + True False @@ -61,7 +65,7 @@ - + True False -- cgit v1.2.3