summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-04-10 12:34:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-04-11 09:57:47 +0200
commit725a5bc4729a8122f1c36ae49ad8d34b83983526 (patch)
tree0273a318ddbfc9b375e19964a2c3e8f8439d3b2f
parent5cc8252879cd46829008e21de246e520fff7d1ad (diff)
rename ScMatrixComparisonGeneratorController back...
to... ScMatrixComparisonGenerator Change-Id: Ib81e922455cebe7c57422aab10bc1b1d6cb325ef Reviewed-on: https://gerrit.libreoffice.org/70545 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx8
-rw-r--r--sc/source/ui/inc/CorrelationDialog.hxx2
-rw-r--r--sc/source/ui/inc/CovarianceDialog.hxx2
-rw-r--r--sc/source/ui/inc/MatrixComparisonGenerator.hxx6
6 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index d1463f608b3d..6ac135d33b43 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -16,7 +16,7 @@
ScCorrelationDialog::ScCorrelationDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData ) :
- ScMatrixComparisonGeneratorController(
+ ScMatrixComparisonGenerator(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/correlationdialog.ui", "CorrelationDialog")
{}
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index 522297cc731d..f447b89d0c93 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -16,7 +16,7 @@
ScCovarianceDialog::ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData ) :
- ScMatrixComparisonGeneratorController(
+ ScMatrixComparisonGenerator(
pSfxBindings, pChildWindow, pParent, pViewData,
"modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
{}
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 11146e438224..4ae4ef0e392d 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -39,7 +39,7 @@ namespace
}
}
-ScMatrixComparisonGeneratorController::ScMatrixComparisonGeneratorController(
+ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData,
const OUString& rUiXmlDescription,
@@ -47,15 +47,15 @@ ScMatrixComparisonGeneratorController::ScMatrixComparisonGeneratorController(
: ScStatisticsInputOutputDialogController(pSfxBindings, pChildWindow, pParent, pViewData, rUiXmlDescription, rID)
{}
-ScMatrixComparisonGeneratorController::~ScMatrixComparisonGeneratorController()
+ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator()
{}
-const char* ScMatrixComparisonGeneratorController::GetUndoNameId()
+const char* ScMatrixComparisonGenerator::GetUndoNameId()
{
return STR_CORRELATION_UNDO_NAME;
}
-ScRange ScMatrixComparisonGeneratorController::ApplyOutput(ScDocShell* pDocShell)
+ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
{
AddressWalkerWriter output(mOutputAddress, pDocShell, mDocument,
formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx
index 2a98da43881f..12db6f39df5b 100644
--- a/sc/source/ui/inc/CorrelationDialog.hxx
+++ b/sc/source/ui/inc/CorrelationDialog.hxx
@@ -13,7 +13,7 @@
#include "MatrixComparisonGenerator.hxx"
-class ScCorrelationDialog : public ScMatrixComparisonGeneratorController
+class ScCorrelationDialog : public ScMatrixComparisonGenerator
{
public:
ScCorrelationDialog(
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx
index 99052c51b644..21acb96e4b75 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -13,7 +13,7 @@
#include "MatrixComparisonGenerator.hxx"
-class ScCovarianceDialog : public ScMatrixComparisonGeneratorController
+class ScCovarianceDialog : public ScMatrixComparisonGenerator
{
public:
ScCovarianceDialog(
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index 6f0187d83ff1..955eb776a1e8 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -16,15 +16,15 @@
#include "StatisticsInputOutputDialog.hxx"
-class ScMatrixComparisonGeneratorController : public ScStatisticsInputOutputDialogController
+class ScMatrixComparisonGenerator : public ScStatisticsInputOutputDialogController
{
public:
- ScMatrixComparisonGeneratorController(
+ ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
weld::Window* pParent, ScViewData* pViewData,
const OUString& rUiXmlDescription, const OString& rID);
- virtual ~ScMatrixComparisonGeneratorController() override;
+ virtual ~ScMatrixComparisonGenerator() override;
protected:
virtual const char* GetUndoNameId() override;