weld ScZTestDialog

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

sc/source/ui/StatisticsDialogs/ZTestDialog.cxx

@@ -18,20 +18,20 @@
 
 ScZTestDialog::ScZTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    vcl::Window* pParent, ScViewData* pViewData ) :
-    ScStatisticsTwoVariableDialog(
+                    weld::Window* pParent, ScViewData* pViewData ) :
+    ScStatisticsTwoVariableDialogController(
             pSfxBindings, pChildWindow, pParent, pViewData,
-            "ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
+            "modules/scalc/ui/ztestdialog.ui", "ZTestDialog")
 {
-    SetText(ScResId(STR_ZTEST));
+    m_xDialog->set_title(ScResId(STR_ZTEST));
 }
 
 ScZTestDialog::~ScZTestDialog()
 {}
 
-bool ScZTestDialog::Close()
+void ScZTestDialog::Close()
 {
-    return DoClose( ScZTestDialogWrapper::GetChildWindowId() );
+    DoClose( ScZTestDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScZTestDialog::GetUndoNameId()

sc/source/ui/inc/ZTestDialog.hxx

@@ -13,16 +13,16 @@
 
 #include "StatisticsTwoVariableDialog.hxx"
 
-class ScZTestDialog : public ScStatisticsTwoVariableDialog
+class ScZTestDialog : public ScStatisticsTwoVariableDialogController
 {
 public:
     ScZTestDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
-        vcl::Window* pParent, ScViewData* pViewData );
+        weld::Window* pParent, ScViewData* pViewData );
 
     virtual ~ScZTestDialog() override;
 
-    virtual bool Close() override;
+    virtual void Close() override;
 
 protected:
     virtual const char* GetUndoNameId() override;

sc/source/ui/inc/reffact.hxx

@@ -128,7 +128,7 @@ private:
 };
 
 class ScZTestDialogWrapper :
-    public ChildWindowWrapper<SID_ZTEST_DIALOG>
+    public ChildControllerWrapper<SID_ZTEST_DIALOG>
 {
 private:
     ScZTestDialogWrapper() = delete;

sc/source/ui/view/tabvwshc.cxx

@@ -330,12 +330,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
         }
         break;
 
-        case SID_ZTEST_DIALOG:
-        {
-            pResult = VclPtr<ScZTestDialog>::Create( pB, pCW, pParent, &GetViewData() );
-        }
-        break;
-
         case SID_CHI_SQUARE_TEST_DIALOG:
         {
             pResult = VclPtr<ScChiSquareTestDialog>::Create( pB, pCW, pParent, &GetViewData() );
@@ -529,6 +523,11 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
             xResult.reset(new ScTTestDialog(pB, pCW, pParent, &GetViewData()));
         }
         break;
+        case SID_ZTEST_DIALOG:
+        {
+            xResult.reset(new ScZTestDialog(pB, pCW, pParent, &GetViewData()));
+        }
+        break;
     }
 
     if (xResult)

solenv/sanitizers/ui/modules/scalc.suppr

@@ -253,3 +253,6 @@ sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='sourcefile'] orphan-labe
 sc/uiconfig/scalc/ui/xmlsourcedialog.ui://vcllo-SvTreeListBox[@id='tree:border'] no-labelled-by
 sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='label5'] orphan-label
 sc/uiconfig/scalc/ui/xmlsourcedialog.ui://foruilo-RefEdit[@id='edit'] no-labelled-by
+sc/uiconfig/scalc/ui/ztestdialog.ui://GtkButton[@id='variable1-range-button'] button-no-label
+sc/uiconfig/scalc/ui/ztestdialog.ui://GtkButton[@id='variable2-range-button'] button-no-label
+sc/uiconfig/scalc/ui/ztestdialog.ui://GtkButton[@id='output-range-button'] button-no-label