summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 10:01:17 +0200
committerNoel Grandin <noel@peralex.com>2015-03-24 10:31:18 +0200
commit829fa56634414c55a50cda9a74a2683e3e5b822a (patch)
treeb75ba2942f635419c557f4656c26c3d20a19a838
parentd772b9bdc442c767fe99da74df375e5ecf6c8454 (diff)
loplugin:constantfunction: framework
Change-Id: Ib5c85dfb5fd720a1709e37d9f12b43a1588ba058
-rw-r--r--framework/inc/classes/propertysethelper.hxx1
-rw-r--r--framework/inc/uielement/statusbarmanager.hxx1
-rw-r--r--framework/source/fwi/classes/propertysethelper.cxx4
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/substitutepathvars.cxx4
-rw-r--r--framework/source/uielement/statusbar.cxx4
-rw-r--r--framework/source/uielement/statusbarmanager.cxx4
7 files changed, 3 insertions, 17 deletions
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index a81499f5a264..241bfafb8ad1 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -118,7 +118,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
* There is no chance to reactive a "dead" object by calling impl_enablePropertySet()
* again!
*/
- void SAL_CALL impl_enablePropertySet();
void SAL_CALL impl_disablePropertySet();
/**
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 6cd72edc6426..efbe5486b0db 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -79,7 +79,6 @@ class StatusBarManager : public ::cppu::WeakImplHelper3<
void FillStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusBarData );
protected:
- void StateChanged( StateChangedType nType );
void DataChanged( const DataChangedEvent& rDCEvt );
void UserDraw( const UserDrawEvent& rUDEvt );
void Command( const CommandEvent& rEvt );
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index ce83b597c4ec..52b6972ebd41 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -63,10 +63,6 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property
m_lProps[aProperty.Name] = aProperty;
}
-void SAL_CALL PropertySetHelper::impl_enablePropertySet()
-{
-}
-
void SAL_CALL PropertySetHelper::impl_disablePropertySet()
{
TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 7ab2d3a3a976..0b4b48457106 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -852,8 +852,6 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
// So superflous messages are filtered to NULL :-)
implts_startWindowListening();
- impl_enablePropertySet();
-
m_pWindowCommandDispatch = new WindowCommandDispatch(xContext, this);
// Initialize title functionality
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 1e06f28a3b37..33ad8dcc8bb4 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -131,7 +131,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
virtual void ImplCommit() SAL_OVERRIDE;
// Wrapper methods for low-level functions
- OperatingSystem GetOperatingSystem();
+ static OperatingSystem GetOperatingSystem();
const OUString& GetYPDomainName();
const OUString& GetDNSDomainName();
const OUString& GetNTDomainName();
@@ -464,7 +464,7 @@ void SubstitutePathVariables_Impl::ImplCommit()
{
}
-OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
+inline OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
{
#ifdef SOLARIS
return OS_SOLARIS;
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 75d40a2bdeca..9358efe228b2 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -56,10 +56,8 @@ void FrameworkStatusBar::Command( const CommandEvent& rEvt )
m_pMgr->Command( rEvt );
}
-void FrameworkStatusBar::StateChanged( StateChangedType nType )
+void FrameworkStatusBar::StateChanged( StateChangedType )
{
- if ( m_pMgr )
- m_pMgr->StateChanged( nType );
}
void FrameworkStatusBar::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 8728f5b1df4d..d04529352636 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -544,10 +544,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
UpdateControllers();
}
-void StatusBarManager::StateChanged( StateChangedType )
-{
-}
-
void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
{
SolarMutexClearableGuard aGuard;