weld ScExponentialSmoothingDialog

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

sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx

@@ -18,28 +18,22 @@
 
 ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    vcl::Window* pParent, ScViewData* pViewData ) :
-    ScStatisticsInputOutputDialog(
+                    weld::Window* pParent, ScViewData* pViewData )
+    : ScStatisticsInputOutputDialogController(
             pSfxBindings, pChildWindow, pParent, pViewData,
-            "ExponentialSmoothingDialog", "modules/scalc/ui/exponentialsmoothingdialog.ui" )
+            "modules/scalc/ui/exponentialsmoothingdialog.ui",
+            "ExponentialSmoothingDialog")
+    , mxSmoothingFactor(m_xBuilder->weld_spin_button("smoothing-factor-spin"))
 {
-    get(mpSmoothingFactor, "smoothing-factor-spin");
 }
 
 ScExponentialSmoothingDialog::~ScExponentialSmoothingDialog()
 {
-    disposeOnce();
 }
 
-void ScExponentialSmoothingDialog::dispose()
+void ScExponentialSmoothingDialog::Close()
 {
-    mpSmoothingFactor.clear();
-    ScStatisticsInputOutputDialog::dispose();
-}
-
-bool ScExponentialSmoothingDialog::Close()
-{
-    return DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
+    DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
 }
 
 const char* ScExponentialSmoothingDialog::GetUndoNameId()
@@ -54,7 +48,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
     FormulaTemplate aTemplate(mDocument);
 
     // Smoothing factor
-    double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0;
+    double aSmoothingFactor = mxSmoothingFactor->get_value() / 100.0;
 
     // Alpha
     output.writeBoldString(ScResId(STR_LABEL_ALPHA));

sc/source/ui/inc/ExponentialSmoothingDialog.hxx

@@ -16,20 +16,19 @@
 
 #include "StatisticsInputOutputDialog.hxx"
 
-class ScExponentialSmoothingDialog : public ScStatisticsInputOutputDialog
+class ScExponentialSmoothingDialog : public ScStatisticsInputOutputDialogController
 {
 private:
-    VclPtr<NumericField> mpSmoothingFactor;
+    std::unique_ptr<weld::SpinButton> mxSmoothingFactor;
 
 public:
     ScExponentialSmoothingDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
-        vcl::Window* pParent, ScViewData* pViewData );
+        weld::Window* pParent, ScViewData* pViewData );
 
     virtual ~ScExponentialSmoothingDialog() override;
-    virtual void dispose() override;
 
-    virtual bool Close() override;
+    virtual void Close() override;
 
 protected:
     virtual const char* GetUndoNameId() override;

sc/source/ui/inc/reffact.hxx

@@ -93,7 +93,7 @@ private:
 };
 
 class ScExponentialSmoothingDialogWrapper :
-    public ChildWindowWrapper<SID_EXPONENTIAL_SMOOTHING_DIALOG>
+    public ChildControllerWrapper<SID_EXPONENTIAL_SMOOTHING_DIALOG>
 {
 private:
     ScExponentialSmoothingDialogWrapper() = delete;

sc/source/ui/view/tabvwshc.cxx

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

solenv/sanitizers/ui/modules/scalc.suppr

@@ -74,6 +74,8 @@ sc/uiconfig/scalc/ui/deletecolumnentry.ui://GtkEntry[@id='ed_columns'] no-labell
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui://GtkButton[@id='input-range-button'] button-no-label
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
+sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui://GtkButton[@id='input-range-button'] button-no-label
+sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui://GtkButton[@id='output-range-button'] button-no-label
 sc/uiconfig/scalc/ui/externaldata.ui://GtkTreeView[@id='ranges'] no-labelled-by
 sc/uiconfig/scalc/ui/externaldata.ui://GtkTreeViewColumn[@id='treeviewcolumn1'] no-labelled-by
 sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label