[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx | 12
sc/source/ui/StatisticsDialogs/FTestDialog.cxx |2
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx|2
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 48 +--
sc/source/ui/StatisticsDialogs/TTestDialog.cxx |2
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |2
sc/source/ui/inc/ChiSquareTestDialog.hxx |6
sc/source/ui/inc/FTestDialog.hxx |2
sc/source/ui/inc/RegressionDialog.hxx |2
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx |6
sc/source/ui/inc/TTestDialog.hxx |2
sc/source/ui/inc/ZTestDialog.hxx |2
sc/source/ui/inc/reffact.hxx |2
sc/source/ui/view/tabvwshc.cxx | 11
sc/uiconfig/scalc/ui/chisquaretestdialog.ui| 141
+-
solenv/sanitizers/ui/modules/scalc.suppr |2
16 files changed, 126 insertions(+), 118 deletions(-)
New commits:
commit 8d526da348107227bee3101ccc7aa9a2beb5dbd2
Author: Caolán McNamara
AuthorDate: Wed Apr 10 12:24:15 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 11 09:56:59 2019 +0200
weld ScChiSquareTestDialog
Change-Id: I652bf123bc9cba5edbb052bddd9be02640b3884c
Reviewed-on: https://gerrit.libreoffice.org/70542
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index d6f729c086d4..96349ed6f955 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/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()
diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx
b/sc/source/ui/inc/ChiSquareTestDialog.hxx
index 849914d57f6e..78d1895b6332 100644
--- a/sc/source/ui/inc/ChiSquareTestDialog.hxx
+++ b/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;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index b04e4860da6b..e9fb083c472f 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -135,7 +135,7 @@ private:
};
class ScChiSquareTestDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
{
private:
ScChiSquareTestDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 8b86b2986cb1..22405862f434 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
}
break;
-case SID_CHI_SQUARE_TEST_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, pParent,
() );
-}
-break;
-
case SID_FOURIER_ANALYSIS_DIALOG:
{
pResult = VclPtr::Create( pB, pCW,
pParent, () );
@@ -528,6 +522,11 @@ std::unique_ptr
ScTabViewShell::CreateRefDialogCont
xResult.reset(new ScZTestDialog(pB, pCW, pParent, ()));
}
break;
+case SID_CHI_SQUARE_TEST_DIALOG:
+{
+xResult.reset(new ScChiSquareTestDialog(pB, pCW,
[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers
sc/source/ui/StatisticsDialogs/FTestDialog.cxx | 12 +-
sc/source/ui/StatisticsDialogs/TTestDialog.cxx | 12 +-
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx | 12 +-
sc/source/ui/inc/FTestDialog.hxx |6 -
sc/source/ui/inc/TTestDialog.hxx |6 -
sc/source/ui/inc/ZTestDialog.hxx |6 -
sc/source/ui/inc/reffact.hxx |6 -
sc/source/ui/view/tabvwshc.cxx | 33 ++---
sc/uiconfig/scalc/ui/ttestdialog.ui| 148 +
sc/uiconfig/scalc/ui/ztestdialog.ui| 148 +
solenv/sanitizers/ui/modules/scalc.suppr |6 +
11 files changed, 207 insertions(+), 188 deletions(-)
New commits:
commit c2d2f91a6cb684c435ff5a5b68f90be69328aab2
Author: Caolán McNamara
AuthorDate: Wed Apr 10 12:13:21 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 11 09:55:35 2019 +0200
weld ScZTestDialog
Change-Id: I9cd624d0dd80d56e772c0241e20ec93e253d8d2b
Reviewed-on: https://gerrit.libreoffice.org/70539
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 0a1e64526df0..f03f8a41a7bf 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -18,20 +18,20 @@
ScZTestDialog::ScZTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsTwoVariableDialog(
+weld::Window* pParent, ScViewData* pViewData ) :
+ScStatisticsTwoVariableDialogController(
pSfxBindings, pChildWindow, pParent, pViewData,
-"ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
+"modules/scalc/ui/ztestdialog.ui", "ZTestDialog")
{
-SetText(ScResId(STR_ZTEST));
+m_xDialog->set_title(ScResId(STR_ZTEST));
}
ScZTestDialog::~ScZTestDialog()
{}
-bool ScZTestDialog::Close()
+void ScZTestDialog::Close()
{
-return DoClose( ScZTestDialogWrapper::GetChildWindowId() );
+DoClose( ScZTestDialogWrapper::GetChildWindowId() );
}
const char* ScZTestDialog::GetUndoNameId()
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index 6fd8496c814b..529dd3f9d850 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -13,16 +13,16 @@
#include "StatisticsTwoVariableDialog.hxx"
-class ScZTestDialog : public ScStatisticsTwoVariableDialog
+class ScZTestDialog : public ScStatisticsTwoVariableDialogController
{
public:
ScZTestDialog(
SfxBindings* pB, SfxChildWindow* pCW,
-vcl::Window* pParent, ScViewData* pViewData );
+weld::Window* pParent, ScViewData* pViewData );
virtual ~ScZTestDialog() 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 c3e90eda63d7..b04e4860da6b 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -128,7 +128,7 @@ private:
};
class ScZTestDialogWrapper :
-public ChildWindowWrapper
+public ChildControllerWrapper
{
private:
ScZTestDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index f84644eba3bb..8b86b2986cb1 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr ScTabViewShell::CreateRefDialog(
}
break;
-case SID_ZTEST_DIALOG:
-{
-pResult = VclPtr::Create( pB, pCW, pParent,
() );
-}
-break;
-
case SID_CHI_SQUARE_TEST_DIALOG:
{
pResult = VclPtr::Create( pB, pCW, pParent,
() );
@@ -529,6 +523,11 @@ std::unique_ptr
ScTabViewShell::CreateRefDialogCont
xResult.reset(new ScTTestDialog(pB, pCW, pParent, ()));
}
break;
+case SID_ZTEST_DIALOG:
+{
+xResult.reset(new ScZTestDialog(pB, pCW, pParent, ()));
+}
+break;
}
if (xResult)
diff --git a/sc/uiconfig/scalc/ui/ztestdialog.ui
b/sc/uiconfig/scalc/ui/ztestdialog.ui
index 7bb7e4e0d28e..a23dd22ab90f 100644
--- a/sc/uiconfig/scalc/ui/ztestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ztestdialog.ui
@@ -1,17 +1,80 @@
-
+
-
False
6
+0
+0
dialog
+
+
+
False
vertical
12
+
+
+False
+end
+
+
+gtk-ok
+True
+True
+True
+True
+True
+True
+
+
+
[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig solenv/sanitizers
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx | 22
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx| 94 +-
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 319
++
sc/source/ui/inc/MovingAverageDialog.hxx |9
sc/source/ui/inc/RegressionDialog.hxx | 29
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 73 ++
sc/source/ui/inc/reffact.hxx |4
sc/source/ui/view/tabvwshc.cxx | 22
sc/uiconfig/scalc/ui/movingaveragedialog.ui| 146 ++--
sc/uiconfig/scalc/ui/regressiondialog.ui | 27
solenv/sanitizers/ui/modules/scalc.suppr | 13
11 files changed, 570 insertions(+), 188 deletions(-)
New commits:
commit 5a816c4241c98b97d464007f25657b946eb29005
Author: Caolán McNamara
AuthorDate: Wed Apr 10 11:36:45 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 11 09:54:55 2019 +0200
weld ScRegressionDialog
Change-Id: I26cbf2b5ed7482daa8d02adb206b6a783524985a
Reviewed-on: https://gerrit.libreoffice.org/70517
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 11ac7b017e77..02b57e2e75db 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -132,49 +132,35 @@ static size_t lcl_GetNumRowsColsInRange(const ScRange&
rRange, bool bRows)
ScRegressionDialog::ScRegressionDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-vcl::Window* pParent, ScViewData* pViewData ) :
-ScStatisticsTwoVariableDialog(
+weld::Window* pParent, ScViewData* pViewData )
+: ScStatisticsTwoVariableDialogController(
pSfxBindings, pChildWindow, pParent, pViewData,
-"RegressionDialog", "modules/scalc/ui/regressiondialog.ui" ),
-mbUnivariate(true),
-mnNumIndependentVars(1),
-mnNumObservations(0),
-mbUse3DAddresses(false),
-mbCalcIntercept(true)
+"modules/scalc/ui/regressiondialog.ui", "RegressionDialog")
+, mbUnivariate(true)
+, mnNumIndependentVars(1)
+, mnNumObservations(0)
+, mbUse3DAddresses(false)
+, mbCalcIntercept(true)
+, mxWithLabelsCheckBox(m_xBuilder->weld_check_button("withlabels-check"))
+, mxLinearRadioButton(m_xBuilder->weld_radio_button("linear-radio"))
+,
mxLogarithmicRadioButton(m_xBuilder->weld_radio_button("logarithmic-radio"))
+, mxPowerRadioButton(m_xBuilder->weld_radio_button("power-radio"))
+, mxErrorMessage(m_xBuilder->weld_label("error-message"))
+,
mxConfidenceLevelField(m_xBuilder->weld_spin_button("confidencelevel-spin"))
+,
mxCalcResidualsCheckBox(m_xBuilder->weld_check_button("calcresiduals-check"))
+, mxNoInterceptCheckBox(m_xBuilder->weld_check_button("nointercept-check"))
{
-get(mpWithLabelsCheckBox, "withlabels-check");
-get(mpLinearRadioButton, "linear-radio");
-get(mpLogarithmicRadioButton, "logarithmic-radio");
-get(mpPowerRadioButton, "power-radio");
-get(mpConfidenceLevelField, "confidencelevel-spin");
-get(mpCalcResidualsCheckBox, "calcresiduals-check");
-get(mpNoInterceptCheckBox, "nointercept-check");
-get(mpErrorMessage, "error-message");
-mpWithLabelsCheckBox->SetToggleHdl(LINK(this, ScRegressionDialog,
CheckBoxHdl));
-mpConfidenceLevelField->SetModifyHdl(LINK(this, ScRegressionDialog,
NumericFieldHdl));
+mxWithLabelsCheckBox->connect_toggled(LINK(this, ScRegressionDialog,
CheckBoxHdl));
+mxConfidenceLevelField->connect_value_changed(LINK(this,
ScRegressionDialog, NumericFieldHdl));
}
ScRegressionDialog::~ScRegressionDialog()
{
-disposeOnce();
}
-bool ScRegressionDialog::Close()
+void ScRegressionDialog::Close()
{
-return DoClose(ScRegressionDialogWrapper::GetChildWindowId());
-}
-
-void ScRegressionDialog::dispose()
-{
-mpWithLabelsCheckBox.disposeAndClear();
-mpLinearRadioButton.disposeAndClear();
-mpLogarithmicRadioButton.disposeAndClear();
-mpPowerRadioButton.disposeAndClear();
-mpConfidenceLevelField.disposeAndClear();
-mpCalcResidualsCheckBox.disposeAndClear();
-mpNoInterceptCheckBox.disposeAndClear();
-mpErrorMessage.disposeAndClear();
-ScStatisticsTwoVariableDialog::dispose();
+DoClose(ScRegressionDialogWrapper::GetChildWindowId());
}
const char* ScRegressionDialog::GetUndoNameId()
@@ -188,7 +174,7 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell*
pDocShell)
formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument);
