diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 21:37:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-21 22:08:04 +0100 |
| commit | 47897fdd936d9b6e9ac8cb6110c79352ab080df7 (patch) | |
| tree | c657b53080caa94590d1e9b1fd4383d6dc795728 /sw/source/uibase | |
| parent | cfa76f538a44d4396574ece59e8a3953c22c6eb7 (diff) | |
weld SwCondCollPage
and put back original SvTreeListBox a11y factory use
Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/glosbib.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/swuiccoll.hxx | 43 |
2 files changed, 20 insertions, 25 deletions
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 216bae4d6c45..12b9ca217148 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -24,7 +24,7 @@ #include <svx/stddlg.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index e355c321cd5f..f8e2449c2577 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -20,26 +20,13 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX #include <sfx2/tabdlg.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> class SwWrtShell; class SwFormat; class SwCondCollPage : public SfxTabPage { - VclPtr<CheckBox> m_pConditionCB; - - VclPtr<FixedText> m_pContextFT; - VclPtr<FixedText> m_pUsedFT; - VclPtr<SvTabListBox> m_pTbLinks; - - VclPtr<FixedText> m_pStyleFT; - VclPtr<ListBox> m_pStyleLB; - VclPtr<ListBox> m_pFilterLB; - - VclPtr<PushButton> m_pRemovePB; - VclPtr<PushButton> m_pAssignPB; - std::vector<OUString> m_aStrArr; SwWrtShell &m_rSh; @@ -48,19 +35,27 @@ class SwCondCollPage : public SfxTabPage bool m_bNewTemplate; + std::unique_ptr<weld::CheckButton> m_xConditionCB; + std::unique_ptr<weld::Label> m_xContextFT; + std::unique_ptr<weld::Label> m_xUsedFT; + std::unique_ptr<weld::TreeView> m_xTbLinks; + std::unique_ptr<weld::Label> m_xStyleFT; + std::unique_ptr<weld::TreeView> m_xStyleLB; + std::unique_ptr<weld::ComboBox> m_xFilterLB; + std::unique_ptr<weld::Button> m_xRemovePB; + std::unique_ptr<weld::Button> m_xAssignPB; + virtual ~SwCondCollPage() override; - virtual void dispose() override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK( OnOffHdl, Button*, void ); - DECL_LINK( AssignRemoveHdl, ListBox&, void); - DECL_LINK( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); - DECL_LINK( AssignRemoveClickHdl, Button*, void); - DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK( SelectListBoxHdl, ListBox&, void ); - void AssignRemove(void const *); - void SelectHdl(void const *); + DECL_LINK(OnOffHdl, weld::ToggleButton&, void); + DECL_LINK(AssignRemoveTreeListBoxHdl, weld::TreeView&, void); + DECL_LINK(AssignRemoveClickHdl, weld::Button&, void); + DECL_LINK(SelectTreeListBoxHdl, weld::TreeView&, void); + DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void); + void AssignRemove(const weld::Widget*); + void SelectHdl(const weld::Widget*); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -68,7 +63,7 @@ class SwCondCollPage : public SfxTabPage static const sal_uInt16 m_aPageRg[]; public: - SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); + SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet); static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } |