diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-21 10:59:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-21 17:12:36 +0200 |
| commit | e4d95fa557179d787fd78211b76dd7c311940762 (patch) | |
| tree | f4cd124d1650511c4fb9e7443a90a6ee8f6d0f69 /chart2/source/controller/main/ChartController_Insert.cxx | |
| parent | Updated core (diff) | |
| download | core-e4d95fa557179d787fd78211b76dd7c311940762.tar.gz core-e4d95fa557179d787fd78211b76dd7c311940762.zip | |
weld SchAxisDlg
Change-Id: I18441b4fc06b69caf12dc73e5042ad2b609a7cc5
Reviewed-on: https://gerrit.libreoffice.org/54620
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller/main/ChartController_Insert.cxx')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Insert.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 3589d0cc2d02..a1510a7db984 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -97,14 +97,14 @@ void ChartController::executeDispatch_InsertAxes() AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram ); SolarMutexGuard aGuard; - ScopedVclPtrInstance<SchAxisDlg> aDlg( GetChartWindow(), aDialogInput ); - if( aDlg->Execute() == RET_OK ) + SchAxisDlg aDlg(GetChartFrame(), aDialogInput); + if (aDlg.run() == RET_OK) { // lock controllers till end of block ControllerLockGuardUNO aCLGuard( getModel() ); InsertAxisOrGridDialogData aDialogOutput; - aDlg->getResult( aDialogOutput ); + aDlg.getResult(aDialogOutput); std::unique_ptr< ReferenceSizeProvider > pRefSizeProvider( impl_createReferenceSizeProvider()); bool bChanged = AxisHelper::changeVisibilityOfAxes( xDiagram @@ -135,13 +135,13 @@ void ChartController::executeDispatch_InsertGrid() AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, false ); SolarMutexGuard aGuard; - ScopedVclPtrInstance<SchGridDlg> aDlg(GetChartWindow(), aDialogInput);//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY ); - if( aDlg->Execute() == RET_OK ) + SchGridDlg aDlg(GetChartFrame(), aDialogInput);//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY ); + if (aDlg.run() == RET_OK) { // lock controllers till end of block ControllerLockGuardUNO aCLGuard( getModel() ); InsertAxisOrGridDialogData aDialogOutput; - aDlg->getResult( aDialogOutput ); + aDlg.getResult( aDialogOutput ); bool bChanged = AxisHelper::changeVisibilityOfGrids( xDiagram , aDialogInput.aExistenceList, aDialogOutput.aExistenceList ); if( bChanged ) |