diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-30 13:32:08 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-01 10:37:02 +0200 |
commit | edc189dbfac35d9a587ec50d0f382bb66444eca8 (patch) | |
tree | 20b6b40033f29410f8545ce83fb574e4ad75e709 | |
parent | d677e27cfa700971cba3dafa7b476a266227a547 (diff) |
loplugin:staticfunction
Change-Id: I89f5984d73e7d42269189dc1d1bc2d59e5ab193f
-rw-r--r-- | include/toolkit/controls/geometrycontrolmodel.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/roadmapcontrol.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/stdtabcontroller.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 4 | ||||
-rw-r--r-- | include/tools/wldcrd.hxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/stdtabcontroller.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tree/treedatamodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 2 | ||||
-rw-r--r-- | tools/source/fsys/wldcrd.cxx | 2 | ||||
-rw-r--r-- | tools/source/inet/inetmsg.cxx | 4 | ||||
-rw-r--r-- | tools/source/ref/errinf.cxx | 4 |
13 files changed, 16 insertions, 16 deletions
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 18c646023609..72fc9ca0edf3 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -83,7 +83,7 @@ namespace com { namespace sun { namespace star { bool m_bCloneable; protected: - ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle) const; + static ::com::sun::star::uno::Any ImplGetDefaultValueByHandle(sal_Int32 nHandle); ::com::sun::star::uno::Any ImplGetPropertyValueByHandle(sal_Int32 nHandle) const; void ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue); diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 1d0f35cde12b..a935bade78eb 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -86,7 +86,7 @@ namespace toolkit void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem ); css::container::ContainerEvent GetContainerEvent(sal_Int32 Index, css::uno::Reference< XInterface > ); void SetRMItemDefaultProperties( const sal_Int32 _Index, css::uno::Reference< XInterface > ); - sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet ); + static sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet ); sal_Int32 GetUniqueID(); diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 789eb7791c72..39dd1173e5df 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -44,7 +44,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ) const; + static bool ImplCreateComponentSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rModels, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& rComponents, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>* pTabStops, bool bPeerComponent ); // if sequence length of rModels is less than rControls, return only the matching elements in rModels sequence and remove corresponding elements from rControls void ImplActivateControl( bool bFirst ) const; diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index eeb02c6b3756..dd872bb44582 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -91,13 +91,13 @@ protected: ) const; /// ensures that two property values in a sequence have a certain order - void ImplEnsureHandleOrder( + static void ImplEnsureHandleOrder( const sal_Int32 _nCount, /// number of entries in the array sal_Int32* _pHandles, /// pointer to the handles ::com::sun::star::uno::Any* _pValues, /// pointer to the values sal_Int32 _nFirstHandle, /// first handle, which should precede _nSecondHandle in the sequence sal_Int32 _nSecondHandle /// second handle, which should supersede _nFirstHandle in the sequence - ) const; + ); protected: #ifdef _MSC_VER diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx index e219edbed779..0e42b43c8502 100644 --- a/include/tools/wldcrd.hxx +++ b/include/tools/wldcrd.hxx @@ -29,7 +29,7 @@ private: OString aWildString; char cSepSymbol; - bool ImpMatch( const char *pWild, const char *pStr ) const; + static bool ImpMatch( const char *pWild, const char *pStr ); public: WildCard() diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 1dce0ddc1cee..22ce65128c78 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -182,7 +182,7 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; - vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits ); + static vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits ); css::uno::Reference< css::awt::XWindowPeer > ImplCreateWindow( const css::awt::WindowDescriptor& Descriptor, WinBits nWinBits ); public: diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 385633e0f73f..f184213d987b 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -182,7 +182,7 @@ } - ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const + ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) { ::com::sun::star::uno::Any aDefault; diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 65ced01f3ee4..313458772584 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -57,7 +57,7 @@ bool StdTabController::ImplCreateComponentSequence( const Sequence< Reference< XControlModel > >& rModels, Sequence< Reference< XWindow > >& rComponents, Sequence< Any>* pTabStops, - bool bPeerComponent ) const + bool bPeerComponent ) { bool bOK = true; diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 3f50b3d081c5..a3e07ff99b5f 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -123,7 +123,7 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; static MutableTreeNode* getImplementation( const Reference< XTreeNode >& xNode, bool bThrows ) throw (IllegalArgumentException); - Reference< XTreeNode > getReference( MutableTreeNode* pNode ) + static Reference< XTreeNode > getReference( MutableTreeNode* pNode ) { return Reference< XTreeNode >( pNode ); } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index d5c10c6c5388..b4b4bc911942 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1364,7 +1364,7 @@ void UnoControlModel::ImplNormalizePropertySequence( const sal_Int32, sal_Int32* } void UnoControlModel::ImplEnsureHandleOrder( const sal_Int32 _nCount, sal_Int32* _pHandles, - uno::Any* _pValues, sal_Int32 _nFirstHandle, sal_Int32 _nSecondHandle ) const + uno::Any* _pValues, sal_Int32 _nFirstHandle, sal_Int32 _nSecondHandle ) { for ( sal_Int32 i=0; i < _nCount; ++_pHandles, ++_pValues, ++i ) { diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index 66425bc910e4..4adfb7c3850e 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -25,7 +25,7 @@ * '?' in pWild mean match exactly one character. * */ -bool WildCard::ImpMatch( const char *pWild, const char *pStr ) const +bool WildCard::ImpMatch( const char *pWild, const char *pStr ) { int pos=0; int flag=0; diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 1198b62d24a8..cbcc7bea9e30 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -597,7 +597,7 @@ void INetMIMEMessage::CopyImp (const INetMIMEMessage& rMsg) if (pChild->pParent == &rMsg) { - pChild = pChild->CreateMessage (*pChild); + pChild = INetMIMEMessage::CreateMessage (*pChild); pChild->pParent = this; } aChildren.push_back( pChild ); @@ -607,7 +607,7 @@ void INetMIMEMessage::CopyImp (const INetMIMEMessage& rMsg) INetMIMEMessage *INetMIMEMessage::CreateMessage ( const INetMIMEMessage& rMsg) const { - return (new INetMIMEMessage (rMsg)); + return new INetMIMEMessage (rMsg); } // Header Field Parser diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 3ab7252def53..0ddbafdbad66 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -51,7 +51,7 @@ class EDcr_Impl sal_uInt16 nMask; void RegisterEDcr(DynamicErrorInfo *); - void UnRegisterEDcr(DynamicErrorInfo *); + static void UnRegisterEDcr(DynamicErrorInfo *); static ErrorInfo *GetDynamicErrorInfo(sal_uIntPtr lId); friend class DynamicErrorInfo; @@ -143,7 +143,7 @@ DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask) DynamicErrorInfo::~DynamicErrorInfo() { - pImpl->UnRegisterEDcr(this); + EDcr_Impl::UnRegisterEDcr(this); delete pImpl; } |