summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /forms
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff)
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/GroupManager.hxx4
-rw-r--r--forms/source/component/ImageControl.hxx2
-rw-r--r--forms/source/component/clickableimage.hxx6
-rw-r--r--forms/source/component/entrylisthelper.hxx6
-rw-r--r--forms/source/inc/FormComponent.hxx24
-rw-r--r--forms/source/inc/listenercontainers.hxx8
-rw-r--r--forms/source/richtext/featuredispatcher.hxx8
-rw-r--r--forms/source/richtext/richtextengine.hxx2
-rw-r--r--forms/source/richtext/richtextimplcontrol.hxx10
-rw-r--r--forms/source/richtext/richtextviewport.hxx4
-rw-r--r--forms/source/runtime/formoperations.hxx10
-rw-r--r--forms/source/solar/inc/navtoolbar.hxx2
-rw-r--r--forms/source/xforms/datatypes.hxx2
-rw-r--r--forms/source/xforms/propertysetbase.hxx8
14 files changed, 48 insertions, 48 deletions
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index aea4379fd8be..35b2faabc0a3 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -103,8 +103,8 @@ public:
bool operator==( const OGroupComp& rComp ) const;
- inline const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; }
- inline const css::uno::Reference< css::awt::XControlModel>& GetControlModel() const { return m_xControlModel; }
+ const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; }
+ const css::uno::Reference< css::awt::XControlModel>& GetControlModel() const { return m_xControlModel; }
sal_Int32 GetPos() const { return m_nPos; }
sal_Int16 GetTabIndex() const { return m_nTabIndex; }
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 724d00429d65..e7e297f50473 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -59,7 +59,7 @@ protected:
// UNO Anbindung
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
- inline ImageProducer* GetImageProducer() { return m_xImageProducer.get(); }
+ ImageProducer* GetImageProducer() { return m_xImageProducer.get(); }
public:
DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel );
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 539da5b2d518..15446e98fe0d 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -78,7 +78,7 @@ namespace frm
DECL_LINK( DownloadDoneLink, void*, void );
- inline ImageProducer* GetImageProducer() { return m_xProducer.get(); }
+ ImageProducer* GetImageProducer() { return m_xProducer.get(); }
void StartProduction();
void SetURL(const OUString& rURL);
@@ -86,8 +86,8 @@ namespace frm
void DownloadDone();
css::uno::Sequence< css::uno::Type> _getTypes() override;
- inline bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
- inline void setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
+ bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
+ void setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
public:
OClickableImageBaseModel(
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 3ad407c6fea7..b8e3e6504d9e 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -65,15 +65,15 @@ namespace frm
virtual ~OEntryListHelper( );
/// returns the current string item list
- inline const std::vector< OUString >&
+ const std::vector< OUString >&
getStringItemList() const { return m_aStringItems; }
/// returns the current typed item list
- inline const css::uno::Sequence< css::uno::Any >&
+ const css::uno::Sequence< css::uno::Any >&
getTypedItemList() const { return m_aTypedItems; }
/// determines whether we actually have an external list source
- inline bool hasExternalListSource( ) const { return m_xListSource.is(); }
+ bool hasExternalListSource( ) const { return m_xListSource.is(); }
/** handling the XEventListener::disposing call for the case where
our list source is being disposed
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 9009c305f334..9259abf13519 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -117,7 +117,7 @@ namespace frm
inline void acquire();
inline void release();
- inline OControlModel& getModel() const { return m_rModel; };
+ OControlModel& getModel() const { return m_rModel; };
/** adds a property change notification, which is to be fired when the last lock on the model
(in the current thread) is released.
@@ -496,7 +496,7 @@ public:
LockAccess
);
- inline ::osl::Mutex&
+ ::osl::Mutex&
getInstanceMutex() { return m_aMutex; }
};
@@ -630,10 +630,10 @@ protected:
m_xColumn;
protected:
- inline sal_Int32 getValuePropertyAggHandle( ) const { return m_nValuePropertyAggregateHandle; }
- inline const OUString& getControlSource( ) const { return m_aControlSource; }
- inline bool isRequired() const { return m_bRequired; }
- inline bool isLoaded() const { return m_bLoaded; }
+ sal_Int32 getValuePropertyAggHandle( ) const { return m_nValuePropertyAggregateHandle; }
+ const OUString& getControlSource( ) const { return m_aControlSource; }
+ bool isRequired() const { return m_bRequired; }
+ bool isLoaded() const { return m_bLoaded; }
protected:
@@ -939,11 +939,11 @@ protected:
void impl_setField_noNotify(
const css::uno::Reference< css::beans::XPropertySet>& _rxField
);
- inline bool hasField() const
+ bool hasField() const
{
return m_xField.is();
}
- inline sal_Int32 getFieldType() const
+ sal_Int32 getFieldType() const
{
return m_nFieldType;
}
@@ -954,7 +954,7 @@ protected:
) const override;
public:
- inline const css::uno::Reference< css::beans::XPropertySet>& getField() const
+ const css::uno::Reference< css::beans::XPropertySet>& getField() const
{
return m_xField;
}
@@ -1046,10 +1046,10 @@ protected:
_propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override;
/// checks whether we currently have an external value binding in place
- inline bool hasExternalValueBinding() const { return m_xExternalBinding.is(); }
+ bool hasExternalValueBinding() const { return m_xExternalBinding.is(); }
// checks whether we currently have an external validator
- inline bool hasValidator() const { return m_xValidator.is(); }
+ bool hasValidator() const { return m_xValidator.is(); }
/** transfers the very current value of the db column we're bound to the control
@precond
@@ -1133,7 +1133,7 @@ private:
*/
void doFormListening( const bool _bStart );
- inline bool isFormListening() const { return m_bFormListening; }
+ bool isFormListening() const { return m_bFormListening; }
/** determines the new value of m_xAmbientForm
*/
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index e46443dbc0d1..7e67fa0c7f67 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -39,20 +39,20 @@ namespace frm
::cppu::OWeakObject& m_rInstigator;
protected:
- inline EventListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
+ EventListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
:EventListeners_Base( _rMutex )
,m_rInstigator( _rInstigator )
{
}
public:
- inline bool notify()
+ bool notify()
{
css::lang::EventObject aEvent( m_rInstigator );
return EventListeners_Base::notify( aEvent );
}
- inline void disposing()
+ void disposing()
{
css::lang::EventObject aEvent( m_rInstigator );
EventListeners_Base::disposing( aEvent );
@@ -75,7 +75,7 @@ namespace frm
NotificationType m_eCurrentNotificationType;
public:
- inline ResetListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
+ ResetListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
:ResetListeners_Base( _rInstigator, _rMutex )
,m_eCurrentNotificationType( eApproval )
{
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index 423f88bb5db0..29ca81517ca9 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -48,10 +48,10 @@ namespace frm
const EditView* getEditView() const { return m_pEditView; }
protected:
- inline const css::util::URL& getFeatureURL() const { return m_aFeatureURL; }
- inline ::comphelper::OInterfaceContainerHelper2& getStatusListeners() { return m_aStatusListeners; }
- inline bool isDisposed() const { return m_bDisposed; }
- inline void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); }
+ const css::util::URL& getFeatureURL() const { return m_aFeatureURL; }
+ ::comphelper::OInterfaceContainerHelper2& getStatusListeners() { return m_aStatusListeners; }
+ bool isDisposed() const { return m_bDisposed; }
+ void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); }
protected:
ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL );
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index fe63d014d81c..a6ce40624793 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -55,7 +55,7 @@ namespace frm
void registerEngineStatusListener( IEngineStatusListener* _pListener );
void revokeEngineStatusListener( IEngineStatusListener* _pListener );
- inline SfxItemPool* getPool() { return m_pEnginePool; }
+ SfxItemPool* getPool() { return m_pEnginePool; }
protected:
/** constructs a new RichTextEngine. The instances takes the ownership of the given SfxItemPool
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 4f3a94764842..c61c473c9100 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -65,9 +65,9 @@ namespace frm
public:
struct GrantAccess { friend class RichTextControl; private: GrantAccess() { } };
- inline EditView* getView( const GrantAccess& ) const { return m_pView; }
- inline RichTextEngine* getEngine( const GrantAccess& ) const { return m_pEngine; }
- inline vcl::Window* getViewport( const GrantAccess& ) const { return m_pViewport; }
+ EditView* getView( const GrantAccess& ) const { return m_pView; }
+ RichTextEngine* getEngine( const GrantAccess& ) const { return m_pEngine; }
+ vcl::Window* getViewport( const GrantAccess& ) const { return m_pViewport; }
public:
RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine,
@@ -166,8 +166,8 @@ namespace frm
/// ensures that our "automatic line break" setting matches the current WinBits of the window
void ensureLineBreakSetting();
- inline bool hasVScrollBar( ) const { return m_pVScroll != nullptr; }
- inline bool hasHScrollBar( ) const { return m_pHScroll != nullptr; }
+ bool hasVScrollBar( ) const { return m_pVScroll != nullptr; }
+ bool hasHScrollBar( ) const { return m_pHScroll != nullptr; }
// IEngineStatusListener overridables
virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) override;
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index ec488e6b8b2d..47520922b6cf 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -37,7 +37,7 @@ namespace frm
void setView( EditView& _rView );
- inline void setAttributeInvalidationHandler( const Link<LinkParamNone*,void>& _rHandler ) { m_aInvalidationHandler = _rHandler; }
+ void setAttributeInvalidationHandler( const Link<LinkParamNone*,void>& _rHandler ) { m_aInvalidationHandler = _rHandler; }
void SetHideInactiveSelection( bool _bHide );
bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; }
@@ -52,7 +52,7 @@ namespace frm
virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override;
private:
- inline void implInvalidateAttributes() const
+ void implInvalidateAttributes() const
{
m_aInvalidationHandler.Call( nullptr );
}
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 29b2e04d5b73..0f09ba2591e1 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -80,7 +80,7 @@ namespace frm
struct MethodAccess { friend class MethodGuard; private: MethodAccess() { } };
- inline void enterMethod( MethodAccess ) const
+ void enterMethod( MethodAccess ) const
{
m_aMutex.acquire();
impl_checkDisposed_throw();
@@ -89,7 +89,7 @@ namespace frm
#endif
}
- inline void leaveMethod( MethodAccess ) const
+ void leaveMethod( MethodAccess ) const
{
m_aMutex.release();
#ifdef DBG_UTIL
@@ -228,7 +228,7 @@ namespace frm
impl_getCurrentControlModel_throw() const;
/// determines if we have a valid cursor
- inline bool impl_hasCursor_nothrow() const { return m_xCursorProperties.is(); }
+ bool impl_hasCursor_nothrow() const { return m_xCursorProperties.is(); }
/** determines the model position from a grid control column's view position
@@ -349,12 +349,12 @@ namespace frm
m_rOwner.enterMethod( FormOperations::MethodAccess() );
}
- inline ~MethodGuard()
+ ~MethodGuard()
{
clear();
}
- inline void clear()
+ void clear()
{
if ( !m_bCleared )
m_rOwner.leaveMethod( FormOperations::MethodAccess() );
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 5adae53dae9b..b8fb4f6030b7 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -95,7 +95,7 @@ namespace frm
/** retrieves the current image size
*/
- inline ImageSize GetImageSize( ) const { return m_eImageSize; }
+ ImageSize GetImageSize( ) const { return m_eImageSize; }
/** sets the size of the images
*/
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index db20dfb758c0..7c84694eabcc 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -207,7 +207,7 @@ namespace xforms
{
protected:
typedef VALUE_TYPE ValueType;
- inline const css::uno::Type&
+ const css::uno::Type&
getCppuType() const { return cppu::UnoType<ValueType>::get(); }
protected:
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index a02a6a7e00bc..04dfa535879b 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -269,14 +269,14 @@ public:
one previously registered via <member>registerProperty</member>.
@see registerProperty
*/
- inline void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
+ void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
{
getFastPropertyValue( rValue, nHandle );
}
/** notifies a change in a given property to all interested listeners
*/
- inline void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
+ void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
{
const_cast< PropertySetBase* >( this )->firePropertyChange( nHandle, rNewValue, rOldValue );
}
@@ -325,13 +325,13 @@ public:
the handle of the property which is going to be changed. Must be a valid property
handle for the given <arg>rPropertySet</arg>
*/
- inline PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
+ PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
:m_rPropertySet( rPropertySet )
,m_nHandle( nHandle )
{
m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, m_aOldValue, PropertySetBase::NotifierAccess() );
}
- inline ~PropertyChangeNotifier()
+ ~PropertyChangeNotifier()
{
css::uno::Any aNewValue;
m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, aNewValue, PropertySetBase::NotifierAccess() );