diff options
Diffstat (limited to 'desktop/source/deployment/gui')
3 files changed, 16 insertions, 16 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index d2fca9d95e03..95cb874f1ca9 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -844,7 +844,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv uno::Any anyTitle; try { - anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv.get(), m_xContext ).getPropertyValue( "Title" ); + anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv, m_xContext ).getPropertyValue( "Title" ); } catch ( const uno::Exception & ) { @@ -868,7 +868,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv try { xExtMgr->addExtension(rPackageURL, uno::Sequence<beans::NamedValue>(), - rRepository, xAbortChannel, rCmdEnv.get() ); + rRepository, xAbortChannel, rCmdEnv ); } catch ( const ucb::CommandFailedException & ) { @@ -897,7 +897,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE OUString id( dp_misc::getIdentifier( xPackage ) ); try { - xExtMgr->removeExtension( id, xPackage->getName(), xPackage->getRepositoryName(), xAbortChannel, rCmdEnv.get() ); + xExtMgr->removeExtension( id, xPackage->getName(), xPackage->getRepositoryName(), xAbortChannel, rCmdEnv ); } catch ( const deployment::DeploymentException & ) {} @@ -985,7 +985,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdE try { - xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv.get() ); + xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv ); if ( m_pDialogHelper ) m_pDialogHelper->updatePackageInfo( xPackage ); } @@ -1009,7 +1009,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmd try { - xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv.get() ); + xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv ); if ( m_pDialogHelper ) m_pDialogHelper->updatePackageInfo( xPackage ); } @@ -1033,7 +1033,7 @@ void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv try { - xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel, rCmdEnv.get() ); + xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel, rCmdEnv ); if ( m_pDialogHelper ) m_pDialogHelper->updatePackageInfo( xPackage ); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index ed6ed79fd256..980e086ebc69 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -230,7 +230,7 @@ ExtensionBox_Impl::~ExtensionBox_Impl() for (auto const& entry : m_vEntries) { - entry->m_xPackage->removeEventListener( m_xRemoveListener.get() ); + entry->m_xPackage->removeEventListener( m_xRemoveListener ); } m_vEntries.clear(); @@ -884,7 +884,7 @@ void ExtensionBox_Impl::addEventListenerOnce( if ( std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(), FindWeakRef(extension)) ) { - extension->addEventListener( m_xRemoveListener.get() ); + extension->addEventListener( m_xRemoveListener ); m_vListenerAdded.emplace_back(extension); } } @@ -996,7 +996,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage // the entry will be moved into the m_vRemovedEntries list which will be // cleared on the next paint event m_vRemovedEntries.push_back( *iIndex ); - (*iIndex)->m_xPackage->removeEventListener(m_xRemoveListener.get()); + (*iIndex)->m_xPackage->removeEventListener(m_xRemoveListener); m_vEntries.erase( iIndex ); m_bNeedsRecalc = true; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 5983313de51b..bda1b1678190 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -305,7 +305,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() m_sDownloadFolder = destFolder; try { - dp_misc::create_folder(nullptr, destFolder, m_updateCmdEnv.get() ); + dp_misc::create_folder(nullptr, destFolder, m_updateCmdEnv ); } catch (const css::uno::Exception & e) { css::uno::Any anyEx = cppu::getCaughtException(); @@ -445,11 +445,11 @@ void UpdateInstallDialog::Thread::installExtensions() if (!updateData.bIsShared) xExtension = m_dialog.getExtensionManager()->addExtension( updateData.sLocalURL, css::uno::Sequence<css::beans::NamedValue>(&prop, 1), - "user", xAbortChannel, m_updateCmdEnv.get()); + "user", xAbortChannel, m_updateCmdEnv); else xExtension = m_dialog.getExtensionManager()->addExtension( updateData.sLocalURL, css::uno::Sequence<css::beans::NamedValue>(&prop, 1), - "shared", xAbortChannel, m_updateCmdEnv.get()); + "shared", xAbortChannel, m_updateCmdEnv); } else if (updateData.aUpdateSource.is()) { @@ -462,11 +462,11 @@ void UpdateInstallDialog::Thread::installExtensions() if (!updateData.bIsShared) xExtension = m_dialog.getExtensionManager()->addExtension( updateData.aUpdateSource->getURL(), css::uno::Sequence<css::beans::NamedValue>(&prop, 1), - "user", xAbortChannel, m_updateCmdEnv.get()); + "user", xAbortChannel, m_updateCmdEnv); else xExtension = m_dialog.getExtensionManager()->addExtension( updateData.aUpdateSource->getURL(), css::uno::Sequence<css::beans::NamedValue>(&prop, 1), - "shared", xAbortChannel, m_updateCmdEnv.get()); + "shared", xAbortChannel, m_updateCmdEnv); } } catch (css::deployment::DeploymentException & de) @@ -554,10 +554,10 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ) + "_"; ::ucbhelper::Content destFolderContent; - dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv.get() ); + dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv ); ::ucbhelper::Content sourceContent; - (void)dp_misc::create_ucb_content(&sourceContent, sDownloadURL, m_updateCmdEnv.get()); + (void)dp_misc::create_ucb_content(&sourceContent, sDownloadURL, m_updateCmdEnv); const OUString sTitle( StrTitle::getTitle( sourceContent ) ); |