1 files changed, 10 insertions, 14 deletions
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index cc2e77a1e9ec..fdb099cc24e6 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -29,7 +29,7 @@ class SwLabPrtPage;
 class SwDBManager;
 class Printer;
 
-class SwLabDlg : public SfxTabDialog
+class SwLabDlg : public SfxTabDialogController
 {
     SwLabelConfig   aLabelsCfg;
     SwDBManager*     pDBManager;
@@ -42,17 +42,14 @@ class SwLabDlg : public SfxTabDialog
     OUString   aLstGroup;
     OUString   m_sBusinessCardDlg;
     bool       m_bLabel;
-    sal_uInt16 m_nOptionsId;
-    sal_uInt16 m_nLabelId;
     void          ReplaceGroup_( const OUString &rMake );
 
-    virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
+    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
 public:
 
-     SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet,
-                 SwDBManager* pDBManager, bool bLabel);
+    SwLabDlg(weld::Window* pParent, const SfxItemSet& rSet,
+             SwDBManager* pDBManager, bool bLabel);
     virtual ~SwLabDlg() override;
-    virtual void dispose() override;
 
     SwLabRec*   GetRecord(const OUString &rRecName, bool bCont);
     void        GetLabItem(SwLabItem &rItem);
@@ -67,7 +64,12 @@ public:
     const std::vector<OUString> &Makes() const { return aMakes; }
 
     Printer *GetPrt();
-    inline void ReplaceGroup( const OUString &rMake );
+    void ReplaceGroup( const OUString &rMake )
+    {
+        if ( rMake != aLstGroup )
+            ReplaceGroup_( rMake );
+    }
+
     void UpdateGroup( const OUString &rMake ) {ReplaceGroup_( rMake );}
     static void UpdateFieldInformation(css::uno::Reference< css::frame::XModel> const & xModel,
                                        const SwLabItem& rItem);
@@ -77,12 +79,6 @@ public:
 
 };
 
-inline void SwLabDlg::ReplaceGroup( const OUString &rMake )
-{
-    if ( rMake != aLstGroup )
-        ReplaceGroup_( rMake );
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */