diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /extensions/source/propctrlr | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (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 'extensions/source/propctrlr')
-rw-r--r-- | extensions/source/propctrlr/browserline.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/cellbindinghelper.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/composeduiupdate.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/handlerhelper.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/inspectormodelbase.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrcommon.hxx | 18 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/propertyhandler.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/propeventtranslation.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/sqlcommanddesign.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/unourl.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/usercontrol.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/xsddatatypes.hxx | 2 |
15 files changed, 28 insertions, 28 deletions
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 815ac667a006..656d86b94b71 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -75,7 +75,7 @@ namespace pcr { return m_xControl; } - inline vcl::Window* getControlWindow() const + vcl::Window* getControlWindow() const { return m_pControlWindow; } diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 0a79972c71a5..d4c4d820bf35 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -68,7 +68,7 @@ namespace pcr public: explicit StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const OUString& _rCompare ) + bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ); } diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index d4fdcedbdb71..93faf7a5e585 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -140,7 +140,7 @@ namespace pcr private: /// determines whether the instance is already disposed - inline bool impl_isDisposed() const { return m_pCollectedUIs.get() == nullptr; } + bool impl_isDisposed() const { return m_pCollectedUIs.get() == nullptr; } /// throws an exception if the component is already disposed void impl_checkDisposed() const; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 27b00b736e46..fb41f0e1e2f6 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -162,7 +162,7 @@ namespace pcr @param _out_rEvents Takes, the events currently associated with the introspectee */ - inline void impl_getComponentScriptEvents_nothrow( + void impl_getComponentScriptEvents_nothrow( std::vector< css::script::ScriptEventDescriptor >& _out_rEvents ) const { diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 381934abb9c5..5a1b0f71bcc7 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -75,7 +75,7 @@ namespace pcr virtual ~FieldLinkRow() override; virtual void dispose() override; - inline void SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; } + void SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; } enum LinkParticipant { diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 64b0e9fa0484..5d4ad7cbfa43 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -218,7 +218,7 @@ namespace pcr the attributes of the property which should be reflected by a to-be-created <type scope="css::inspection">XPropertyControl</type> */ - inline static bool requiresReadOnlyControl( sal_Int16 _nPropertyAttributes ) + static bool requiresReadOnlyControl( sal_Int16 _nPropertyAttributes ) { return ( _nPropertyAttributes & css::beans::PropertyAttribute::READONLY ) != 0; } diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 1d62e50ce517..59415ab99a03 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -72,10 +72,10 @@ namespace pcr using ::comphelper::OPropertyContainerHelper::getFastPropertyValue; public: - inline bool hasHelpSection() const { return m_bHasHelpSection; } - inline bool isReadOnly() const { return m_bIsReadOnly; } - inline sal_Int32 getMinHelpTextLines() const { return m_nMinHelpTextLines; } - inline sal_Int32 getMaxHelpTextLines() const { return m_nMaxHelpTextLines; } + bool hasHelpSection() const { return m_bHasHelpSection; } + bool isReadOnly() const { return m_bIsReadOnly; } + sal_Int32 getMinHelpTextLines() const { return m_nMinHelpTextLines; } + sal_Int32 getMaxHelpTextLines() const { return m_nMaxHelpTextLines; } css::uno::Reference< css::beans::XPropertySetInfo > getPropertySetInfo(); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index f392508dfcb5..05dada04d7b3 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -80,21 +80,21 @@ namespace pcr typedef css::uno::Sequence< ELEMENT > UnoBase; public: - inline StlSyntaxSequence() : UnoBase() { } - explicit inline StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { } - explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { } + StlSyntaxSequence() : UnoBase() { } + explicit StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { } + explicit StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { } typedef const ELEMENT* const_iterator; typedef ELEMENT* iterator; - inline const_iterator begin() const { return UnoBase::getConstArray(); } - inline const_iterator end() const { return UnoBase::getConstArray() + UnoBase::getLength(); } + const_iterator begin() const { return UnoBase::getConstArray(); } + const_iterator end() const { return UnoBase::getConstArray() + UnoBase::getLength(); } - inline iterator begin() { return UnoBase::getArray(); } - inline iterator end() { return UnoBase::getArray() + UnoBase::getLength(); } + iterator begin() { return UnoBase::getArray(); } + iterator end() { return UnoBase::getArray() + UnoBase::getLength(); } - inline sal_Int32 size() const { return UnoBase::getLength(); } - inline bool empty() const { return UnoBase::getLength() == 0; } + sal_Int32 size() const { return UnoBase::getLength(); } + bool empty() const { return UnoBase::getLength() == 0; } }; diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index f80d19eea8e8..d74d3e915bf6 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -268,7 +268,7 @@ namespace pcr /** determines whether the given property is an actuating property, that is, at least one handler expressed interest in changes to this property's value. */ - inline bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const + bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const { return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() ); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 0a39548df5ab..88c1caecce8d 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -254,7 +254,7 @@ namespace pcr @see getSupportedProperties @see doDescribeSupportedProperties */ - inline bool impl_isSupportedProperty_nothrow( PropertyId _nPropId ) const + bool impl_isSupportedProperty_nothrow( PropertyId _nPropId ) const { return impl_getPropertyFromId_nothrow( _nPropId ) != nullptr; } @@ -277,7 +277,7 @@ namespace pcr /** returns the value of the ContextDocument property in the ComponentContext which was used to create this handler. */ - inline css::uno::Reference< css::frame::XModel > + css::uno::Reference< css::frame::XModel > impl_getContextDocument_nothrow() const { return css::uno::Reference< css::frame::XModel >( diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index 8bd2f51b163d..cddedaa080a6 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -50,7 +50,7 @@ namespace pcr const css::uno::Reference< css::uno::XInterface >& _rxTranslatedEventSource ); - inline const css::uno::Reference< css::beans::XPropertyChangeListener >& + const css::uno::Reference< css::beans::XPropertyChangeListener >& getDelegator() const { return m_xDelegator; } protected: diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 02b9632c7727..1d0903098090 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -82,11 +82,11 @@ namespace pcr /** determines whether the SQL Command designer is currently active, i.e. if there currently exists a frame which allows the user entering the SQL command */ - inline bool isActive() const { return m_xDesigner.is(); } + bool isActive() const { return m_xDesigner.is(); } /** returns the property adapter used by the instance */ - inline const ::rtl::Reference< ISQLCommandAdapter >& getPropertyAdapter() const { return m_xObjectAdapter; } + const ::rtl::Reference< ISQLCommandAdapter >& getPropertyAdapter() const { return m_xObjectAdapter; } /** raises the designer window to top @precond diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index b5f15b64e2db..d85a6935dbad 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -41,7 +41,7 @@ namespace pcr const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ); - inline operator const css::util::URL& () const { return m_aURL; } + operator const css::util::URL& () const { return m_aURL; } }; diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index f6bdffd3f00a..2dde63d403ef 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -66,7 +66,7 @@ namespace pcr virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; virtual css::uno::Type SAL_CALL getValueType() override; - inline void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier ) + void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier ) { getTypedControlWindow()->SetFormatSupplier( _pSupplier ); } diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 76bd10f3a3f9..d6470a1809cd 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -54,7 +54,7 @@ namespace pcr ); /// retrieves the underlying UNO component - inline const css::uno::Reference< css::xsd::XDataType >& + const css::uno::Reference< css::xsd::XDataType >& getUnoDataType() const { return m_xDataType; } /// classifies the data typ |