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 | |
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')
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibview.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 12 | ||||
-rw-r--r-- | extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 4 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 10 | ||||
-rw-r--r-- | extensions/source/scanner/scanunx.cxx | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 576aba0dd489..542e88221b2b 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -243,7 +243,7 @@ namespace abp if (AST_INVALID == getSelectedType( )) { - VclPtr<MessageDialog> aError(new MessageDialog(this, ModuleRes(RID_STR_NEEDTYPESELECTION))); + ScopedVclPtr<MessageDialog> aError(new MessageDialog(this, ModuleRes(RID_STR_NEEDTYPESELECTION))); aError->Execute(); return false; } diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 33e4816953a4..f91b60e6ba89 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -141,7 +141,7 @@ namespace bib { sErrorString += "\n"; sErrorString += BIB_RESSTR(RID_MAP_QUESTION); - VclPtr<QueryBox> aQuery(new QueryBox(this, WB_YES_NO, sErrorString) ); + ScopedVclPtr<QueryBox> aQuery(new QueryBox(this, WB_YES_NO, sErrorString) ); aQuery->SetDefaultCheckBoxText(); short nResult = aQuery->Execute(); BibModul::GetConfig()->SetShowColumnAssignmentWarning( diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index c8408c0eb249..6c84e4601f77 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -357,7 +357,7 @@ namespace pcr ,m_bUpdate(true) ,m_pControlContextImpl( new PropertyControlContext_Impl( *this ) ) { - VclPtr<ListBox> aListBox(new ListBox(this,WB_DROPDOWN)); + ScopedVclPtr<ListBox> aListBox(new ListBox(this,WB_DROPDOWN)); aListBox->SetPosSizePixel(Point(0,0),Size(100,100)); m_nRowHeight = aListBox->GetSizePixel().Height()+2; SetBackground( pParent->GetBackground() ); diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index c93594bec4ec..96fd15c12e9b 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -98,7 +98,7 @@ namespace pcr if ( !m_pControlWindow ) return; - VclPtr<ComboBox> aComboBox(new ComboBox(m_pControlWindow, WB_DROPDOWN)); + ScopedVclPtr<ComboBox> aComboBox(new ComboBox(m_pControlWindow, WB_DROPDOWN)); aComboBox->SetPosSizePixel(Point(0,0), Size(100,100)); m_pControlWindow->SetSizePixel(aComboBox->GetSizePixel()); 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(), diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 3a847ada9654..c52a9fc10d0d 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -496,7 +496,7 @@ namespace pcr ::std::vector< OUString > aExistentNames; m_pHelper->getAvailableDataTypeNames( aExistentNames ); - VclPtr<NewDataTypeDialog> aDialog(new NewDataTypeDialog( NULL, pType->getName(), aExistentNames ) ); // TODO/eForms: proper parent + ScopedVclPtr<NewDataTypeDialog> aDialog(new NewDataTypeDialog( NULL, pType->getName(), aExistentNames ) ); // TODO/eForms: proper parent if ( aDialog->Execute() != RET_OK ) return false; @@ -535,7 +535,7 @@ namespace pcr // confirmation message OUString sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ).toString() ); sConfirmation = sConfirmation.replaceFirst( "#type#", pType->getName() ); - VclPtr<QueryBox> aQuery(new QueryBox( NULL, WB_YES_NO, sConfirmation ) ); // TODO/eForms: proper parent + ScopedVclPtr<QueryBox> aQuery(new QueryBox( NULL, WB_YES_NO, sConfirmation ) ); // TODO/eForms: proper parent if ( aQuery->Execute() != RET_YES ) return false; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 08ba735e7198..a212c56c4028 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -292,7 +292,7 @@ short SaneDlg::Execute() { if( ! Sane::IsSane() ) { - VclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, SaneResId(STR_COULD_NOT_BE_INIT))); + ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(NULL, SaneResId(STR_COULD_NOT_BE_INIT))); aErrorBox->Execute(); return sal_False; } @@ -575,7 +575,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) aString = aString.replaceFirst( "%s", Sane::GetVendor( mrSane.GetDeviceNumber() ) ); aString = aString.replaceFirst( "%s", Sane::GetModel( mrSane.GetDeviceNumber() ) ); aString = aString.replaceFirst( "%s", Sane::GetType( mrSane.GetDeviceNumber() ) ); - VclPtr<MessageDialog> aInfoBox(new MessageDialog(this, aString, VCL_MESSAGE_INFO)); + ScopedVclPtr<MessageDialog> aInfoBox(new MessageDialog(this, aString, VCL_MESSAGE_INFO)); aInfoBox->Execute(); } else if( pButton == mpPreviewButton ) @@ -604,7 +604,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) x[ i ] = (double)i; mrSane.GetOptionValue( mnCurrentOption, y.get() ); - VclPtr<GridDialog> aGrid(new GridDialog( x.get(), y.get(), nElements, this ) ); + ScopedVclPtr<GridDialog> aGrid(new GridDialog( x.get(), y.get(), nElements, this ) ); aGrid->SetText( mrSane.GetOptionName( mnCurrentOption ) ); aGrid->setBoundings( 0, mfMin, nElements, mfMax ); if( aGrid->Execute() && aGrid->getNewYValues() ) @@ -856,7 +856,7 @@ void SaneDlg::AcquirePreview() if( nOption == -1 ) { OUString aString(SaneResId(STR_SLOW_PREVIEW)); - VclPtr<MessageDialog> aBox(new MessageDialog(this, aString, VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL)); + ScopedVclPtr<MessageDialog> aBox(new MessageDialog(this, aString, VCL_MESSAGE_WARNING, VCL_BUTTONS_OK_CANCEL)); if (aBox->Execute() == RET_CANCEL) return; } @@ -866,7 +866,7 @@ void SaneDlg::AcquirePreview() BitmapTransporter aTransporter; if( ! mrSane.Start( aTransporter ) ) { - VclPtr<MessageDialog> aErrorBox(new MessageDialog(this, SaneResId(STR_ERROR_SCAN))); + ScopedVclPtr<MessageDialog> aErrorBox(new MessageDialog(this, SaneResId(STR_ERROR_SCAN))); aErrorBox->Execute(); } else diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index e93f623a4991..7a1895608d3a 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -299,7 +299,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex ); pHolder->m_bBusy = true; - VclPtr<SaneDlg> aDlg(new SaneDlg(NULL, pHolder->m_aSane, listener.is()) ); + ScopedVclPtr<SaneDlg> aDlg(new SaneDlg(NULL, pHolder->m_aSane, listener.is()) ); bRet = aDlg->Execute(); bScan = aDlg->getDoScan(); pHolder->m_bBusy = false; |