summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/manager
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /desktop/source/deployment/manager
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/deployment/manager')
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx10
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx16
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx68
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx10
5 files changed, 54 insertions, 54 deletions
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index a57c531d82c6..4b328bf2fdaf 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -53,14 +53,14 @@ BaseCommandEnv::~BaseCommandEnv()
{
}
// XCommandEnvironment
-//______________________________________________________________________________
+
Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler()
throw (uno::RuntimeException)
{
return this;
}
-//______________________________________________________________________________
+
Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler()
throw (uno::RuntimeException)
{
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index d900b2d5ba59..7f52de4726ec 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -161,7 +161,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard()
namespace dp_manager {
-//------------------------------------------------------------------------------
+
//ToDo: bundled extension
ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) :
@@ -176,7 +176,7 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
m_repositoryNames.push_back("bundled");
}
-//------------------------------------------------------------------------------
+
ExtensionManager::~ExtensionManager()
{
@@ -1452,7 +1452,7 @@ sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository)
{
return getPackageManager(repository)->isReadOnly();
}
-//------------------------------------------------------------------------------
+
namespace sdecl = comphelper::service_decl;
sdecl::class_<ExtensionManager> servicePIP;
@@ -1463,7 +1463,7 @@ extern sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.ExtensionManager");
// XModifyBroadcaster
-//______________________________________________________________________________
+
void ExtensionManager::addModifyListener(
Reference<util::XModifyListener> const & xListener )
throw (uno::RuntimeException)
@@ -1472,7 +1472,7 @@ void ExtensionManager::addModifyListener(
rBHelper.addListener( ::getCppuType( &xListener ), xListener );
}
-//______________________________________________________________________________
+
void ExtensionManager::removeModifyListener(
Reference<util::XModifyListener> const & xListener )
throw (uno::RuntimeException)
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index f6f71643c21a..66fd651ca185 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -74,7 +74,7 @@ class PackageInformationProvider :
throw ( uno::RuntimeException );
virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList()
throw ( uno::RuntimeException );
-//---------
+
private:
uno::Reference< uno::XComponentContext> mxContext;
@@ -85,7 +85,7 @@ private:
uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation;
};
-//------------------------------------------------------------------------------
+
PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) :
mxContext( xContext ),
@@ -93,13 +93,13 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo
{
}
-//------------------------------------------------------------------------------
+
PackageInformationProvider::~PackageInformationProvider()
{
}
-//------------------------------------------------------------------------------
+
OUString PackageInformationProvider::getPackageLocation(
const OUString & repository,
const OUString& _rExtensionId )
@@ -134,7 +134,7 @@ OUString PackageInformationProvider::getPackageLocation(
return aLocationURL;
}
-//------------------------------------------------------------------------------
+
OUString SAL_CALL
PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
@@ -158,7 +158,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
return aLocationURL;
}
-//------------------------------------------------------------------------------
+
uno::Sequence< uno::Sequence< OUString > > SAL_CALL
PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
@@ -271,7 +271,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
return aList;
}
-//------------------------------------------------------------------------------
+
uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList()
throw ( uno::RuntimeException )
{
@@ -318,7 +318,7 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::
}
-//------------------------------------------------------------------------------
+
namespace sdecl = comphelper::service_decl;
sdecl::class_<PackageInformationProvider> servicePIP;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 3bc0c7895979..e1d6effae671 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -108,7 +108,7 @@ OUString getExtensionFolder(OUString const & parentFolder,
return title;
}
}
-//______________________________________________________________________________
+
void PackageManagerImpl::initActivationLayer(
Reference<XCommandEnvironment> const & xCmdEnv )
{
@@ -280,7 +280,7 @@ void PackageManagerImpl::initActivationLayer(
}
}
-//______________________________________________________________________________
+
void PackageManagerImpl::initRegistryBackends()
{
if (!m_registryCache.isEmpty())
@@ -326,7 +326,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro )
return bError;
}
-//______________________________________________________________________________
+
Reference<deployment::XPackageManager> PackageManagerImpl::create(
Reference<XComponentContext> const & xComponentContext,
OUString const & context )
@@ -430,12 +430,12 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
}
}
-//______________________________________________________________________________
+
PackageManagerImpl::~PackageManagerImpl()
{
}
-//______________________________________________________________________________
+
void PackageManagerImpl::fireModified()
{
::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
@@ -447,7 +447,7 @@ void PackageManagerImpl::fireModified()
}
}
-//______________________________________________________________________________
+
void PackageManagerImpl::disposing()
{
try {
@@ -475,7 +475,7 @@ void PackageManagerImpl::disposing()
}
// XComponent
-//______________________________________________________________________________
+
void PackageManagerImpl::dispose() throw (RuntimeException)
{
//Do not call check here. We must not throw an exception here if the object
@@ -483,7 +483,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException)
WeakComponentImplHelperBase::dispose();
}
-//______________________________________________________________________________
+
void PackageManagerImpl::addEventListener(
Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
{
@@ -492,7 +492,7 @@ void PackageManagerImpl::addEventListener(
WeakComponentImplHelperBase::addEventListener( xListener );
}
-//______________________________________________________________________________
+
void PackageManagerImpl::removeEventListener(
Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
{
@@ -502,14 +502,14 @@ void PackageManagerImpl::removeEventListener(
}
// XPackageManager
-//______________________________________________________________________________
+
OUString PackageManagerImpl::getContext() throw (RuntimeException)
{
check();
return m_context;
}
-//______________________________________________________________________________
+
Sequence< Reference<deployment::XPackageTypeInfo> >
PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException)
{
@@ -517,7 +517,7 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException)
return m_xRegistry->getSupportedPackageTypes();
}
-//______________________________________________________________________________
+
Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
throw (RuntimeException)
{
@@ -526,7 +526,7 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
}
// XModifyBroadcaster
-//______________________________________________________________________________
+
void PackageManagerImpl::addModifyListener(
Reference<util::XModifyListener> const & xListener )
throw (RuntimeException)
@@ -535,7 +535,7 @@ void PackageManagerImpl::addModifyListener(
rBHelper.addListener( ::getCppuType( &xListener ), xListener );
}
-//______________________________________________________________________________
+
void PackageManagerImpl::removeModifyListener(
Reference<util::XModifyListener> const & xListener )
throw (RuntimeException)
@@ -544,7 +544,7 @@ void PackageManagerImpl::removeModifyListener(
rBHelper.removeListener( ::getCppuType( &xListener ), xListener );
}
-//______________________________________________________________________________
+
OUString PackageManagerImpl::detectMediaType(
::ucbhelper::Content const & ucbContent_, bool throw_exc )
{
@@ -583,7 +583,7 @@ OUString PackageManagerImpl::detectMediaType(
return mediaType;
}
-//______________________________________________________________________________
+
OUString PackageManagerImpl::insertToActivationLayer(
Sequence<beans::NamedValue> const & properties,
OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
@@ -652,7 +652,7 @@ OUString PackageManagerImpl::insertToActivationLayer(
return destFolder;
}
-//______________________________________________________________________________
+
void PackageManagerImpl::insertToActivationLayerDB(
OUString const & id, ActivePackages::Data const & dbData )
{
@@ -661,7 +661,7 @@ void PackageManagerImpl::insertToActivationLayerDB(
m_activePackagesDB->put( id, dbData );
}
-//______________________________________________________________________________
+
/* The function returns true if there is an extension with the same id already
installed which needs to be uninstalled, before the new extension can be installed.
*/
@@ -679,7 +679,7 @@ bool PackageManagerImpl::isInstalled(
}
// XPackageManager
-//______________________________________________________________________________
+
Reference<deployment::XPackage> PackageManagerImpl::importExtension(
Reference<deployment::XPackage> const & extension,
Reference<task::XAbortChannel> const & xAbortChannel,
@@ -850,7 +850,7 @@ void PackageManagerImpl::deletePackageFromCache(
false /* no throw: ignore errors */ );
}
-//______________________________________________________________________________
+
void PackageManagerImpl::removePackage(
OUString const & id, OUString const & fileName,
Reference<task::XAbortChannel> const & /*xAbortChannel*/,
@@ -938,7 +938,7 @@ void PackageManagerImpl::removePackage(
}
}
-//______________________________________________________________________________
+
OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
{
OUStringBuffer buf;
@@ -956,7 +956,7 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
return makeURL( m_activePackages, buf.makeStringAndClear() );
}
-//______________________________________________________________________________
+
Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
OUString const & id, OUString const & fileName,
Reference<XCommandEnvironment> const & xCmdEnv )
@@ -971,7 +971,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
}
-//______________________________________________________________________________
+
Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
OUString const & id, ActivePackages::Data const & data,
Reference<XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms )
@@ -1009,7 +1009,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
return xExtension;
}
-//______________________________________________________________________________
+
Sequence< Reference<deployment::XPackage> >
PackageManagerImpl::getDeployedPackages_(
Reference<XCommandEnvironment> const & xCmdEnv )
@@ -1045,7 +1045,7 @@ PackageManagerImpl::getDeployedPackages_(
return comphelper::containerToSequence(packages);
}
-//______________________________________________________________________________
+
Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
OUString const & id, OUString const & fileName,
Reference<XCommandEnvironment> const & xCmdEnv_ )
@@ -1088,7 +1088,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
}
}
-//______________________________________________________________________________
+
Sequence< Reference<deployment::XPackage> >
PackageManagerImpl::getDeployedPackages(
Reference<task::XAbortChannel> const &,
@@ -1133,7 +1133,7 @@ PackageManagerImpl::getDeployedPackages(
}
}
-//______________________________________________________________________________
+
//ToDo: the function must not call registerPackage, do this in
@@ -1562,12 +1562,12 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
}
-//______________________________________________________________________________
+
PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl()
{
}
-//______________________________________________________________________________
+
PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
Reference<XCommandEnvironment> const & xUserCmdEnv,
Reference<XProgressHandler> const & xLogFile )
@@ -1580,7 +1580,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
}
// XCommandEnvironment
-//______________________________________________________________________________
+
Reference<task::XInteractionHandler>
PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
throw (RuntimeException)
@@ -1588,7 +1588,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
return m_xUserInteractionHandler;
}
-//______________________________________________________________________________
+
Reference<XProgressHandler>
PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
throw (RuntimeException)
@@ -1597,7 +1597,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
}
// XProgressHandler
-//______________________________________________________________________________
+
void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
throw (RuntimeException)
{
@@ -1607,7 +1607,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
m_xUserProgress->push( Status );
}
-//______________________________________________________________________________
+
void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
throw (RuntimeException)
{
@@ -1617,7 +1617,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
m_xUserProgress->update( Status );
}
-//______________________________________________________________________________
+
void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException)
{
if (m_xLogFile.is())
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index e2d1259fd3cc..e23dba62a555 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -74,7 +74,7 @@ extern sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.PackageManagerFactory",
"com.sun.star.comp.deployment.PackageManagerFactory" );
-//______________________________________________________________________________
+
PackageManagerFactoryImpl::PackageManagerFactoryImpl(
Reference<XComponentContext> const & xComponentContext )
: t_pmfac_helper( getMutex() ),
@@ -82,12 +82,12 @@ PackageManagerFactoryImpl::PackageManagerFactoryImpl(
{
}
-//______________________________________________________________________________
+
PackageManagerFactoryImpl::~PackageManagerFactoryImpl()
{
}
-//______________________________________________________________________________
+
inline void PackageManagerFactoryImpl::check()
{
::osl::MutexGuard guard( getMutex() );
@@ -99,7 +99,7 @@ inline void PackageManagerFactoryImpl::check()
}
}
-//______________________________________________________________________________
+
void PackageManagerFactoryImpl::disposing()
{
// dispose all managers:
@@ -118,7 +118,7 @@ void PackageManagerFactoryImpl::disposing()
}
// XPackageManagerFactory
-//______________________________________________________________________________
+
Reference<deployment::XPackageManager>
PackageManagerFactoryImpl::getPackageManager( OUString const & context )
throw (RuntimeException)