weld ScChiSquareTestDialog

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

sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx

@@ -16,20 +16,20 @@
 
 ScChiSquareTestDialog::ScChiSquareTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    vcl::Window* pParent, ScViewData* pViewData ) :
-    ScStatisticsInputOutputDialog(
+                    weld::Window* pParent, ScViewData* pViewData ) :
+    ScStatisticsInputOutputDialogController(
             pSfxBindings, pChildWindow, pParent, pViewData,
-            "ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" )
+            "modules/scalc/ui/chisquaretestdialog.ui", "ChiSquareTestDialog")
 {
-    SetText(ScResId(STR_CHI_SQUARE_TEST));
+    m_xDialog->set_title(ScResId(STR_CHI_SQUARE_TEST));
 }
 
 ScChiSquareTestDialog::~ScChiSquareTestDialog()
 {}
 
-bool ScChiSquareTestDialog::Close()
+void ScChiSquareTestDialog::Close()
 {
-    return DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
+    DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
 }
 
 const char* ScChiSquareTestDialog::GetUndoNameId()

sc/source/ui/inc/ChiSquareTestDialog.hxx

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

sc/source/ui/inc/reffact.hxx

@@ -135,7 +135,7 @@ private:
 };
 
 class ScChiSquareTestDialogWrapper :
-    public ChildWindowWrapper<SID_CHI_SQUARE_TEST_DIALOG>
+    public ChildControllerWrapper<SID_CHI_SQUARE_TEST_DIALOG>
 {
 private:
     ScChiSquareTestDialogWrapper() = delete;

sc/source/ui/view/tabvwshc.cxx

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

solenv/sanitizers/ui/modules/scalc.suppr

@@ -6,6 +6,8 @@ sc/uiconfig/scalc/ui/analysisofvariancedialog.ui://GtkButton[@id='input-range-bu
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/cellprotectionpage.ui://GtkLabel[@id='label1'] orphan-label
 sc/uiconfig/scalc/ui/cellprotectionpage.ui://GtkLabel[@id='label4'] orphan-label
+sc/uiconfig/scalc/ui/chisquaretestdialog.ui://GtkButton[@id='input-range-button'] button-no-label
+sc/uiconfig/scalc/ui/chisquaretestdialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/conditionalentry.ui://GtkLabel[@id='number'] orphan-label
 sc/uiconfig/scalc/ui/conditionalentry.ui://GtkLabel[@id='condition'] orphan-label
 sc/uiconfig/scalc/ui/conditionalentry.ui://GtkComboBoxText[@id='type'] no-labelled-by