From 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 17 Mar 2015 15:13:34 +0200 Subject: vclwidget: fix more places that should be wrapping in VclPtr Change-Id: I31c9115662da2f81e1b22be91ee58e2862076b8e --- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4 ++-- desktop/source/deployment/gui/dp_gui_service.cxx | 2 +- desktop/source/deployment/gui/license_dialog.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index a0758913e469..bff66f63a4c7 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -571,7 +571,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus ) text = ::comphelper::anyToString( rStatus ); // fallback const SolarMutexGuard aGuard; - const boost::scoped_ptr aBox(new MessageDialog(m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, text)); + VclPtr aBox(new MessageDialog(m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, text)); aBox->Execute(); } ++m_nCurrentProgress; @@ -813,7 +813,7 @@ void ExtensionCmdQueue::Thread::execute() msg = ::comphelper::anyToString(exc); const SolarMutexGuard guard; - boost::scoped_ptr box( + VclPtr box( new MessageDialog(currentCmdEnv->activeDialog(), msg)); if ( m_pDialogHelper ) box->SetText( m_pDialogHelper->getWindow()->GetText() ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 45839a498619..badb58fb02f8 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -223,7 +223,7 @@ void ServiceImpl::startExecuteModal( catch (const Exception & exc) { if (bAppUp) { const SolarMutexGuard guard; - boost::scoped_ptr box( + VclPtr box( new MessageDialog(Application::GetActiveTopWindow(), exc.Message)); box->Execute(); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index c9714195a864..2054b4435465 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -329,7 +329,7 @@ sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception) sal_Int16 LicenseDialog::solar_execute() { - std::unique_ptr dlg( + VclPtr dlg( new LicenseDialogImpl( VCLUnoHelper::GetWindow(m_parent), m_xComponentContext, m_sExtensionName, m_sLicenseText)); -- cgit