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 <caol...@redhat.com>
AuthorDate: Wed Apr 10 12:24:15 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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<SID_CHI_SQUARE_TEST_DIALOG>
+ public ChildControllerWrapper<SID_CHI_SQUARE_TEST_DIALOG>
{
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<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)
diff --git a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
index fb5882eece89..21e6da9d5d1c 100644
--- a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
+++ b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui
@@ -1,19 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="ChiSquareTestDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="chisquaretestdialog|ChiSquareTestDialog">Chi Square Test</property>
<property name="resizable">False</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkFrame" id="framedata">
<property name="visible">True</property>
@@ -38,10 +101,10 @@
<object class="GtkLabel" id="input-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="chisquaretestdialog|input-range-label">Input range:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">input-range-edit</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -49,11 +112,12 @@
</packing>
</child>
<child>
- <object class="foruilo-RefEdit" id="input-range-edit">
+ <object class="GtkEntry" id="input-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="width_chars">30</property>
</object>
<packing>
@@ -62,7 +126,7 @@
</packing>
</child>
<child>
- <object class="foruilo-RefButton"
id="input-range-button">
+ <object class="GtkButton" id="input-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -76,10 +140,10 @@
<object class="GtkLabel" id="output-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="chisquaretestdialog|output-range-label">Results to:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">output-range-edit</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -87,11 +151,12 @@
</packing>
</child>
<child>
- <object class="foruilo-RefEdit" id="output-range-edit">
+ <object class="GtkEntry" id="output-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="width_chars">30</property>
</object>
<packing>
@@ -100,7 +165,7 @@
</packing>
</child>
<child>
- <object class="foruilo-RefButton"
id="output-range-button">
+ <object class="GtkButton" id="output-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -131,65 +196,6 @@
<property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
@@ -267,6 +273,7 @@
</child>
<action-widgets>
<action-widget response="-5">ok</action-widget>
+ <action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
</object>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index de86539a129f..e304e43c35de 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/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
commit 74e3e2449c30eb84503408103bafc2a84cf0cb77
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 10 12:18:23 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 11 09:56:44 2019 +0200
rename ScStatisticsTwoVariableDialogController back...
to ScStatisticsTwoVariableDialog
Change-Id: Id4a2ac62f212fb9356f052461485e6e517a1ed3f
Reviewed-on: https://gerrit.libreoffice.org/70541
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 10e523e28173..f39b84359925 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -19,7 +19,7 @@
ScFTestDialog::ScFTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData ) :
- ScStatisticsTwoVariableDialogController(
+ ScStatisticsTwoVariableDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/ttestdialog.ui", "TTestDialog" )
{
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 02b57e2e75db..b150e8d8b5ff 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -133,7 +133,7 @@ static size_t lcl_GetNumRowsColsInRange(const ScRange&
rRange, bool bRows)
ScRegressionDialog::ScRegressionDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData )
- : ScStatisticsTwoVariableDialogController(
+ : ScStatisticsTwoVariableDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/regressiondialog.ui", "RegressionDialog")
, mbUnivariate(true)
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 07cb21b60b90..9618474beaf2 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -18,7 +18,7 @@
#include <StatisticsTwoVariableDialog.hxx>
-ScStatisticsTwoVariableDialogController::ScStatisticsTwoVariableDialogController(
+ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData, const
OUString& rUIXMLDescription, const OString& rID)
: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
rUIXMLDescription, rID)
@@ -58,50 +58,50 @@
ScStatisticsTwoVariableDialogController::ScStatisticsTwoVariableDialogController
GetRangeFromSelection();
}
-ScStatisticsTwoVariableDialogController::~ScStatisticsTwoVariableDialogController()
+ScStatisticsTwoVariableDialog::~ScStatisticsTwoVariableDialog()
{
}
-void ScStatisticsTwoVariableDialogController::Init()
+void ScStatisticsTwoVariableDialog::Init()
{
- mxButtonOk->connect_clicked( LINK( this,
ScStatisticsTwoVariableDialogController, OkClicked ) );
+ mxButtonOk->connect_clicked( LINK( this, ScStatisticsTwoVariableDialog,
OkClicked ) );
mxButtonOk->set_sensitive(false);
- Link<formula::WeldRefEdit&,void> aEditLink = LINK( this,
ScStatisticsTwoVariableDialogController, GetEditFocusHandler );
+ Link<formula::WeldRefEdit&,void> aEditLink = LINK( this,
ScStatisticsTwoVariableDialog, GetEditFocusHandler );
mxVariable1RangeEdit->SetGetFocusHdl( aEditLink );
mxVariable2RangeEdit->SetGetFocusHdl( aEditLink );
mxOutputRangeEdit->SetGetFocusHdl( aEditLink );
- Link<formula::WeldRefButton&,void> aButtonLink = LINK( this,
ScStatisticsTwoVariableDialogController, GetButtonFocusHandler );
+ Link<formula::WeldRefButton&,void> aButtonLink = LINK( this,
ScStatisticsTwoVariableDialog, GetButtonFocusHandler );
mxVariable1RangeButton->SetGetFocusHdl( aButtonLink );
mxVariable2RangeButton->SetGetFocusHdl( aButtonLink );
mxOutputRangeButton->SetGetFocusHdl( aButtonLink );
- aEditLink = LINK( this, ScStatisticsTwoVariableDialogController,
LoseEditFocusHandler );
+ aEditLink = LINK( this, ScStatisticsTwoVariableDialog,
LoseEditFocusHandler );
mxVariable1RangeEdit->SetLoseFocusHdl( aEditLink );
mxVariable2RangeEdit->SetLoseFocusHdl( aEditLink );
mxOutputRangeEdit->SetLoseFocusHdl( aEditLink );
- aButtonLink = LINK( this, ScStatisticsTwoVariableDialogController,
LoseButtonFocusHandler );
+ aButtonLink = LINK( this, ScStatisticsTwoVariableDialog,
LoseButtonFocusHandler );
mxVariable1RangeButton->SetLoseFocusHdl( aButtonLink );
mxVariable2RangeButton->SetLoseFocusHdl( aButtonLink );
mxOutputRangeButton->SetLoseFocusHdl( aButtonLink );
- Link<formula::WeldRefEdit&,void> aLink2 = LINK( this,
ScStatisticsTwoVariableDialogController, RefInputModifyHandler);
+ Link<formula::WeldRefEdit&,void> aLink2 = LINK( this,
ScStatisticsTwoVariableDialog, RefInputModifyHandler);
mxVariable1RangeEdit->SetModifyHdl( aLink2);
mxVariable2RangeEdit->SetModifyHdl( aLink2);
mxOutputRangeEdit->SetModifyHdl( aLink2);
mxOutputRangeEdit->GrabFocus();
- mxGroupByColumnsRadio->connect_toggled( LINK( this,
ScStatisticsTwoVariableDialogController, GroupByChanged ) );
- mxGroupByRowsRadio->connect_toggled( LINK( this,
ScStatisticsTwoVariableDialogController, GroupByChanged ) );
+ mxGroupByColumnsRadio->connect_toggled( LINK( this,
ScStatisticsTwoVariableDialog, GroupByChanged ) );
+ mxGroupByRowsRadio->connect_toggled( LINK( this,
ScStatisticsTwoVariableDialog, GroupByChanged ) );
mxGroupByColumnsRadio->set_active(true);
mxGroupByRowsRadio->set_active(false);
}
-void ScStatisticsTwoVariableDialogController::GetRangeFromSelection()
+void ScStatisticsTwoVariableDialog::GetRangeFromSelection()
{
OUString aCurrentString;
@@ -128,7 +128,7 @@ void
ScStatisticsTwoVariableDialogController::GetRangeFromSelection()
}
}
-void ScStatisticsTwoVariableDialogController::SetActive()
+void ScStatisticsTwoVariableDialog::SetActive()
{
if ( mDialogLostFocus )
{
@@ -143,7 +143,7 @@ void ScStatisticsTwoVariableDialogController::SetActive()
RefInputDone();
}
-void ScStatisticsTwoVariableDialogController::SetReference( const ScRange&
rReferenceRange, ScDocument* pDocument )
+void ScStatisticsTwoVariableDialog::SetReference( const ScRange&
rReferenceRange, ScDocument* pDocument )
{
if ( mpActiveEdit != nullptr )
{
@@ -179,13 +179,13 @@ void
ScStatisticsTwoVariableDialogController::SetReference( const ScRange& rRefe
ValidateDialogInput();
}
-IMPL_LINK_NOARG( ScStatisticsTwoVariableDialogController, OkClicked,
weld::Button&, void )
+IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, OkClicked, weld::Button&, void
)
{
CalculateInputAndWriteToOutput();
response(RET_OK);
}
-IMPL_LINK(ScStatisticsTwoVariableDialogController, GetEditFocusHandler,
formula::WeldRefEdit&, rCtrl, void)
+IMPL_LINK(ScStatisticsTwoVariableDialog, GetEditFocusHandler,
formula::WeldRefEdit&, rCtrl, void)
{
mpActiveEdit = nullptr;
if (&rCtrl == mxVariable1RangeEdit.get())
@@ -205,7 +205,7 @@ IMPL_LINK(ScStatisticsTwoVariableDialogController,
GetEditFocusHandler, formula:
mpActiveEdit->SelectAll();
}
-IMPL_LINK( ScStatisticsTwoVariableDialogController, GetButtonFocusHandler,
formula::WeldRefButton&, rCtrl, void )
+IMPL_LINK( ScStatisticsTwoVariableDialog, GetButtonFocusHandler,
formula::WeldRefButton&, rCtrl, void )
{
mpActiveEdit = nullptr;
if (&rCtrl == mxVariable1RangeButton.get())
@@ -225,17 +225,17 @@ IMPL_LINK( ScStatisticsTwoVariableDialogController,
GetButtonFocusHandler, formu
mpActiveEdit->SelectAll();
}
-IMPL_LINK_NOARG( ScStatisticsTwoVariableDialogController,
LoseEditFocusHandler, formula::WeldRefEdit&, void )
+IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseEditFocusHandler,
formula::WeldRefEdit&, void )
{
mDialogLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG( ScStatisticsTwoVariableDialogController,
LoseButtonFocusHandler, formula::WeldRefButton&, void )
+IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseButtonFocusHandler,
formula::WeldRefButton&, void )
{
mDialogLostFocus = !m_xDialog->has_toplevel_focus();
}
-IMPL_LINK_NOARG(ScStatisticsTwoVariableDialogController, GroupByChanged,
weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScStatisticsTwoVariableDialog, GroupByChanged,
weld::ToggleButton&, void)
{
if (mxGroupByColumnsRadio->get_active())
mGroupedBy = BY_COLUMN;
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(ScStatisticsTwoVariableDialogController,
GroupByChanged, weld::T
ValidateDialogInput();
}
-IMPL_LINK_NOARG( ScStatisticsTwoVariableDialogController,
RefInputModifyHandler, formula::WeldRefEdit&, void )
+IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler,
formula::WeldRefEdit&, void )
{
if ( mpActiveEdit )
{
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialogController,
RefInputModifyHandler,
ValidateDialogInput();
}
-void ScStatisticsTwoVariableDialogController::CalculateInputAndWriteToOutput()
+void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
{
OUString aUndo(ScResId(GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell();
@@ -326,12 +326,12 @@ void
ScStatisticsTwoVariableDialogController::CalculateInputAndWriteToOutput()
pDocShell->PostPaint( aOutputRange, PaintPartFlags::Grid );
}
-bool ScStatisticsTwoVariableDialogController::InputRangesValid()
+bool ScStatisticsTwoVariableDialog::InputRangesValid()
{
return mVariable1Range.IsValid() && mVariable2Range.IsValid() &&
mOutputAddress.IsValid();
}
-void ScStatisticsTwoVariableDialogController::ValidateDialogInput()
+void ScStatisticsTwoVariableDialog::ValidateDialogInput()
{
// Enable OK button if all inputs are ok.
mxButtonOk->set_sensitive(InputRangesValid());
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index a9c39a6cb374..c3fcda8f4d3e 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -19,7 +19,7 @@
ScTTestDialog::ScTTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData ) :
- ScStatisticsTwoVariableDialogController(
+ ScStatisticsTwoVariableDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/ttestdialog.ui", "TTestDialog")
{
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index f03f8a41a7bf..ef36fb1cccfc 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -19,7 +19,7 @@
ScZTestDialog::ScZTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData ) :
- ScStatisticsTwoVariableDialogController(
+ ScStatisticsTwoVariableDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/ztestdialog.ui", "ZTestDialog")
{
diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx
index f75bff68ed2d..77d5b4102569 100644
--- a/sc/source/ui/inc/FTestDialog.hxx
+++ b/sc/source/ui/inc/FTestDialog.hxx
@@ -13,7 +13,7 @@
#include "StatisticsTwoVariableDialog.hxx"
-class ScFTestDialog : public ScStatisticsTwoVariableDialogController
+class ScFTestDialog : public ScStatisticsTwoVariableDialog
{
public:
ScFTestDialog(
diff --git a/sc/source/ui/inc/RegressionDialog.hxx
b/sc/source/ui/inc/RegressionDialog.hxx
index 6f689d80c321..22c1640eb3a8 100644
--- a/sc/source/ui/inc/RegressionDialog.hxx
+++ b/sc/source/ui/inc/RegressionDialog.hxx
@@ -13,7 +13,7 @@
#include "StatisticsTwoVariableDialog.hxx"
-class ScRegressionDialog : public ScStatisticsTwoVariableDialogController
+class ScRegressionDialog : public ScStatisticsTwoVariableDialog
{
bool mbUnivariate;
size_t mnNumIndependentVars;
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index a3e90f78055e..bf4db74c2fd6 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -17,7 +17,7 @@
#include <vcl/fixed.hxx>
-class ScStatisticsTwoVariableDialogController : public ScAnyRefDlgController
+class ScStatisticsTwoVariableDialog : public ScAnyRefDlgController
{
public:
enum GroupedBy {
@@ -25,12 +25,12 @@ public:
BY_ROW
};
- ScStatisticsTwoVariableDialogController(
+ ScStatisticsTwoVariableDialog(
SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent, ScViewData* pViewData,
const OUString& rUIXMLDescription, const OString& rID);
- virtual ~ScStatisticsTwoVariableDialogController() override;
+ virtual ~ScStatisticsTwoVariableDialog() override;
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc )
override;
virtual void SetActive() override;
diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx
index 623be738884c..cea829c70035 100644
--- a/sc/source/ui/inc/TTestDialog.hxx
+++ b/sc/source/ui/inc/TTestDialog.hxx
@@ -13,7 +13,7 @@
#include "StatisticsTwoVariableDialog.hxx"
-class ScTTestDialog : public ScStatisticsTwoVariableDialogController
+class ScTTestDialog : public ScStatisticsTwoVariableDialog
{
public:
ScTTestDialog(
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index 529dd3f9d850..ae60b8341ce2 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -13,7 +13,7 @@
#include "StatisticsTwoVariableDialog.hxx"
-class ScZTestDialog : public ScStatisticsTwoVariableDialogController
+class ScZTestDialog : public ScStatisticsTwoVariableDialog
{
public:
ScZTestDialog(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
