summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-07 13:16:24 +0200
committerNoel Grandin <noel@peralex.com>2015-04-09 10:13:18 +0200
commit35163715ead39eece619a5790903c88fa4216ec6 (patch)
tree68f657e8f4137d234d1b6b32835e3ff540b4b01a /desktop
parente68c699b7e7efdf3678b450124b9e08ee227ddb9 (diff)
loplugin:staticmethods
Change-Id: Ie348778ea666c24e95e048386547f301083a0017
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/app.hxx22
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.hxx4
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx4
-rw-r--r--desktop/source/deployment/manager/dp_manager.h2
-rw-r--r--desktop/source/deployment/manager/dp_properties.hxx2
-rw-r--r--desktop/source/migration/migration.cxx2
-rw-r--r--desktop/source/migration/migration_impl.hxx20
-rw-r--r--desktop/source/splash/splash.cxx2
14 files changed, 39 insertions, 39 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 22c40f804180..4a98c6e8afac 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -89,7 +89,7 @@ class Desktop : public Application
static ResMgr* GetDesktopResManager();
static CommandLineArgs& GetCommandLineArgs();
- void HandleBootstrapErrors(
+ static void HandleBootstrapErrors(
BootstrapError nError, OUString const & aMessage );
void SetBootstrapError(
BootstrapError nError, OUString const & aMessage )
@@ -127,21 +127,21 @@ class Desktop : public Application
private:
void RegisterServices(
css::uno::Reference< css::uno::XComponentContext > const & context);
- void DeregisterServices();
+ static void DeregisterServices();
- void CreateTemporaryDirectory();
- void RemoveTemporaryDirectory();
+ static void CreateTemporaryDirectory();
+ static void RemoveTemporaryDirectory();
bool InitializeInstallation( const OUString& rAppFilename );
- bool InitializeConfiguration();
- void FlushConfiguration();
- bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ static bool InitializeConfiguration();
+ static void FlushConfiguration();
+ static bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
+ static void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
void StartSetup( const OUString& aParameters );
// Create a error message depending on bootstrap failure code and an optional file url
- OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
+ static OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
const OUString& aFileURL );
static void PreloadModuleData( const CommandLineArgs& );
@@ -151,7 +151,7 @@ class Desktop : public Application
void OpenSplashScreen();
void CloseSplashScreen();
- void EnableOleAutomation();
+ static void EnableOleAutomation();
DECL_LINK( ImplInitFilterHdl, ConvertData* );
DECL_LINK( AsyncInitFirstRun, void* );
/** checks if the office is run the first time
@@ -161,7 +161,7 @@ class Desktop : public Application
void CheckFirstRun( );
/// does initializations which are necessary for the first run of the office
- void DoFirstRunInitializations();
+ static void DoFirstRunInitializations();
static void ShowBackingComponent(Desktop * progress);
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9756394a92a8..d0e5324e0165 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1728,7 +1728,7 @@ bool Desktop::InitializeConfiguration()
}
catch( ::com::sun::star::lang::ServiceNotRegisteredException & e )
{
- this->HandleBootstrapErrors(
+ HandleBootstrapErrors(
Desktop::BE_UNO_SERVICE_CONFIG_MISSING, e.Message );
}
catch( const ::com::sun::star::configuration::MissingBootstrapFileException& e )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5fc63464f902..bd2392093047 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1142,7 +1142,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
bool ExtMgrDialog::Close()
{
- bool bRet = m_pManager->queryTermination();
+ bool bRet = TheExtensionManager::queryTermination();
if ( bRet )
{
bRet = ModelessDialog::Close();
@@ -1477,7 +1477,7 @@ bool UpdateRequiredDialog::Close()
// Check dependencies of all packages
-bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage ) const
+bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage )
{
bool bRegistered = false;
try {
@@ -1505,7 +1505,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage
}
// Checks the dependencies no matter if the extension is enabled or disabled!
-bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::XPackage > &xPackage ) const
+bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::XPackage > &xPackage )
{
bool bDependenciesValid = false;
try {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index f83fd2973e18..0db6be025f18 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -204,8 +204,8 @@ class UpdateRequiredDialog : public ModalDialog,
DECL_DLLPRIVATE_LINK( startProgress, void * );
DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
- bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
- bool checkDependencies( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
+ static bool isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+ static bool checkDependencies( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
bool hasActiveEntries();
void disableAllEntries();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 11580877ea20..260100f3ca03 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -995,7 +995,7 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
bool bLicenseMissing )
{
long nPos = 0;
- PackageState eState = m_pManager->getPackageState( xPackage );
+ PackageState eState = TheExtensionManager::getPackageState( xPackage );
bool bLocked = m_pManager->isReadOnly( xPackage );
TEntry_Impl pEntry( new Entry_Impl( xPackage, eState, bLocked ) );
@@ -1054,7 +1054,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage
{
if ( (*iIndex)->m_xPackage == xPackage )
{
- PackageState eState = m_pManager->getPackageState( xPackage );
+ PackageState eState = TheExtensionManager::getPackageState( xPackage );
(*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );
(*iIndex)->m_eState = eState;
(*iIndex)->m_sTitle = xPackage->getDisplayName();
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index b8b5ba94e6e5..f3584d043640 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -318,7 +318,7 @@ void TheExtensionManager::createPackageList()
}
-PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage ) const
+PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage )
{
try {
beans::Optional< beans::Ambiguous< sal_Bool > > option(
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index f5e1665e31a4..67836b2223d3 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -85,12 +85,12 @@ public:
bool installPackage( const OUString &rPackageURL, bool bWarnUser = false );
void createPackageList();
- bool queryTermination();
+ static bool queryTermination();
void terminateDialog();
// Tools
bool supportsOptions( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
- PackageState getPackageState( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
+ static PackageState getPackageState( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const { return m_xContext; }
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; }
bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index cf61aec9c088..5aed75e42d47 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -79,7 +79,7 @@ struct CompIdentifiers
return false;
}
- OUString getName(::std::vector<Reference<css::deployment::XPackage> > const & a);
+ static OUString getName(::std::vector<Reference<css::deployment::XPackage> > const & a);
};
OUString CompIdentifiers::getName(::std::vector<Reference<css::deployment::XPackage> > const & a)
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 32856ca68f2e..47a3e963292c 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -233,7 +233,7 @@ private:
bool isUserDisabled(OUString const & identifier,
OUString const & filename);
- bool isUserDisabled(
+ static bool isUserDisabled(
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExtSameId);
void activateExtension(
@@ -243,7 +243,7 @@ private:
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
- void activateExtension(
+ static void activateExtension(
css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExt,
bool bUserDisabled, bool bStartup,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 168225de50d7..e90ab8d55a70 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -72,7 +72,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
void insertToActivationLayerDB(
OUString const & id, ActivePackages::Data const & dbData );
- void deletePackageFromCache(
+ static void deletePackageFromCache(
css::uno::Reference<css::deployment::XPackage> const & xPackage,
OUString const & destFolder );
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index c342859848c0..b8f059fa7043 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -43,7 +43,7 @@ protected:
::boost::optional< OUString> m_prop_suppress_license;
::boost::optional< OUString> m_prop_extension_update;
- OUString getPropertyValue(css::beans::NamedValue const & v);
+ static OUString getPropertyValue(css::beans::NamedValue const & v);
public:
virtual ~ExtensionProperties() {};
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 15d3b5b6ca0e..93ebeb1a697f 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -634,7 +634,7 @@ sal_Int32 MigrationImpl::findPreferredMigrationProcess(const migrations_availabl
return nIndex;
}
-strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const
+strings_vr MigrationImpl::applyPatterns(const strings_v& vSet, const strings_v& vPatterns)
{
using namespace utl;
strings_vr vrResult(new strings_v);
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 4ab670887080..6b0fc45728a1 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -197,21 +197,21 @@ private:
OUString m_sModuleIdentifier;
// functions to control the migration process
- bool readAvailableMigrations(migrations_available&);
+ static bool readAvailableMigrations(migrations_available&);
bool alreadyMigrated();
- migrations_vr readMigrationSteps(const OUString& rMigrationName);
+ static migrations_vr readMigrationSteps(const OUString& rMigrationName);
sal_Int32 findPreferredMigrationProcess(const migrations_available&);
#if defined UNX && ! defined MACOSX
- OUString preXDGConfigDir(const OUString& rConfigDir);
+ static OUString preXDGConfigDir(const OUString& rConfigDir);
#endif
- void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion);
- install_info findInstallation(const strings_v& rVersions);
+ static void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion);
+ static install_info findInstallation(const strings_v& rVersions);
strings_vr compileFileList();
// helpers
strings_vr getAllFiles(const OUString& baseURL) const;
- strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
- css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
+ static strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns);
+ static css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const OUString& sParentNodeName,
@@ -227,10 +227,10 @@ private:
void copyFiles();
void copyConfig();
void runServices();
- void refresh();
+ static void refresh();
- void setMigrationCompleted();
- bool checkMigrationCompleted();
+ static void setMigrationCompleted();
+ static bool checkMigrationCompleted();
public:
MigrationImpl();
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 2649c24c0307..f2303725b71c 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -58,7 +58,7 @@ private:
void loadConfig();
void updateStatus();
void SetScreenBitmap(BitmapEx &rBitmap);
- void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
+ static void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static osl::Mutex _aMutex;