diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 10:38:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 11:55:01 +0200 |
| commit | f8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch) | |
| tree | 0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /chart2/source/controller | |
| parent | b85ff98383942360901b8242cf77366782400426 (diff) | |
weld AdvancedSettingsDialog
make run virtual and fold executes into it, so GenericUnoDialog
can call run on tabdialogs to do the right thing, and allows
Start_Impl to be private again
Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42
Reviewed-on: https://gerrit.libreoffice.org/62227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller')
3 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index fcba8c63ba75..198b9373b255 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -398,7 +398,7 @@ void ChartController::executeDispatch_InsertTrendline() // note: when a user pressed "OK" but didn't change any settings in the // dialog, the SfxTabDialog returns "Cancel" - if( aDialog.execute() == RET_OK || aDialog.DialogWasClosedWithOK()) + if( aDialog.run() == RET_OK || aDialog.DialogWasClosedWithOK()) { const SfxItemSet* pOutItemSet = aDialog.GetOutputItemSet(); if( pOutItemSet ) @@ -459,7 +459,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) // note: when a user pressed "OK" but didn't change any settings in the // dialog, the SfxTabDialog returns "Cancel" - if (aDlg.execute() == RET_OK || aDlg.DialogWasClosedWithOK()) + if (aDlg.run() == RET_OK || aDlg.DialogWasClosedWithOK()) { const SfxItemSet* pOutItemSet = aDlg.GetOutputItemSet(); if( pOutItemSet ) diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 717c678a05da..a9907194a424 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -792,7 +792,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( } //open the dialog - if (aDlg.execute() == RET_OK || (bSuccessOnUnchanged && aDlg.DialogWasClosedWithOK())) + if (aDlg.run() == RET_OK || (bSuccessOnUnchanged && aDlg.DialogWasClosedWithOK())) { const SfxItemSet* pOutItemSet = aDlg.GetOutputItemSet(); if(pOutItemSet) diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 69d7d4be56a4..0e090c7b91ad 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -513,7 +513,7 @@ void ShapeController::executeDispatch_FontDialog() pDrawViewWrapper->GetAttributes( aAttr ); ViewElementListProvider aViewElementListProvider( pDrawModelWrapper ); ShapeFontDialog aDlg(pChartWindow->GetFrameWeld(), &aAttr, &aViewElementListProvider); - if (aDlg.execute() == RET_OK) + if (aDlg.run() == RET_OK) { const SfxItemSet* pOutAttr = aDlg.GetOutputItemSet(); pDrawViewWrapper->SetAttributes( *pOutAttr ); @@ -548,7 +548,7 @@ void ShapeController::executeDispatch_ParagraphDialog() aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) ); ShapeParagraphDialog aDlg(pChartWindow->GetFrameWeld(), &aNewAttr); - if (aDlg.execute() == RET_OK) + if (aDlg.run() == RET_OK) { const SfxItemSet* pOutAttr = aDlg.GetOutputItemSet(); pDrawViewWrapper->SetAttributes( *pOutAttr ); |