diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-20 11:27:10 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:37:44 +0100 |
| commit | 61b224f392eb856bf4cfa0c04c68202a463cbdbf (patch) | |
| tree | 77a28e38763bc5f9d95e2c278601d31dc6fbf65d /extensions/source/propctrlr/formcomponenthandler.cxx | |
| parent | f1d9eef4163e88a3cb6360178b52ce441e65d8ae (diff) | |
vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.
Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 70fa6191edc1..407f5b70ea7e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2608,7 +2608,7 @@ namespace pcr OSL_PRECOND( m_pInfoService.get(), "FormComponentPropertyHandler::impl_dialogListSelection_nothrow: no property meta data!" ); OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( m_pInfoService->getPropertyId( _rProperty ) ) ); - VclPtr<ListSelectionDialog> aDialog(new ListSelectionDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, _rProperty, sPropertyUIName ) ); + ScopedVclPtr<ListSelectionDialog> aDialog(new ListSelectionDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, _rProperty, sPropertyUIName ) ); _rClearBeforeDialog.clear(); return ( RET_OK == aDialog->Execute() ); } @@ -2685,7 +2685,7 @@ namespace pcr return false; - VclPtr<FormLinkDialog> aDialog(new FormLinkDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, xMasterProp, m_xContext ) ); + ScopedVclPtr<FormLinkDialog> aDialog(new FormLinkDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, xMasterProp, m_xContext ) ); _rClearBeforeDialog.clear(); return ( RET_OK == aDialog->Execute() ); } @@ -2722,7 +2722,7 @@ namespace pcr aCoreSet.Put( aFormatter ); // a tab dialog with a single page - VclPtr< SfxSingleTabDialog > xDialog(new SfxSingleTabDialog( + ScopedVclPtr< SfxSingleTabDialog > xDialog(new SfxSingleTabDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet, "FormatNumberDialog", "cui/ui/formatnumberdialog.ui")); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -2871,7 +2871,7 @@ namespace pcr { // do this in an own block. The dialog needs to be destroyed before we call // destroyItemSet - VclPtr<ControlCharacterDialog> aDlg(new ControlCharacterDialog( impl_getDefaultDialogParent_nothrow(), *pSet ) ); + ScopedVclPtr<ControlCharacterDialog> aDlg(new ControlCharacterDialog( impl_getDefaultDialogParent_nothrow(), *pSet ) ); _rClearBeforeDialog.clear(); if ( RET_OK == aDlg->Execute() ) { @@ -2942,7 +2942,7 @@ namespace pcr bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { - VclPtr<OSelectLabelDialog> dlgSelectLabel(new OSelectLabelDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent ) ); + ScopedVclPtr<OSelectLabelDialog> dlgSelectLabel(new OSelectLabelDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent ) ); _rClearBeforeDialog.clear(); bool bSuccess = ( RET_OK == dlgSelectLabel->Execute() ); if ( bSuccess ) @@ -2965,7 +2965,7 @@ namespace pcr OSL_PRECOND( impl_getContextControlContainer_nothrow().is(), "FormComponentPropertyHandler::impl_dialogChangeTabOrder_nothrow: invalid control context!" ); Reference< XTabControllerModel > xTabControllerModel( impl_getRowSet_nothrow(), UNO_QUERY ); - VclPtr<TabOrderDialog> aDialog(new TabOrderDialog( + ScopedVclPtr<TabOrderDialog> aDialog(new TabOrderDialog( impl_getDefaultDialogParent_nothrow(), xTabControllerModel, impl_getContextControlContainer_nothrow(), |