sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/FTestDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 4 -
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 14 ++---
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 14 ++---
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 14 ++---
sc/source/ui/StatisticsDialogs/TTestDialog.cxx | 4 -
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx | 4 -
sc/source/ui/inc/AnalysisOfVarianceDialog.hxx | 2
sc/source/ui/inc/ChiSquareTestDialog.hxx | 2
sc/source/ui/inc/CorrelationDialog.hxx | 2
sc/source/ui/inc/CovarianceDialog.hxx | 2
sc/source/ui/inc/DescriptiveStatisticsDialog.hxx | 2
sc/source/ui/inc/ExponentialSmoothingDialog.hxx | 2
sc/source/ui/inc/FTestDialog.hxx | 2
sc/source/ui/inc/FourierAnalysisDialog.hxx | 2
sc/source/ui/inc/MatrixComparisonGenerator.hxx | 2
sc/source/ui/inc/MovingAverageDialog.hxx | 2
sc/source/ui/inc/RegressionDialog.hxx | 2
sc/source/ui/inc/SamplingDialog.hxx | 4 -
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 4 -
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 4 -
sc/source/ui/inc/TTestDialog.hxx | 2
sc/source/ui/inc/ZTestDialog.hxx | 2
sc/source/ui/view/tabvwshc.cxx | 26
+++++-----
33 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 7a4d8f3a6e74e1119e4b1276b0c8599b74a18216
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Sep 26 09:43:41 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Sep 26 22:21:10 2020 +0200
never null ScViewData*
Change-Id: Ie2c870ef1291b951a68ed4bb9344238d81c23762
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103472
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 2ea07a95cbb1..37e580bfa403 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -86,9 +86,9 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, const
ScRange& rInputRange, S
ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData )
+ weld::Window* pParent, ScViewData& rViewData )
: ScStatisticsInputOutputDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/analysisofvariancedialog.ui",
"AnalysisOfVarianceDialog")
, meFactor(SINGLE_FACTOR)
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index da12b328d5fb..7fb2d50d7dee 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -16,9 +16,9 @@
ScChiSquareTestDialog::ScChiSquareTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScStatisticsInputOutputDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/chisquaretestdialog.ui", "ChiSquareTestDialog")
{
m_xDialog->set_title(ScResId(STR_CHI_SQUARE_TEST));
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 5ecd359ab682..7e9a23372635 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -15,9 +15,9 @@
ScCorrelationDialog::ScCorrelationDialog(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScMatrixComparisonGenerator(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/correlationdialog.ui", "CorrelationDialog")
{}
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index 51b55f4e18c6..7abff79dc571 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -15,9 +15,9 @@
ScCovarianceDialog::ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScMatrixComparisonGenerator(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
{}
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 9c3d7fba1f8e..53fe8e2d10cf 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -48,9 +48,9 @@ const StatisticCalculation lclCalcDefinitions[] =
ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScStatisticsInputOutputDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/descriptivestatisticsdialog.ui",
"DescriptiveStatisticsDialog")
{}
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index 376b9db3b6d7..30f63ed0efd6 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -18,9 +18,9 @@
ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData )
+ weld::Window* pParent, ScViewData& rViewData )
: ScStatisticsInputOutputDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/exponentialsmoothingdialog.ui",
"ExponentialSmoothingDialog")
, mxSmoothingFactor(m_xBuilder->weld_spin_button("smoothing-factor-spin"))
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index f84c7807e537..d7b86bc4869f 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -18,9 +18,9 @@
ScFTestDialog::ScFTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScStatisticsTwoVariableDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/ttestdialog.ui", "TTestDialog" )
{
m_xDialog->set_title(ScResId(STR_FTEST));
diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
index 77926a28e03d..59d9556be773 100644
--- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
@@ -27,8 +27,8 @@
ScFourierAnalysisDialog::ScFourierAnalysisDialog(SfxBindings* pSfxBindings,
SfxChildWindow* pChildWindow,
- weld::Window* pParent,
ScViewData* pViewData)
- : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent,
pViewData,
+ weld::Window* pParent,
ScViewData& rViewData)
+ : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent,
rViewData,
"modules/scalc/ui/fourieranalysisdialog.ui",
"FourierAnalysisDialog")
, maLabelAddr(ScAddress::INITIALIZE_INVALID)
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 447a89c78608..a68be9b1d95f 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -41,10 +41,10 @@ namespace
ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow,
- weld::Window* pParent, ScViewData*
pViewData,
+ weld::Window* pParent, ScViewData&
rViewData,
const OUString& rUiXmlDescription,
const OString& rID)
- : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent,
pViewData, rUiXmlDescription, rID)
+ : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent,
rViewData, rUiXmlDescription, rID)
{}
ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator()
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 343e4512f891..f2a7f9020790 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -18,9 +18,9 @@
ScMovingAverageDialog::ScMovingAverageDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData )
+ weld::Window* pParent, ScViewData& rViewData )
: ScStatisticsInputOutputDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/movingaveragedialog.ui",
"MovingAverageDialog")
, mxTrimRangeCheck(m_xBuilder->weld_check_button("trimrange-check"))
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 401ddf41201d..7f0dd05cee94 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -136,9 +136,9 @@ static size_t lcl_GetNumRowsColsInRange(const ScRange&
rRange, bool bRows)
ScRegressionDialog::ScRegressionDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData )
+ weld::Window* pParent, ScViewData& rViewData )
: ScStatisticsTwoVariableDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/regressiondialog.ui", "RegressionDialog")
, mbUnivariate(true)
, mnNumIndependentVars(1)
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 1113254c6f1e..1dc4a3a00fd1 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -20,16 +20,16 @@
#include <strings.hrc>
ScSamplingDialog::ScSamplingDialog(SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow,
- weld::Window* pParent, ScViewData*
pViewData)
+ weld::Window* pParent, ScViewData&
rViewData)
: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
"modules/scalc/ui/samplingdialog.ui",
"SamplingDialog")
, mpActiveEdit(nullptr)
- , mViewData(pViewData)
- , mDocument(pViewData->GetDocument())
+ , mViewData(rViewData)
+ , mDocument(rViewData.GetDocument())
, mInputRange(ScAddress::INITIALIZE_INVALID)
, mAddressDetails(mDocument.GetAddressConvention(), 0, 0)
, mOutputAddress(ScAddress::INITIALIZE_INVALID)
- , mCurrentAddress(pViewData->GetCurX(), pViewData->GetCurY(),
pViewData->GetTabNo())
+ , mCurrentAddress(rViewData.GetCurX(), rViewData.GetCurY(),
rViewData.GetTabNo())
, mnLastSampleSizeValue(1)
, mnLastPeriodValue(1)
, mDialogLostFocus(false)
@@ -101,7 +101,7 @@ void ScSamplingDialog::Init()
void ScSamplingDialog::GetRangeFromSelection()
{
- mViewData->GetSimpleArea(mInputRange);
+ mViewData.GetSimpleArea(mInputRange);
OUString aCurrentString(mInputRange.Format(mDocument,
ScRefFlags::RANGE_ABS_3D, mAddressDetails));
mxInputRangeEdit->SetText(aCurrentString);
}
@@ -329,12 +329,12 @@ ScRange
ScSamplingDialog::PerformRandomSamplingKeepOrder(ScDocShell* pDocShell)
void ScSamplingDialog::PerformSampling()
{
OUString aUndo(ScResId(STR_SAMPLING_UNDO_NAME));
- ScDocShell* pDocShell = mViewData->GetDocShell();
+ ScDocShell* pDocShell = mViewData.GetDocShell();
SfxUndoManager* pUndoManager = pDocShell->GetUndoManager();
ScRange aModifiedRange;
- pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData->GetViewShell()->GetViewShellId() );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData.GetViewShell()->GetViewShellId() );
if (mxRandomMethodRadio->get_active())
{
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index a4a44f16a972..d2d53b23244f 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -48,7 +48,7 @@ ScRangeList
ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres
ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData, const
OUString& rUIXMLDescription, const OString& rID)
+ weld::Window* pParent, ScViewData& rViewData, const
OUString& rUIXMLDescription, const OString& rID)
: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
rUIXMLDescription, rID)
, mxInputRangeLabel(m_xBuilder->weld_label("input-range-label"))
, mxInputRangeEdit(new
formula::RefEdit(m_xBuilder->weld_entry("input-range-edit")))
@@ -58,15 +58,15 @@
ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
, mxOutputRangeButton(new
formula::RefButton(m_xBuilder->weld_button("output-range-button")))
,
mxGroupByColumnsRadio(m_xBuilder->weld_radio_button("groupedby-columns-radio"))
, mxGroupByRowsRadio(m_xBuilder->weld_radio_button("groupedby-rows-radio"))
- , mViewData(pViewData)
- , mDocument(pViewData->GetDocument())
+ , mViewData(rViewData)
+ , mDocument(rViewData.GetDocument())
, mInputRange(ScAddress::INITIALIZE_INVALID)
, mAddressDetails(mDocument.GetAddressConvention(), 0, 0)
, mOutputAddress(ScAddress::INITIALIZE_INVALID)
, mGroupedBy(BY_COLUMN)
, mxButtonOk(m_xBuilder->weld_button("ok"))
, mpActiveEdit(nullptr)
- , mCurrentAddress(pViewData->GetCurX(), pViewData->GetCurY(),
pViewData->GetTabNo())
+ , mCurrentAddress(rViewData.GetCurX(), rViewData.GetCurY(),
rViewData.GetTabNo())
, mDialogLostFocus(false)
{
mxInputRangeEdit->SetReferences(this, mxInputRangeLabel.get());
@@ -117,7 +117,7 @@ void ScStatisticsInputOutputDialog::Init()
void ScStatisticsInputOutputDialog::GetRangeFromSelection()
{
- mViewData->GetSimpleArea(mInputRange);
+ mViewData.GetSimpleArea(mInputRange);
OUString aCurrentString(mInputRange.Format(mDocument,
ScRefFlags::RANGE_ABS_3D, mAddressDetails));
mxInputRangeEdit->SetText(aCurrentString);
}
@@ -274,9 +274,9 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog,
RefInputModifyHandler, formula::
void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput()
{
OUString aUndo(ScResId(GetUndoNameId()));
- ScDocShell* pDocShell = mViewData->GetDocShell();
+ ScDocShell* pDocShell = mViewData.GetDocShell();
SfxUndoManager* pUndoManager = pDocShell->GetUndoManager();
- pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData->GetViewShell()->GetViewShellId() );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData.GetViewShell()->GetViewShellId() );
ScRange aOutputRange = ApplyOutput(pDocShell);
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 787c61bb3c3b..22f802fc7863 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -20,7 +20,7 @@
ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData, const
OUString& rUIXMLDescription, const OString& rID)
+ weld::Window* pParent, ScViewData& rViewData, const
OUString& rUIXMLDescription, const OString& rID)
: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
rUIXMLDescription, rID)
, mxVariable1RangeLabel(m_xBuilder->weld_label("variable1-range-label"))
, mxVariable1RangeEdit(new
formula::RefEdit(m_xBuilder->weld_entry("variable1-range-edit")))
@@ -31,8 +31,8 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
, mxOutputRangeLabel(m_xBuilder->weld_label("output-range-label"))
, mxOutputRangeEdit(new
formula::RefEdit(m_xBuilder->weld_entry("output-range-edit")))
, mxOutputRangeButton(new
formula::RefButton(m_xBuilder->weld_button("output-range-button")))
- , mViewData(pViewData)
- , mDocument(pViewData->GetDocument())
+ , mViewData(rViewData)
+ , mDocument(rViewData.GetDocument())
, mVariable1Range(ScAddress::INITIALIZE_INVALID)
, mVariable2Range(ScAddress::INITIALIZE_INVALID)
, mAddressDetails(mDocument.GetAddressConvention(), 0, 0 )
@@ -42,7 +42,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
,
mxGroupByColumnsRadio(m_xBuilder->weld_radio_button("groupedby-columns-radio"))
, mxGroupByRowsRadio(m_xBuilder->weld_radio_button("groupedby-rows-radio"))
, mpActiveEdit(nullptr)
- , mCurrentAddress(pViewData->GetCurX(), pViewData->GetCurY(),
pViewData->GetTabNo() )
+ , mCurrentAddress(rViewData.GetCurX(), rViewData.GetCurY(),
rViewData.GetTabNo() )
, mDialogLostFocus(false)
{
mxVariable1RangeEdit->SetReferences(this, mxVariable1RangeLabel.get());
@@ -106,7 +106,7 @@ void ScStatisticsTwoVariableDialog::GetRangeFromSelection()
OUString aCurrentString;
ScRange aCurrentRange;
- mViewData->GetSimpleArea(aCurrentRange);
+ mViewData.GetSimpleArea(aCurrentRange);
if (aCurrentRange.aEnd.Col() - aCurrentRange.aStart.Col() == 1)
{
@@ -316,9 +316,9 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog,
RefInputModifyHandler, formula::
void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
{
OUString aUndo(ScResId(GetUndoNameId()));
- ScDocShell* pDocShell = mViewData->GetDocShell();
+ ScDocShell* pDocShell = mViewData.GetDocShell();
SfxUndoManager* pUndoManager = pDocShell->GetUndoManager();
- pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData->GetViewShell()->GetViewShellId() );
+ pUndoManager->EnterListAction( aUndo, aUndo, 0,
mViewData.GetViewShell()->GetViewShellId() );
ScRange aOutputRange = ApplyOutput(pDocShell);
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 6d720a1f273f..9788fc192d4d 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -18,9 +18,9 @@
ScTTestDialog::ScTTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScStatisticsTwoVariableDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/ttestdialog.ui", "TTestDialog")
{
m_xDialog->set_title(ScResId(STR_TTEST));
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 974a47989283..2421b3ef19f7 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -18,9 +18,9 @@
ScZTestDialog::ScZTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData ) :
+ weld::Window* pParent, ScViewData& rViewData ) :
ScStatisticsTwoVariableDialog(
- pSfxBindings, pChildWindow, pParent, pViewData,
+ pSfxBindings, pChildWindow, pParent, rViewData,
"modules/scalc/ui/ztestdialog.ui", "ZTestDialog")
{
m_xDialog->set_title(ScResId(STR_ZTEST));
diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index a4c0bad4d162..517d0948be86 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -48,7 +48,7 @@ private:
public:
ScAnalysisOfVarianceDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScAnalysisOfVarianceDialog() override;
diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx
b/sc/source/ui/inc/ChiSquareTestDialog.hxx
index 28c642c159af..f84c4c6ae0cb 100644
--- a/sc/source/ui/inc/ChiSquareTestDialog.hxx
+++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx
@@ -18,7 +18,7 @@ class ScChiSquareTestDialog : public
ScStatisticsInputOutputDialog
public:
ScChiSquareTestDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScChiSquareTestDialog() override;
diff --git a/sc/source/ui/inc/CorrelationDialog.hxx
b/sc/source/ui/inc/CorrelationDialog.hxx
index a1444c67aff8..f2ab7ca97909 100644
--- a/sc/source/ui/inc/CorrelationDialog.hxx
+++ b/sc/source/ui/inc/CorrelationDialog.hxx
@@ -18,7 +18,7 @@ class ScCorrelationDialog : public ScMatrixComparisonGenerator
public:
ScCorrelationDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData);
+ weld::Window* pParent, ScViewData& rViewData);
virtual void Close() override;
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx
b/sc/source/ui/inc/CovarianceDialog.hxx
index 382dc7edf96d..7b9e0daa634c 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -18,7 +18,7 @@ class ScCovarianceDialog : public ScMatrixComparisonGenerator
public:
ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData);
+ weld::Window* pParent, ScViewData& rViewData);
virtual void Close() override;
diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
index afac816da3fd..9dfc6bde979f 100644
--- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
+++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
@@ -18,7 +18,7 @@ class ScDescriptiveStatisticsDialog : public
ScStatisticsInputOutputDialog
public:
ScDescriptiveStatisticsDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScDescriptiveStatisticsDialog() override;
diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
index fee6bd20bfe1..3473f1791221 100644
--- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
+++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
@@ -24,7 +24,7 @@ private:
public:
ScExponentialSmoothingDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScExponentialSmoothingDialog() override;
diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx
index 77d5b4102569..3a74393e1ed5 100644
--- a/sc/source/ui/inc/FTestDialog.hxx
+++ b/sc/source/ui/inc/FTestDialog.hxx
@@ -18,7 +18,7 @@ class ScFTestDialog : public ScStatisticsTwoVariableDialog
public:
ScFTestDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScFTestDialog() override;
diff --git a/sc/source/ui/inc/FourierAnalysisDialog.hxx
b/sc/source/ui/inc/FourierAnalysisDialog.hxx
index 5cd98ae77490..9c641c2eaebe 100644
--- a/sc/source/ui/inc/FourierAnalysisDialog.hxx
+++ b/sc/source/ui/inc/FourierAnalysisDialog.hxx
@@ -35,7 +35,7 @@ class ScFourierAnalysisDialog : public
ScStatisticsInputOutputDialog
public:
ScFourierAnalysisDialog(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
- ScViewData* pViewData);
+ ScViewData& rViewData);
virtual ~ScFourierAnalysisDialog() override;
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index 47fdb3bb9b1e..d7071458650a 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -21,7 +21,7 @@ class ScMatrixComparisonGenerator : public
ScStatisticsInputOutputDialog
public:
ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- weld::Window* pParent, ScViewData* pViewData,
+ weld::Window* pParent, ScViewData& rViewData,
const OUString& rUiXmlDescription, const OString& rID);
virtual ~ScMatrixComparisonGenerator() override;
diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx
b/sc/source/ui/inc/MovingAverageDialog.hxx
index 5b373e563edd..1a7dbd1ca043 100644
--- a/sc/source/ui/inc/MovingAverageDialog.hxx
+++ b/sc/source/ui/inc/MovingAverageDialog.hxx
@@ -25,7 +25,7 @@ private:
public:
ScMovingAverageDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScMovingAverageDialog() override;
diff --git a/sc/source/ui/inc/RegressionDialog.hxx
b/sc/source/ui/inc/RegressionDialog.hxx
index c5359520f0a8..96da94047007 100644
--- a/sc/source/ui/inc/RegressionDialog.hxx
+++ b/sc/source/ui/inc/RegressionDialog.hxx
@@ -33,7 +33,7 @@ class ScRegressionDialog : public
ScStatisticsTwoVariableDialog
public:
ScRegressionDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScRegressionDialog() override;
diff --git a/sc/source/ui/inc/SamplingDialog.hxx
b/sc/source/ui/inc/SamplingDialog.hxx
index 29aaa8087092..ec2e63a67be1 100644
--- a/sc/source/ui/inc/SamplingDialog.hxx
+++ b/sc/source/ui/inc/SamplingDialog.hxx
@@ -20,7 +20,7 @@ class ScSamplingDialog : public ScAnyRefDlgController
public:
ScSamplingDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScSamplingDialog() override;
@@ -32,7 +32,7 @@ private:
formula::RefEdit* mpActiveEdit;
// Data
- ScViewData* mViewData;
+ ScViewData& mViewData;
const ScDocument& mDocument;
ScRange mInputRange;
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index a3be27b1aa32..a1685127d550 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -25,7 +25,7 @@ public:
ScStatisticsInputOutputDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData,
+ weld::Window* pParent, ScViewData& rViewData,
const OUString& rUIXMLDescription,
const OString& rID);
@@ -55,7 +55,7 @@ protected:
std::unique_ptr<weld::RadioButton> mxGroupByRowsRadio;
// Data
- ScViewData* mViewData;
+ ScViewData& mViewData;
ScDocument& mDocument;
ScRange mInputRange;
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 8b870642e7b8..4b34284a1621 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -25,7 +25,7 @@ public:
ScStatisticsTwoVariableDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData,
+ weld::Window* pParent, ScViewData& rViewData,
const OUString& rUIXMLDescription, const OString& rID);
virtual ~ScStatisticsTwoVariableDialog() override;
@@ -55,7 +55,7 @@ protected:
std::unique_ptr<formula::RefButton> mxOutputRangeButton;
// Data
- ScViewData* mViewData;
+ ScViewData& mViewData;
ScDocument& mDocument;
ScRange mVariable1Range;
diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx
index cea829c70035..eb7c74b94f07 100644
--- a/sc/source/ui/inc/TTestDialog.hxx
+++ b/sc/source/ui/inc/TTestDialog.hxx
@@ -18,7 +18,7 @@ class ScTTestDialog : public ScStatisticsTwoVariableDialog
public:
ScTTestDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScTTestDialog() override;
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index ae60b8341ce2..a2ee9e0e1370 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -18,7 +18,7 @@ class ScZTestDialog : public ScStatisticsTwoVariableDialog
public:
ScZTestDialog(
SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData );
+ weld::Window* pParent, ScViewData& rViewData );
virtual ~ScZTestDialog() override;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 688d268fc5ef..db2a4f4fed6c 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -138,43 +138,43 @@ std::shared_ptr<SfxModelessDialogController>
ScTabViewShell::CreateRefDialogCont
switch( nSlotId )
{
case SID_CORRELATION_DIALOG:
- xResult = std::make_shared<ScCorrelationDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScCorrelationDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_SAMPLING_DIALOG:
- xResult = std::make_shared<ScSamplingDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScSamplingDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_DESCRIPTIVE_STATISTICS_DIALOG:
- xResult = std::make_shared<ScDescriptiveStatisticsDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScDescriptiveStatisticsDialog>(pB, pCW,
pParent, GetViewData());
break;
case SID_ANALYSIS_OF_VARIANCE_DIALOG:
- xResult = std::make_shared<ScAnalysisOfVarianceDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScAnalysisOfVarianceDialog>(pB, pCW,
pParent, GetViewData());
break;
case SID_COVARIANCE_DIALOG:
- xResult = std::make_shared<ScCovarianceDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScCovarianceDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_EXPONENTIAL_SMOOTHING_DIALOG:
- xResult = std::make_shared<ScExponentialSmoothingDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScExponentialSmoothingDialog>(pB, pCW,
pParent, GetViewData());
break;
case SID_MOVING_AVERAGE_DIALOG:
- xResult = std::make_shared<ScMovingAverageDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScMovingAverageDialog>(pB, pCW,
pParent, GetViewData());
break;
case SID_REGRESSION_DIALOG:
- xResult = std::make_shared<ScRegressionDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScRegressionDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_FTEST_DIALOG:
- xResult = std::make_shared<ScFTestDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScFTestDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_TTEST_DIALOG:
- xResult = std::make_shared<ScTTestDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScTTestDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_ZTEST_DIALOG:
- xResult = std::make_shared<ScZTestDialog>(pB, pCW, pParent,
&GetViewData());
+ xResult = std::make_shared<ScZTestDialog>(pB, pCW, pParent,
GetViewData());
break;
case SID_CHI_SQUARE_TEST_DIALOG:
- xResult = std::make_shared<ScChiSquareTestDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScChiSquareTestDialog>(pB, pCW,
pParent, GetViewData());
break;
case SID_FOURIER_ANALYSIS_DIALOG:
- xResult = std::make_shared<ScFourierAnalysisDialog>(pB, pCW,
pParent, &GetViewData());
+ xResult = std::make_shared<ScFourierAnalysisDialog>(pB, pCW,
pParent, GetViewData());
break;
case WID_SIMPLE_REF:
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
