From 2701708942061e05f5516f940f626e1a5a257226 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 2 Dec 2019 20:41:11 +0000
Subject: weld OGroupsSortingDialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I49f9cfb4df670c68d21082a81e1a0aad225cc408
Reviewed-on: https://gerrit.libreoffice.org/84279
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 reportdesign/source/ui/inc/GroupsSorting.hxx    | 62 ++++++++++++-------------
 reportdesign/source/ui/inc/ReportController.hxx |  2 +-
 2 files changed, 30 insertions(+), 34 deletions(-)

(limited to 'reportdesign/source/ui/inc')

diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 2c4be48ab602..17a6e517e824 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -19,14 +19,6 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_GROUPSSORTING_HXX
 
-#include <vcl/floatwin.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/field.hxx>
-#include <vcl/button.hxx>
-#include <vcl/toolbox.hxx>
 #include <com/sun/star/report/XGroups.hpp>
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -34,10 +26,13 @@
 #include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
+#include <vcl/weld.hxx>
 #include <osl/diagnose.h>
 
 #include <vector>
 
+class Control;
+
 namespace comphelper
 {
     class OPropertyChangeMultiplexer;
@@ -52,38 +47,40 @@ class OReportController;
 |*
 \************************************************************************/
 
-class OGroupsSortingDialog :    public FloatingWindow
-                           ,    public ::cppu::BaseMutex
-                           ,    public ::comphelper::OPropertyChangeListener
+class OGroupsSortingDialog : public weld::GenericDialogController
+                           , public ::cppu::BaseMutex
+                           , public ::comphelper::OPropertyChangeListener
 {
     friend class OFieldExpressionControl;
 
-    VclPtr<ToolBox>                                m_pToolBox;
-    sal_uInt16                              m_nMoveUpId;
-    sal_uInt16                              m_nMoveDownId;
-    sal_uInt16                              m_nDeleteId;
-
-    VclPtr<VclContainer>                           m_pProperties;
-    VclPtr<ListBox>                                m_pOrderLst;
-    VclPtr<ListBox>                                m_pHeaderLst;
-    VclPtr<ListBox>                                m_pFooterLst;
-    VclPtr<ListBox>                                m_pGroupOnLst;
-    VclPtr<NumericField>                           m_pGroupIntervalEd;
-    VclPtr<ListBox>                                m_pKeepTogetherLst;
-    VclPtr<FixedText>                              m_pHelpWindow;
-
-    VclPtr<OFieldExpressionControl>                m_pFieldExpression;
     ::rptui::OReportController*                    m_pController;
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                       m_pCurrentGroupListener;
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                       m_pReportListener;
     css::uno::Reference< css::report::XGroups>            m_xGroups;
     css::uno::Reference< css::container::XNameAccess >    m_xColumns;
     bool const                                            m_bReadOnly;
+
+    std::unique_ptr<weld::Toolbar>          m_xToolBox;
+    std::unique_ptr<weld::Widget>           m_xProperties;
+    std::unique_ptr<weld::ComboBox>         m_xOrderLst;
+    std::unique_ptr<weld::ComboBox>         m_xHeaderLst;
+    std::unique_ptr<weld::ComboBox>         m_xFooterLst;
+    std::unique_ptr<weld::ComboBox>         m_xGroupOnLst;
+    std::unique_ptr<weld::SpinButton>       m_xGroupIntervalEd;
+    std::unique_ptr<weld::ComboBox>         m_xKeepTogetherLst;
+    std::unique_ptr<weld::Label>            m_xHelpWindow;
+    std::unique_ptr<weld::Container>        m_xBox;
+    css::uno::Reference<css::awt::XWindow>  m_xTableCtrlParent;
+    VclPtr<OFieldExpressionControl>         m_xFieldExpression;
+
 private:
-    DECL_LINK( OnControlFocusLost, Control&, void );
+    DECL_LINK( OnWidgetFocusLost, weld::Widget&, void );
+    DECL_LINK( OnWidgetFocusGot, weld::Widget&, void );
+
     DECL_LINK( OnControlFocusGot, Control&, void );
-    DECL_LINK( LBChangeHdl, ListBox&, void );
-    DECL_LINK( OnFormatAction, ToolBox*, void );
+
+    DECL_LINK( LBChangeHdl, weld::ComboBox&, void );
+    DECL_LINK( OnFormatAction, const OString&, void );
 
     /** returns the groups
         @return the groups which now have to check which one changes
@@ -135,11 +132,10 @@ protected:
     // OPropertyChangeListener
     virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
 public:
-    OGroupsSortingDialog( vcl::Window* pParent
-                        ,bool _bReadOnly
-                        ,::rptui::OReportController* _pController);
+    OGroupsSortingDialog(weld::Window* pParent,
+                         bool _bReadOnly,
+                         ::rptui::OReportController* _pController);
     virtual ~OGroupsSortingDialog() override;
-    virtual void dispose() override;
 
     /* updates the current view
     */
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 9fc568604e16..94fa805740a0 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -89,7 +89,7 @@ namespace rptui
         TransferableDataHelper  m_aSystemClipboard;     // content of the clipboard
         rtl::Reference<TransferableClipboardListener>
                                 m_pClipboardNotifier;    /// notifier for changes in the clipboard
-        VclPtr<OGroupsSortingDialog>   m_pGroupsFloater;
+        std::shared_ptr<OGroupsSortingDialog> m_xGroupsFloater;
 
         rtl::Reference<OXReportControllerObserver> m_pReportControllerObserver;
 
-- 
cgit