weld ScFTestDialog and ScTTestDialog

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

sc/source/ui/StatisticsDialogs/FTestDialog.cxx

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

sc/source/ui/StatisticsDialogs/TTestDialog.cxx

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

sc/source/ui/inc/FTestDialog.hxx

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

sc/source/ui/inc/TTestDialog.hxx

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

sc/source/ui/inc/reffact.hxx

@@ -114,14 +114,14 @@ private:
 };
 
 class ScTTestDialogWrapper :
-    public ChildWindowWrapper<SID_TTEST_DIALOG>
+    public ChildControllerWrapper<SID_TTEST_DIALOG>
 {
 private:
     ScTTestDialogWrapper() = delete;
 };
 
 class ScFTestDialogWrapper :
-    public ChildWindowWrapper<SID_FTEST_DIALOG>
+    public ChildControllerWrapper<SID_FTEST_DIALOG>
 {
 private:
     ScFTestDialogWrapper() = delete;

sc/source/ui/view/tabvwshc.cxx

@@ -330,18 +330,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
         }
         break;
 
-        case SID_TTEST_DIALOG:
-        {
-            pResult = VclPtr<ScTTestDialog>::Create( pB, pCW, pParent, &GetViewData() );
-        }
-        break;
-
-        case SID_FTEST_DIALOG:
-        {
-            pResult = VclPtr<ScFTestDialog>::Create( pB, pCW, pParent, &GetViewData() );
-        }
-        break;
-
         case SID_ZTEST_DIALOG:
         {
             pResult = VclPtr<ScZTestDialog>::Create( pB, pCW, pParent, &GetViewData() );
@@ -531,6 +519,16 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
             xResult.reset(new ScRegressionDialog(pB, pCW, pParent, &GetViewData()));
         }
         break;
+        case SID_FTEST_DIALOG:
+        {
+            xResult.reset(new ScFTestDialog(pB, pCW, pParent, &GetViewData()));
+        }
+        break;
+        case SID_TTEST_DIALOG:
+        {
+            xResult.reset(new ScTTestDialog(pB, pCW, pParent, &GetViewData()));
+        }
+        break;
     }
 
     if (xResult)

solenv/sanitizers/ui/modules/scalc.suppr

@@ -239,6 +239,9 @@ sc/uiconfig/scalc/ui/statisticsinfopage.ui://GtkLabel[@id='nopages'] orphan-labe
 sc/uiconfig/scalc/ui/statisticsinfopage.ui://GtkLabel[@id='nocells'] orphan-label
 sc/uiconfig/scalc/ui/statisticsinfopage.ui://GtkLabel[@id='nosheets'] orphan-label
 sc/uiconfig/scalc/ui/statisticsinfopage.ui://GtkLabel[@id='noformula'] orphan-label
+sc/uiconfig/scalc/ui/ttestdialog.ui://GtkButton[@id='variable1-range-button'] button-no-label
+sc/uiconfig/scalc/ui/ttestdialog.ui://GtkButton[@id='variable2-range-button'] button-no-label
+sc/uiconfig/scalc/ui/ttestdialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/textimportcsv.ui://sclo-ScCsvTableBox[@id='scrolledwindowcolumntype'] no-labelled-by
 sc/uiconfig/scalc/ui/textimportcsv.ui://GtkLabel[@id='textalttitle'] orphan-label
 sc/uiconfig/scalc/ui/texttransformationentry.ui:GtkGrid[@id='grid']/GtkBox/GtkLabel orphan-label