diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sc/source/ui/StatisticsDialogs | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sc/source/ui/StatisticsDialogs')
13 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index a764c1397321..efb130e1a97b 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -96,7 +96,7 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, ScRange& rInputRange, ScStati ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "AnalysisOfVarianceDialog", "modules/scalc/ui/analysisofvariancedialog.ui" ), diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx index 2591b9f47322..3184b2281e0c 100644 --- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx @@ -22,7 +22,7 @@ namespace ScCorrelationDialog::ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CorrelationDialog", "modules/scalc/ui/correlationdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index b4ed14e74564..e26c650f5566 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -22,7 +22,7 @@ namespace ScCovarianceDialog::ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index 0d98e79d9a1e..157e974fadae 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -61,7 +61,7 @@ static const OUString strWildcardNumber("%NUMBER%"); ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "DescriptiveStatisticsDialog", "modules/scalc/ui/descriptivestatisticsdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index 091f1a05833b..8063b4ab82d9 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -28,7 +28,7 @@ ScExponentialSmoothingDialog::ScExponentialSmoothingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "ExponentialSmoothingDialog", "modules/scalc/ui/exponentialsmoothingdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx index 785d47550214..2b3eb52944be 100644 --- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScFTestDialog::ScFTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index ac7039ae9251..4ac7c8eed48a 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -53,7 +53,7 @@ namespace ScMatrixComparisonGenerator::ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUiXmlDescription) : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, pViewData, rID, rUiXmlDescription) {} diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 2786e53b6626..7a76c2fc9095 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -28,7 +28,7 @@ ScMovingAverageDialog::ScMovingAverageDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "MovingAverageDialog", "modules/scalc/ui/movingaveragedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index f3e14e7ebb34..905f409b5d7b 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -56,7 +56,7 @@ const sal_Int64 DIGITS = 4; ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "RandomNumberGeneratorDialog", "modules/scalc/ui/randomnumbergenerator.ui" ), mpViewData ( pViewData ), diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index afe5d64a8081..49b2d4315577 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -28,7 +28,7 @@ ScSamplingDialog::ScSamplingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "SamplingDialog", "modules/scalc/ui/samplingdialog.ui" ), mpActiveEdit ( NULL ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index d8e835a538cd..1c104a6506f8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -55,7 +55,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index a55da6df51ad..190704beabe8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -27,7 +27,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index 07a61c8c0fa6..684b40f9a2b1 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScTTestDialog::ScTTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) |