weld ScCovarianceDialog

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

sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx

@@ -15,10 +15,10 @@
 
 ScCovarianceDialog::ScCovarianceDialog(
                         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                        vcl::Window* pParent, ScViewData* pViewData ) :
-    ScMatrixComparisonGenerator(
+                        weld::Window* pParent, ScViewData* pViewData ) :
+    ScMatrixComparisonGeneratorController(
             pSfxBindings, pChildWindow, pParent, pViewData,
-            "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" )
+            "modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
 {}
 
 const char* ScCovarianceDialog::GetUndoNameId()
@@ -26,9 +26,9 @@ const char* ScCovarianceDialog::GetUndoNameId()
     return STR_COVARIANCE_UNDO_NAME;
 }
 
-bool ScCovarianceDialog::Close()
+void ScCovarianceDialog::Close()
 {
-    return DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
+    DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
 }
 
 const OUString ScCovarianceDialog::getLabel()

sc/source/ui/inc/CovarianceDialog.hxx

@@ -13,14 +13,14 @@
 
 #include "MatrixComparisonGenerator.hxx"
 
-class ScCovarianceDialog : public ScMatrixComparisonGenerator
+class ScCovarianceDialog : public ScMatrixComparisonGeneratorController
 {
 public:
     ScCovarianceDialog(
         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-        vcl::Window* pParent, ScViewData* pViewData);
+        weld::Window* pParent, ScViewData* pViewData);
 
-    virtual bool Close() override;
+    virtual void Close() override;
 
 protected:
     virtual const OUString getLabel() override;

sc/source/ui/inc/reffact.hxx

@@ -86,7 +86,7 @@ private:
 };
 
 class ScCovarianceDialogWrapper :
-    public ChildWindowWrapper<SID_COVARIANCE_DIALOG>
+    public ChildControllerWrapper<SID_COVARIANCE_DIALOG>
 {
 private:
     ScCovarianceDialogWrapper() = delete;

sc/source/ui/view/tabvwshc.cxx

@@ -330,12 +330,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
         }
         break;
 
-        case SID_COVARIANCE_DIALOG:
-        {
-            pResult = VclPtr<ScCovarianceDialog>::Create( pB, pCW, pParent, &GetViewData() );
-        }
-        break;
-
         case SID_EXPONENTIAL_SMOOTHING_DIALOG:
         {
             pResult = VclPtr<ScExponentialSmoothingDialog>::Create( pB, pCW, pParent, &GetViewData() );
@@ -535,6 +529,11 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
             xResult.reset(new ScAnalysisOfVarianceDialog(pB, pCW, pParent, &GetViewData()));
         }
         break;
+        case SID_COVARIANCE_DIALOG:
+        {
+            xResult.reset(new ScCovarianceDialog(pB, pCW, pParent, &GetViewData()));
+        }
+        break;
     }
 
     if (xResult)

solenv/sanitizers/ui/modules/scalc.suppr

@@ -35,6 +35,8 @@ sc/uiconfig/scalc/ui/consolidatedialog.ui://foruilo-RefEdit[@id='eddataarea'] no
 sc/uiconfig/scalc/ui/consolidatedialog.ui://foruilo-RefEdit[@id='eddestarea'] no-labelled-by
 sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='input-range-button'] button-no-label
 sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='output-range-button'] button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='input-range-button'] button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label2'] orphan-label
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label3'] orphan-label
 sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label4'] orphan-label