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 /uui | |
| parent | 3bf4ada33f09e155f3350602e7a4b6cec77e40f0 (diff) | |
convert ScopedVclPtr to ScopedVclPtrInstance
Change-Id: I22a9d9c313a81ccee885b9c8785d4b008a6f2058
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-filter.cxx | 2 | ||||
| -rw-r--r-- | uui/source/iahndl-locking.cxx | 6 | ||||
| -rw-r--r-- | uui/source/iahndl-ssl.cxx | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index a8d6c8d9625d..710cd8ae545c 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -55,7 +55,7 @@ executeFilterDialog( { SolarMutexGuard aGuard; - ScopedVclPtr< uui::FilterDialog > xDialog(new uui::FilterDialog(pParent)); + ScopedVclPtrInstance< uui::FilterDialog > xDialog(pParent); xDialog->SetURL(rURL); xDialog->ChangeFilters(&rFilters); diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index ad9ddb700142..aac4cd87c960 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -93,8 +93,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); - ScopedVclPtr< OpenLockedQueryBox > xDialog(new OpenLockedQueryBox( - pParent, xManager.get(), aMessage ) ); + ScopedVclPtrInstance< OpenLockedQueryBox > xDialog(pParent, xManager.get(), aMessage); nResult = xDialog->Execute(); } else if ( nMode == UUI_DOC_SAVE_LOCK ) @@ -107,8 +106,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); - ScopedVclPtr< TryLaterQueryBox > xDialog( - new TryLaterQueryBox( pParent, xManager.get(), aMessage ) ); + ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage ); nResult = xDialog->Execute(); } else if ( nMode == UUI_DOC_OWN_LOAD_LOCK || diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 0e12165b2de5..e42ed909b5b2 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -145,7 +145,7 @@ executeUnknownAuthDialog( { SolarMutexGuard aGuard; - ScopedVclPtr< UnknownAuthDialog > xDialog(new UnknownAuthDialog(pParent, rXCert, xContext)); + ScopedVclPtrInstance< UnknownAuthDialog > xDialog(pParent, rXCert, xContext); // Get correct resource string OUString aMessage; @@ -186,7 +186,7 @@ executeSSLWarnDialog( { SolarMutexGuard aGuard; - ScopedVclPtr< SSLWarnDialog > xDialog(new SSLWarnDialog(pParent, rXCert, xContext)); + ScopedVclPtrInstance< SSLWarnDialog > xDialog(pParent, rXCert, xContext); // Get correct resource string OUString aMessage_1; |