summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-30 13:32:08 +0200
committerNoel Grandin <noel@peralex.com>2015-04-01 10:37:02 +0200
commitedc189dbfac35d9a587ec50d0f382bb66444eca8 (patch)
tree20b6b40033f29410f8545ce83fb574e4ad75e709 /include
parentd677e27cfa700971cba3dafa7b476a266227a547 (diff)
loplugin:staticfunction
Change-Id: I89f5984d73e7d42269189dc1d1bc2d59e5ab193f
Diffstat (limited to 'include')
-rw-r--r--include/toolkit/controls/geometrycontrolmodel.hxx2
-rw-r--r--include/toolkit/controls/roadmapcontrol.hxx2
-rw-r--r--include/toolkit/controls/stdtabcontroller.hxx2
-rw-r--r--include/toolkit/controls/unocontrolmodel.hxx4
-rw-r--r--include/tools/wldcrd.hxx2
5 files changed, 6 insertions, 6 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()