2 files changed, 10 insertions, 11 deletions
diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index 0af68255b4b5..317f7d2e11fc 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -19,7 +19,7 @@
 class FormulaTemplate;
 class AddressWalkerWriter;
 
-class ScAnalysisOfVarianceDialog : public ScStatisticsInputOutputDialog
+class ScAnalysisOfVarianceDialog : public ScStatisticsInputOutputDialogController
 {
 private:
     enum AnovaFactor
@@ -28,16 +28,16 @@ private:
         TWO_FACTOR
     };
 
-    VclPtr<NumericField> mpAlphaField;
-    VclPtr<RadioButton>  mpSingleFactorRadio;
-    VclPtr<RadioButton>  mpTwoFactorRadio;
-    VclPtr<NumericField> mpRowsPerSampleField;
-
-    DECL_LINK(FactorChanged, RadioButton&, void);
+    DECL_LINK(FactorChanged, weld::ToggleButton&, void);
     void FactorChanged();
 
     AnovaFactor meFactor;
 
+    std::unique_ptr<weld::SpinButton> mxAlphaField;
+    std::unique_ptr<weld::RadioButton> mxSingleFactorRadio;
+    std::unique_ptr<weld::RadioButton> mxTwoFactorRadio;
+    std::unique_ptr<weld::SpinButton> mxRowsPerSampleField;
+
     static void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput,
                    FormulaTemplate& aTemplate, const OUString& sFormula,
                    GroupedBy aGroupedBy, ScRange* pResultRange);
@@ -48,12 +48,11 @@ private:
 public:
     ScAnalysisOfVarianceDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
-        vcl::Window* pParent, ScViewData* pViewData );
+        weld::Window* pParent, ScViewData* pViewData );
 
     virtual ~ScAnalysisOfVarianceDialog() override;
-    virtual void dispose() override;
 
-    virtual bool Close() override;
+    virtual void Close() override;
 
 protected:
     virtual const char* GetUndoNameId() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index c8ce5507bc08..b1dda37d1249 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -72,7 +72,7 @@ private:
 };
 
 class ScAnalysisOfVarianceDialogWrapper :
-    public ChildWindowWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
+    public ChildControllerWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
 {
 private:
     ScAnalysisOfVarianceDialogWrapper() = delete;