diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-10 16:13:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-10 16:13:34 +0200 |
| commit | 7a1fad0d4f6b95c9beafa9c34f34b70bb9a0c9ed (patch) | |
| tree | 10280a4d4cde82967bba69ee1fe0f4a9db71bc9c /chart2/source | |
| parent | 3bf4ada33f09e155f3350602e7a4b6cec77e40f0 (diff) | |
convert ScopedVclPtr to ScopedVclPtrInstance
Change-Id: I22a9d9c313a81ccee885b9c8785d4b008a6f2058
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Insert.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index a3a2b20a61e1..e194016abd17 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -147,7 +147,7 @@ void ChartController::executeDispatch_InsertGrid() AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, false ); SolarMutexGuard aGuard; - ScopedVclPtr<SchGridDlg> aDlg(new SchGridDlg( m_pChartWindow, aDialogInput ));//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY ); + ScopedVclPtrInstance<SchGridDlg> aDlg(m_pChartWindow, aDialogInput);//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY ); if( aDlg->Execute() == RET_OK ) { // lock controllers till end of block diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index acfc945e55ea..97f2065fb3b6 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -549,7 +549,7 @@ void ShapeController::executeDispatch_FontDialog() SfxItemSet aAttr( pDrawViewWrapper->GetModel()->GetItemPool() ); pDrawViewWrapper->GetAttributes( aAttr ); ViewElementListProvider aViewElementListProvider( pDrawModelWrapper ); - ScopedVclPtr< ShapeFontDialog > pDlg( new ShapeFontDialog( pParent, &aAttr, &aViewElementListProvider ) ); + ScopedVclPtrInstance< ShapeFontDialog > pDlg( pParent, &aAttr, &aViewElementListProvider ); if ( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); @@ -587,7 +587,7 @@ void ShapeController::executeDispatch_ParagraphDialog() aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) ); aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) ); - ScopedVclPtr< ShapeParagraphDialog > pDlg( new ShapeParagraphDialog( pParent, &aNewAttr ) ); + ScopedVclPtrInstance< ShapeParagraphDialog > pDlg( pParent, &aNewAttr ); if ( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); |