1 files changed, 27 insertions, 22 deletions

diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 1d3593e2e91a..d5aec6713fe5 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -19,47 +19,52 @@
 #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
 #define INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
 
-#include <vcl/field.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/group.hxx>
-
+#include <vcl/weld.hxx>
 #include <envlop.hxx>
 
 class SwTextFormatColl;
 
 class SwEnvFormatPage : public SfxTabPage
 {
-    VclPtr<MetricField>  m_pAddrLeftField;
-    VclPtr<MetricField>  m_pAddrTopField;
-    VclPtr<MenuButton>   m_pAddrEditButton;
-    VclPtr<MetricField>  m_pSendLeftField;
-    VclPtr<MetricField>  m_pSendTopField;
-    VclPtr<MenuButton>   m_pSendEditButton;
-    VclPtr<ListBox>      m_pSizeFormatBox;
-    VclPtr<MetricField>  m_pSizeWidthField;
-    VclPtr<MetricField>  m_pSizeHeightField;
-    VclPtr<SwEnvPreview> m_pPreview;
+    VclPtr<SwEnvDlg> m_pDialog;
+    std::vector<sal_uInt16>  m_aIDs;
 
-    std::vector<sal_uInt16>  aIDs;
+    std::unique_ptr<weld::MetricSpinButton>  m_xAddrLeftField;
+    std::unique_ptr<weld::MetricSpinButton>  m_xAddrTopField;
+    std::unique_ptr<weld::MenuButton> m_xAddrEditButton;
+    std::unique_ptr<weld::MetricSpinButton>  m_xSendLeftField;
+    std::unique_ptr<weld::MetricSpinButton>  m_xSendTopField;
+    std::unique_ptr<weld::MenuButton> m_xSendEditButton;
+    std::unique_ptr<weld::ComboBoxText> m_xSizeFormatBox;
+    std::unique_ptr<weld::MetricSpinButton>  m_xSizeWidthField;
+    std::unique_ptr<weld::MetricSpinButton>  m_xSizeHeightField;
+    std::unique_ptr<SwEnvPreview> m_xPreview;
 
-    DECL_LINK( ModifyHdl, SpinField&, void );
-    DECL_LINK( LoseFocusHdl, Control&, void );
-    DECL_LINK( EditHdl, MenuButton *, void );
-    DECL_LINK(FormatHdl, ListBox&, void);
+    DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
+    DECL_LINK(AddrEditHdl, const OString&, void);
+    DECL_LINK(SendEditHdl, const OString&, void);
+    DECL_LINK(FormatHdl, weld::ComboBoxText&, void);
 
     void SetMinMax();
 
     SfxItemSet  *GetCollItemSet(SwTextFormatColl const * pColl, bool bSender);
 
-    SwEnvDlg    *GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetParentDialog());}
+    void Edit(const OString& rIdent, bool bSender);
+
+    SwEnvDlg    *GetParentSwEnvDlg() { return m_pDialog; }
 
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
 public:
-    SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet);
+    SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet);
+    void Init(SwEnvDlg* pDialog);
+    virtual void dispose() override
+    {
+        m_pDialog.clear();
+        SfxTabPage::dispose();
+    }
     virtual ~SwEnvFormatPage() override;
-    virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);