desktop/source/deployment/manager/dp_extensionmanager.cxx | 5 ++---
desktop/source/deployment/manager/dp_manager.cxx | 5 ++---
desktop/source/deployment/registry/dp_registry.cxx | 7 +++----
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 6 ++----
desktop/source/migration/services/oo3extensionmigration.cxx | 7 +++----
5 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit f0c0796cb9a1dba9e03f6ce863ac96e596b04981
Author: Noel <noel.gran...@collabora.co.uk>
AuthorDate: Mon Feb 22 10:47:59 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 22 11:08:55 2021 +0100
loplugin:refcounting in desktop
Change-Id: If62998173edb3961beb32de484eba000bd28f4d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111301
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 2a17e2d6860c..63882cefdfd3 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -696,12 +696,11 @@ Reference<css::deployment::XPackage>
ExtensionManager::addExtension(
//check again dependencies but prevent user interaction,
//We can disregard the license, because the user must have
already
//accepted it, when we called checkPrerequisites the first time
- SilentCheckPrerequisitesCommandEnv * pSilentCommandEnv =
+ rtl::Reference<SilentCheckPrerequisitesCommandEnv>
pSilentCommandEnv =
new SilentCheckPrerequisitesCommandEnv();
- Reference<ucb::XCommandEnvironment>
silentCommandEnv(pSilentCommandEnv);
sal_Int32 failedPrereq = xTmpExtension->checkPrerequisites(
- xAbortChannel, silentCommandEnv, true);
+ xAbortChannel, pSilentCommandEnv, true);
if (failedPrereq == 0)
{
xNewExtension = xPackageManager->addPackage(
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 5ff55abe6b33..bd68c26a9512 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -340,9 +340,8 @@ Reference<deployment::XPackageManager>
PackageManagerImpl::create(
Reference<XComponentContext> const & xComponentContext,
OUString const & context )
{
- PackageManagerImpl * that = new PackageManagerImpl(
+ rtl::Reference<PackageManagerImpl> that = new PackageManagerImpl(
xComponentContext, context );
- Reference<deployment::XPackageManager> xPackageManager( that );
OUString logFile, stamp;
if ( context == "user" ) {
@@ -433,7 +432,7 @@ Reference<deployment::XPackageManager>
PackageManagerImpl::create(
that->initRegistryBackends();
that->initActivationLayer( xCmdEnv );
- return xPackageManager;
+ return that;
}
catch (const RuntimeException &) {
diff --git a/desktop/source/deployment/registry/dp_registry.cxx
b/desktop/source/deployment/registry/dp_registry.cxx
index 90248158056a..a061aa4382dc 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -273,8 +273,7 @@ Reference<deployment::XPackageRegistry>
PackageRegistryImpl::create(
OUString const & cachePath,
Reference<XComponentContext> const & xComponentContext )
{
- PackageRegistryImpl * that = new PackageRegistryImpl;
- Reference<deployment::XPackageRegistry> xRet(that);
+ rtl::Reference<PackageRegistryImpl> that = new PackageRegistryImpl;
// auto-detect all registered package registries:
Reference<container::XEnumeration> xEnum(
@@ -325,7 +324,7 @@ Reference<deployment::XPackageRegistry>
PackageRegistryImpl::create(
"cannot instantiate PackageRegistryBackend service: "
+ Reference<lang::XServiceInfo>(
element, UNO_QUERY_THROW )->getImplementationName(),
- static_cast<OWeakObject *>(that) );
+ static_cast<OWeakObject *>(that.get()) );
}
that->insertBackend( xBackend );
@@ -407,7 +406,7 @@ Reference<deployment::XPackageRegistry>
PackageRegistryImpl::create(
}
#endif
- return xRet;
+ return that;
}
// XUpdatable: broadcast to backends
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 916a5882c519..758bdf264a18 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -244,17 +244,15 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
if (create_ucb_content( &ucb_content, sParcelDescURL,
xCmdEnv, false /* no throw */ ))
{
- ParcelDescDocHandler* pHandler =
+ rtl::Reference<ParcelDescDocHandler> pHandler =
new ParcelDescDocHandler();
- Reference< xml::sax::XDocumentHandler >
- xDocHandler = pHandler;
Reference<XComponentContext>
xContext( getComponentContext() );
Reference< xml::sax::XParser > xParser =
xml::sax::Parser::create(xContext);
- xParser->setDocumentHandler( xDocHandler );
+ xParser->setDocumentHandler( pHandler );
xml::sax::InputSource source;
source.aInputStream = ucb_content.openStream();
source.sSystemId = ucb_content.getURL();
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index 6b68272db60a..a3f9e02b6157 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -26,6 +26,7 @@
#include <unotools/textsearch.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <rtl/ref.hxx>
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
@@ -237,14 +238,12 @@ void OO3ExtensionMigration::migrateExtension( const
OUString& sSourceDir )
deployment::ExtensionManager::get( m_ctx ) );
try
{
- TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv();
+ rtl::Reference<TmpRepositoryCommandEnv> pCmdEnv = new
TmpRepositoryCommandEnv();
- uno::Reference< ucb::XCommandEnvironment > xCmdEnv(
- static_cast< cppu::OWeakObject* >( pCmdEnv ), uno::UNO_QUERY );
uno::Reference< task::XAbortChannel > xAbortChannel;
extMgr->addExtension(
sSourceDir, uno::Sequence<beans::NamedValue>(), "user",
- xAbortChannel, xCmdEnv );
+ xAbortChannel, pCmdEnv );
}
catch ( css::uno::Exception & )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
