summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/manager/dp_extensionmanager.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/deployment/manager/dp_extensionmanager.cxx')
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx37
1 files changed, 18 insertions, 19 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index f9232f0e36f1..6c210101fcc0 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -24,14 +24,12 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/bootstrap.hxx>
#include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/deployment/XExtensionManager.hpp>
#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
#include <com/sun/star/deployment/XPackageManager.hpp>
#include <com/sun/star/deployment/XPackage.hpp>
#include <com/sun/star/deployment/InstallException.hpp>
#include <com/sun/star/deployment/VersionException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/beans/Ambiguous.hpp>
@@ -39,11 +37,12 @@
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <comphelper/sequence.hxx>
+#include <utility>
#include <xmlscript/xml_helper.hxx>
#include <osl/diagnose.h>
#include <dp_interact.h>
+#include <dp_misc.h>
#include <dp_ucb.h>
#include <dp_identifier.hxx>
#include <dp_descriptioninfoset.hxx>
@@ -102,7 +101,7 @@ void writeLastModified(OUString & url, Reference<ucb::XCommandEnvironment> const
::rtl::Bootstrap::expandMacros(url);
::ucbhelper::Content ucbStamp(url, xCmdEnv, xContext);
dp_misc::erase_path( url, xCmdEnv );
- OString stamp("1" );
+ OString stamp("1"_ostr );
Reference<css::io::XInputStream> xData(
::xmlscript::createInputStream(
reinterpret_cast<sal_Int8 const *>(stamp.getStr()),
@@ -124,9 +123,9 @@ class ExtensionRemoveGuard
public:
ExtensionRemoveGuard(){};
ExtensionRemoveGuard(
- css::uno::Reference<css::deployment::XPackage> const & extension,
- css::uno::Reference<css::deployment::XPackageManager> const & xPackageManager):
- m_extension(extension), m_xPackageManager(xPackageManager) {}
+ css::uno::Reference<css::deployment::XPackage> extension,
+ css::uno::Reference<css::deployment::XPackageManager> xPackageManager):
+ m_extension(std::move(extension)), m_xPackageManager(std::move(xPackageManager)) {}
~ExtensionRemoveGuard();
void set(css::uno::Reference<css::deployment::XPackage> const & extension,
@@ -156,7 +155,7 @@ namespace dp_manager {
//ToDo: bundled extension
ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) :
- ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager, css::lang::XServiceInfo >(getMutex())
+ ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager, css::lang::XServiceInfo >(m_aMutex)
, m_xContext(xContext)
{
m_xPackageManagerFactory = css::deployment::thePackageManagerFactory::get(m_xContext);
@@ -294,7 +293,7 @@ std::vector<Reference<css::deployment::XPackage> >
std::vector<Reference<css::deployment::XPackage> > extensionList;
Reference<css::deployment::XPackageManager> lRepos[] = {
getUserRepository(), getSharedRepository(), getBundledRepository() };
- for (int i(0); i != SAL_N_ELEMENTS(lRepos); ++i)
+ for (std::size_t i(0); i != std::size(lRepos); ++i)
{
Reference<css::deployment::XPackage> xPackage;
try
@@ -625,7 +624,7 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
static_cast<cppu::OWeakObject*>(this), 0);
//We must make sure that the xTmpExtension is not create twice, because this
//would remove the first one.
- ::osl::MutexGuard addGuard(m_addMutex);
+ std::unique_lock addGuard(m_addMutex);
Reference<css::deployment::XPackageManager> xTmpRepository(getTmpRepository());
// make sure xTmpRepository is alive as long as xTmpExtension is; as
@@ -669,7 +668,7 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
// http://qa.openoffice.org/issues/show_bug.cgi?id=114933
// By not providing xCmdEnv the underlying APIs will throw an exception if
// the XInteractionRequest cannot be handled.
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
if (bCanInstall)
{
@@ -826,7 +825,7 @@ void ExtensionManager::removeExtension(
Reference<css::deployment::XPackage> xExtensionBackup;
Reference<css::deployment::XPackageManager> xPackageManager;
bool bUserDisabled = false;
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
try
{
//Determine the repository to use
@@ -916,7 +915,7 @@ void ExtensionManager::enableExtension(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
bool bUserDisabled = false;
uno::Any excOccurred;
try
@@ -978,7 +977,7 @@ sal_Int32 ExtensionManager::checkPrerequisitesAndEnable(
{
if (!extension.is())
return 0;
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
sal_Int32 ret = 0;
Reference<css::deployment::XPackageManager> mgr =
getPackageManager(extension->getRepositoryName());
@@ -1018,7 +1017,7 @@ void ExtensionManager::disableExtension(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
{
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
uno::Any excOccurred;
bool bUserDisabled = false;
try
@@ -1187,7 +1186,7 @@ void ExtensionManager::reinstallDeployedExtensions(
}
}
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
xPackageManager->reinstallDeployedPackages(
force, xAbortChannel, xCmdEnv);
//We must sync here, otherwise we will get exceptions when extensions
@@ -1235,7 +1234,7 @@ sal_Bool ExtensionManager::synchronize(
{
try
{
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
OUString sSynchronizingShared(StrSyncRepository());
sSynchronizingShared = sSynchronizingShared.replaceAll("%NAME", "shared");
dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
@@ -1369,7 +1368,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses(
{
Reference<css::deployment::XPackageManager>
xPackageManager = getPackageManager(repository);
- ::osl::MutexGuard guard(getMutex());
+ ::osl::MutexGuard guard(m_aMutex);
return xPackageManager->getExtensionsWithUnacceptedLicenses(xCmdEnv);
}
@@ -1398,7 +1397,7 @@ void ExtensionManager::removeModifyListener(
void ExtensionManager::check()
{
- ::osl::MutexGuard guard( getMutex() );
+ ::osl::MutexGuard guard( m_aMutex );
if (rBHelper.bInDispose || rBHelper.bDisposed) {
throw lang::DisposedException(
"ExtensionManager instance has already been disposed!",
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 19:10:30 +0000