diff options
Diffstat (limited to 'include/toolkit/controls')
| -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 |
4 files changed, 5 insertions, 5 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 |