diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-09 15:20:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-09 19:56:59 +0200 |
| commit | c0266d67bbc79ba78cbd58f7051458253c8e5196 (patch) | |
| tree | 567169906c7861dcd5e050ccd15d706b0a1a679d /include | |
| parent | unused typedef (diff) | |
| download | core-c0266d67bbc79ba78cbd58f7051458253c8e5196.tar.gz core-c0266d67bbc79ba78cbd58f7051458253c8e5196.zip | |
weld SvxGridTabPage
Change-Id: I04c2ead288547ecd0fba22a7a95a2497ab8dc768
Reviewed-on: https://gerrit.libreoffice.org/60217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/optgrid.hxx | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index fc20989f7134..1e4f62c92c96 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -21,9 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svl/eitem.hxx> -#include <vcl/group.hxx> -#include <vcl/fixed.hxx> -#include <vcl/field.hxx> +#include <vcl/weld.hxx> #include <svx/svxdllapi.h> class SvxGridTabPage; @@ -92,11 +90,10 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); + SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxGridTabPage() override; - virtual void dispose() override; - static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ); + static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -105,38 +102,34 @@ public: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; private: - VclPtr<CheckBox> pCbxUseGridsnap; - VclPtr<CheckBox> pCbxGridVisible; - - VclPtr<MetricField> pMtrFldDrawX; - VclPtr<MetricField> pMtrFldDrawY; - - VclPtr<NumericField> pNumFldDivisionX; - VclPtr<NumericField> pNumFldDivisionY; + bool bAttrModified; - VclPtr<CheckBox> pCbxSynchronize; + std::unique_ptr<weld::CheckButton> m_xCbxUseGridsnap; + std::unique_ptr<weld::CheckButton> m_xCbxGridVisible; + std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDrawX; + std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDrawY; + std::unique_ptr<weld::SpinButton> m_xNumFldDivisionX; + std::unique_ptr<weld::SpinButton> m_xNumFldDivisionY; + std::unique_ptr<weld::CheckButton> m_xCbxSynchronize; protected: //these controls are used in draw and impress - VclPtr<VclContainer> pSnapFrames; - VclPtr<CheckBox> pCbxSnapHelplines; - VclPtr<CheckBox> pCbxSnapBorder; - VclPtr<CheckBox> pCbxSnapFrame; - VclPtr<CheckBox> pCbxSnapPoints; - VclPtr<MetricField> pMtrFldSnapArea; - - VclPtr<CheckBox> pCbxOrtho; - VclPtr<CheckBox> pCbxBigOrtho; - VclPtr<CheckBox> pCbxRotate; - VclPtr<MetricField> pMtrFldAngle; - VclPtr<MetricField> pMtrFldBezAngle; - + std::unique_ptr<weld::Widget> m_xSnapFrames; + std::unique_ptr<weld::CheckButton> m_xCbxSnapHelplines; + std::unique_ptr<weld::CheckButton> m_xCbxSnapBorder; + std::unique_ptr<weld::CheckButton> m_xCbxSnapFrame; + std::unique_ptr<weld::CheckButton> m_xCbxSnapPoints; + std::unique_ptr<weld::MetricSpinButton> m_xMtrFldSnapArea; + std::unique_ptr<weld::CheckButton> m_xCbxOrtho; + std::unique_ptr<weld::CheckButton> m_xCbxBigOrtho; + std::unique_ptr<weld::CheckButton> m_xCbxRotate; + std::unique_ptr<weld::MetricSpinButton> m_xMtrFldAngle; + std::unique_ptr<weld::MetricSpinButton> m_xMtrFldBezAngle; + + DECL_LINK(ClickRotateHdl_Impl, weld::ToggleButton&, void); private: - bool bAttrModified; - - DECL_LINK( ClickRotateHdl_Impl, Button*, void ); - DECL_LINK( ChangeDrawHdl_Impl, Edit&, void ); - DECL_LINK( ChangeGridsnapHdl_Impl, Button*, void ); - DECL_LINK( ChangeDivisionHdl_Impl, Edit&, void ); + DECL_LINK(ChangeDrawHdl_Impl, weld::MetricSpinButton&, void); + DECL_LINK(ChangeGridsnapHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeDivisionHdl_Impl, weld::SpinButton&, void); }; #endif |