weld ScDataProviderDlg

drop changing the button colors, every other button is content
not to change its color.

fix up some crashes while I'm here.

Change-Id: Icec54106441810a5152e7dab3ac7d5a55551ab07
Reviewed-on: https://gerrit.libreoffice.org/80994
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 31 insertions, 30 deletions

diff --git a/sc/source/ui/inc/dataproviderdlg.hxx b/sc/source/ui/inc/dataproviderdlg.hxx
index 441c4929abbb..2cc636973145 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -12,46 +12,48 @@
 
 #include <sal/config.h>
 
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/listctrl.hxx>
-#include <vcl/menu.hxx>
-
+#include <com/sun/star/awt/XWindow.hpp>
+#include <vcl/idle.hxx>
+#include <vcl/weld.hxx>
 #include "datatableview.hxx"
-
 #include <memory>
 
 class ScDocument;
 class ScDataProviderBaseControl;
+class ScDataTransformationBaseControl;
 class ScDBData;
 
-class ScDataProviderDlg : public ModalDialog
+class ScDataProviderDlg : public weld::GenericDialogController
 {
 private:
-
-    std::shared_ptr<ScDocument> mpDoc;
-    VclPtr<ScDataTableView> mpTable;
-    VclPtr<ListControl> mpList;
-    VclPtr<MenuBar> mpBar;
-    VclPtr<ScDataProviderBaseControl> mpDataProviderCtrl;
-    VclPtr<ListBox> mpDBRanges;
-    sal_uInt32 mpIndex;
+    std::shared_ptr<ScDocument> mxDoc;
+    std::unique_ptr<weld::Menu> mxStartMenu;
+    std::unique_ptr<weld::Menu> mxColumnMenu;
+    std::unique_ptr<weld::Container> mxBox;
+    css::uno::Reference<css::awt::XWindow> m_xTableParent;
+    VclPtr<ScDataTableView> mxTable;
+    std::unique_ptr<weld::ScrolledWindow> mxScroll;
+    std::unique_ptr<weld::Container> mxList;
+    std::unique_ptr<ScDataProviderBaseControl> mxDataProviderCtrl;
+    std::unique_ptr<weld::ComboBox> mxDBRanges;
+
+    std::vector<std::unique_ptr<ScDataTransformationBaseControl>> maControls;
+
+    Idle maIdle;
+
+    sal_uInt32 mnIndex;
     ScDBData* pDBData;
 
     void InitMenu();
 
-    DECL_LINK( StartMenuHdl, Menu*, bool );
-    DECL_LINK( ColumnMenuHdl, Menu*, bool );
-    DECL_LINK( ImportHdl, Window*, void );
+    DECL_LINK( StartMenuHdl, const OString&, void );
+    DECL_LINK( ColumnMenuHdl, const OString&, void );
+    DECL_LINK( ImportHdl, ScDataProviderBaseControl*, void );
+    DECL_LINK( ScrollToEnd, Timer*, void );
 
 public:
-
-    ScDataProviderDlg(vcl::Window* pWindow, std::shared_ptr<ScDocument> pDoc, const ScDocument* pDocument);
-
+    ScDataProviderDlg(weld::Window* pWindow, std::shared_ptr<ScDocument> pDoc, const ScDocument* pDocument);
     virtual ~ScDataProviderDlg() override;
-    virtual void dispose() override;
-
-    virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
 
     void applyAndQuit();
     void cancelAndQuit();
diff --git a/sc/source/ui/inc/datatableview.hxx b/sc/source/ui/inc/datatableview.hxx
index 30d9c0a17c23..690a088368f4 100644
--- a/sc/source/ui/inc/datatableview.hxx
+++ b/sc/source/ui/inc/datatableview.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_DATATABLEVIEW_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_DATATABLEVIEW_HXX
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/ctrl.hxx>
-
+#include <vcl/scrbar.hxx>
 #include <scdllapi.h>
 #include <types.hxx>
 #include "hdrcont.hxx"
@@ -81,6 +82,7 @@ class SC_DLLPUBLIC ScDataTableView : public Control
 {
     std::shared_ptr<ScDocument> mpDoc;
     std::unique_ptr<SelectionEngine> mpSelectionEngine;
+    VclPtr<ScrollBarBox> mpTopLeft;
     VclPtr<ScDataTableColView> mpColView;
     VclPtr<ScDataTableRowView> mpRowView;
     VclPtr<ScrollBar> mpVScroll;
@@ -93,12 +95,8 @@ class SC_DLLPUBLIC ScDataTableView : public Control
 
     DECL_LINK( ScrollHdl, ScrollBar*, void );
 
-protected:
-
-    virtual Size GetOptimalSize() const override;
-
 public:
-    ScDataTableView(vcl::Window* pParent);
+    ScDataTableView(const css::uno::Reference<css::awt::XWindow> &rParent);
 
     void Init(std::shared_ptr<ScDocument> pDoc);
 
@@ -110,6 +108,7 @@ public:
     virtual void MouseButtonUp(const MouseEvent& rMEvt) override;
     virtual void Resize() override;
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
+    virtual Size GetOptimalSize() const override;
 
     void getColRange(SCCOL& rStartCol, SCCOL& rEndCol) const;
     void getRowRange(SCROW& rStartRow, SCROW& rEndRow) const;