diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-29 09:32:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-29 21:49:24 +0200 |
| commit | 6d0d201b30122395eb164807b93d76d567ff970b (patch) | |
| tree | 0af8ead928a5f2495bfbcb28bb44cb499b370c31 /chart2 | |
| parent | ba0408ae9a4ac1b391944b2fdcfd02f86ab2f773 (diff) | |
weld SvxTransformTabDialog
Change-Id: Ib6dabd04e3f834b61363d5a620de7f0219a1e644
Reviewed-on: https://gerrit.libreoffice.org/55012
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')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Position.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 37b0ef9ef208..2304bb72cda0 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -136,8 +136,9 @@ void ChartController::executeDispatch_PositionAndSize() SolarMutexGuard aGuard; SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE( pFact, "No dialog factory" ); + vcl::Window* pWin = GetChartWindow(); ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSchTransformTabDialog( - GetChartWindow(), &aItemSet, pSdrView, bResizePossible )); + pWin ? pWin->GetFrameWeld() : nullptr, &aItemSet, pSdrView, bResizePossible)); OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" ); if( pDlg->Execute() == RET_OK ) diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 1b6a89b94985..80203f179b83 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -399,7 +399,7 @@ void ShapeController::executeDispatch_TransformDialog() if ( pFact ) { ScopedVclPtr< SfxAbstractTabDialog > pDlg( - pFact->CreateSvxTransformTabDialog( pChartWindow, &aGeoAttr, pDrawViewWrapper ) ); + pFact->CreateSvxTransformTabDialog(pChartWindow ? pChartWindow->GetFrameWeld() : nullptr, &aGeoAttr, pDrawViewWrapper)); if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) ) { const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); |