diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-07 13:16:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-09 10:13:18 +0200 |
commit | 35163715ead39eece619a5790903c88fa4216ec6 (patch) | |
tree | 68f657e8f4137d234d1b6b32835e3ff540b4b01a /desktop/source/deployment/gui | |
parent | e68c699b7e7efdf3678b450124b9e08ee227ddb9 (diff) |
loplugin:staticmethods
Change-Id: Ie348778ea666c24e95e048386547f301083a0017
Diffstat (limited to 'desktop/source/deployment/gui')
5 files changed, 10 insertions, 10 deletions
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; |