diff options
Diffstat (limited to 'sw/source/uibase/inc/swuiccoll.hxx')
| -rw-r--r-- | sw/source/uibase/inc/swuiccoll.hxx | 43 |
1 files changed, 19 insertions, 24 deletions
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; } |