diff options
Diffstat (limited to 'include')
194 files changed, 880 insertions, 884 deletions
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 4855e0973350..90127f28a1e9 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -272,7 +272,7 @@ public: bool IsBroadcaster() const { return pCst != nullptr; } virtual void Broadcast( SfxHintId nHintId ) override; - inline const SbxObject* GetParent() const { return pParent; } + const SbxObject* GetParent() const { return pParent; } SbxObject* GetParent() { return pParent;} virtual void SetParent( SbxObject* ); diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 06f026fc0532..8d9b6084ec26 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -57,7 +57,7 @@ public: const StringVector& getInputFiles() { return m_inputFiles;} - inline const StringVector& getExtraInputFiles() const + const StringVector& getExtraInputFiles() const { return m_extra_input_files; } protected: ::rtl::OString m_program; diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h index 6e3d53b43c79..0a5f595cbb9d 100644 --- a/include/com/sun/star/uno/Any.h +++ b/include/com/sun/star/uno/Any.h @@ -54,13 +54,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Any : public uno_Any public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -144,13 +144,13 @@ public: @return a Type object of the set value */ - inline const Type & SAL_CALL getValueType() const + const Type & SAL_CALL getValueType() const { return * reinterpret_cast< const Type * >( &pType ); } /** Gets the type of the set value. @return the unacquired type description reference of the set value */ - inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const + typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const { return pType; } /** Gets the type description of the set value. Provides ownership of the type description! @@ -158,14 +158,14 @@ public: @param ppTypeDescr a pointer to type description pointer */ - inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const + void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const { ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); } /** Gets the type class of the set value. @return the type class of the set value */ - inline TypeClass SAL_CALL getValueTypeClass() const + TypeClass SAL_CALL getValueTypeClass() const { return (TypeClass)pType->eTypeClass; } /** Gets the type name of the set value. @@ -178,14 +178,14 @@ public: @return true if any has a value, false otherwise */ - inline bool SAL_CALL hasValue() const + bool SAL_CALL hasValue() const { return (typelib_TypeClass_VOID != pType->eTypeClass); } /** Gets a pointer to the set value. @return a pointer to the set value */ - inline const void * SAL_CALL getValue() const + const void * SAL_CALL getValue() const { return pData; } /** Provides a value of specified type, so you can easily write e.g. diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h index af2dc299b8e0..ba68c74ae574 100644 --- a/include/com/sun/star/uno/Reference.h +++ b/include/com/sun/star/uno/Reference.h @@ -83,14 +83,14 @@ public: @return UNacquired interface pointer */ - inline XInterface * SAL_CALL get() const + XInterface * SAL_CALL get() const { return _pInterface; } /** Checks if reference is null. @return true if reference acquires an interface, i.e. true if it is not null */ - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (NULL != _pInterface); } #if defined LIBO_INTERNAL_ONLY @@ -98,7 +98,7 @@ public: @return true if reference acquires an interface, i.e. true if it is not null */ - inline explicit operator bool() const + explicit operator bool() const { return is(); } #endif @@ -256,7 +256,7 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference principle, this is not guaranteed to work. In practice, it seems to work on all supported platforms. */ - static inline interface_type * castFromXInterface(XInterface * p) { + static interface_type * castFromXInterface(XInterface * p) { return static_cast< interface_type * >(static_cast< void * >(p)); } @@ -271,20 +271,20 @@ class SAL_DLLPUBLIC_RTTI Reference : public BaseReference principle, this is not guaranteed to work. In practice, it seems to work on all supported platforms. */ - static inline XInterface * castToXInterface(interface_type * p) { + static XInterface * castToXInterface(interface_type * p) { return static_cast< XInterface * >(static_cast< void * >(p)); } public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( ::size_t nSize ) + static void * SAL_CALL operator new ( ::size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) + static void * SAL_CALL operator new ( ::size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -409,14 +409,14 @@ public: any interface must be derived from com.sun.star.uno.XInterface. This a useful direct cast possibility. */ - inline SAL_CALL operator const Reference< XInterface > & () const + SAL_CALL operator const Reference< XInterface > & () const { return * reinterpret_cast< const Reference< XInterface > * >( this ); } /** Dereference operator: Used to call interface methods. @return UNacquired interface pointer */ - inline interface_type * SAL_CALL operator -> () const { + interface_type * SAL_CALL operator -> () const { assert(_pInterface != NULL); return castFromXInterface(_pInterface); } @@ -425,7 +425,7 @@ public: @return UNacquired interface pointer */ - inline interface_type * SAL_CALL get() const + interface_type * SAL_CALL get() const { return castFromXInterface(_pInterface); } /** Clears reference, i.e. releases interface. Reference is null after clear() call. diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h index d22bc1e8e78f..15a792bc9860 100644 --- a/include/com/sun/star/uno/Sequence.h +++ b/include/com/sun/star/uno/Sequence.h @@ -62,13 +62,13 @@ public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( ::size_t nSize ) + static void * SAL_CALL operator new ( ::size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) + static void * SAL_CALL operator new ( ::size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /** Static pointer to typelib type of sequence. @@ -140,7 +140,7 @@ public: @return length of sequence */ - inline sal_Int32 SAL_CALL getLength() const + sal_Int32 SAL_CALL getLength() const { return _pSequence->nElements; } /** Tests whether the sequence has elements, i.e. elements count is @@ -148,7 +148,7 @@ public: @return true, if elements count is greater than zero */ - inline bool SAL_CALL hasElements() const + bool SAL_CALL hasElements() const { return (_pSequence->nElements > 0); } /** Gets a pointer to elements array for reading. @@ -157,7 +157,7 @@ public: @return pointer to elements array */ - inline const E * SAL_CALL getConstArray() const + const E * SAL_CALL getConstArray() const { return reinterpret_cast< const E * >( _pSequence->elements ); } /** Gets a pointer to elements array for reading and writing. @@ -249,7 +249,7 @@ public: @return UNacquired sequence handle */ - inline uno_Sequence * SAL_CALL get() const + uno_Sequence * SAL_CALL get() const { return _pSequence; } }; diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h index 23c5527d92c4..041314e9778d 100644 --- a/include/com/sun/star/uno/Type.h +++ b/include/com/sun/star/uno/Type.h @@ -60,13 +60,13 @@ class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI Type public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -117,7 +117,7 @@ public: /** Destructor: Releases acquired C type description reference. */ - inline ~Type() + ~Type() { ::typelib_typedescriptionreference_release( _pType ); } /** Assignment operator: Acquires right side type and releases previously set type. @@ -131,7 +131,7 @@ public: @return type class of set type */ - inline TypeClass SAL_CALL getTypeClass() const + TypeClass SAL_CALL getTypeClass() const { return (TypeClass)_pType->eTypeClass; } /** Gets the name of the set type. @@ -144,14 +144,14 @@ public: @param ppDescr [inout] type description */ - inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const + void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const { ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); } /** Gets the C typelib type description reference pointer. Does not acquire the reference! @return UNacquired type description reference */ - inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const + typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const { return _pType; } /** Tests if values of this reflected type can be assigned by values of given type. @@ -162,7 +162,7 @@ public: @return true if values of this type can be assigned from values of given type, false otherwise */ - inline bool SAL_CALL isAssignableFrom( const Type & rType ) const + bool SAL_CALL isAssignableFrom( const Type & rType ) const { return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); } /** Compares two types. @@ -170,21 +170,21 @@ public: @param rType another type @return true if both types refer the same type, false otherwise */ - inline bool SAL_CALL equals( const Type & rType ) const + bool SAL_CALL equals( const Type & rType ) const { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Equality operator: Compares two types. @param rType another type @return true if both types refer the same type, false otherwise */ - inline bool SAL_CALL operator == ( const Type & rType ) const + bool SAL_CALL operator == ( const Type & rType ) const { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } /** Unequality operator: Compares two types. @param rType another type @return false if both types refer the same type, true otherwise */ - inline bool SAL_CALL operator != ( const Type & rType ) const + bool SAL_CALL operator != ( const Type & rType ) const { return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); } }; diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index c1203a35b257..d18ad49786bf 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -39,8 +39,8 @@ namespace comphelper bool mbInit; SlaveData ( ChainablePropertySet *pSlave); - inline bool IsInit () { return mbInit;} - inline void SetInit ( bool bInit) { mbInit = bInit; } + bool IsInit () { return mbInit;} + void SetInit ( bool bInit) { mbInit = bInit; } }; } diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 504afb9dd59a..7163817280a3 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -57,14 +57,14 @@ namespace comphelper { IMutex* m_pMutex; public: - inline OMutexGuard( IMutex* _pMutex ) + OMutexGuard( IMutex* _pMutex ) :m_pMutex( _pMutex ) { if ( m_pMutex ) m_pMutex->acquire(); } - inline ~OMutexGuard( ) + ~OMutexGuard( ) { if ( m_pMutex ) m_pMutex->release(); diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx index f512b42f31b0..69c5647c5bda 100644 --- a/include/comphelper/asyncnotification.hxx +++ b/include/comphelper/asyncnotification.hxx @@ -207,12 +207,12 @@ namespace comphelper EventObjectType m_aEvent; public: - inline EventHolder( const EventObjectType& _rEvent ) + EventHolder( const EventObjectType& _rEvent ) :m_aEvent( _rEvent ) { } - inline const EventObjectType& getEventObject() const { return m_aEvent; } + const EventObjectType& getEventObject() const { return m_aEvent; } }; COMPHELPER_DLLPUBLIC void JoinAsyncEventNotifiers(); diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index ac6acfa758bd..75f43a9f8812 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -64,14 +64,14 @@ namespace comphelper Subsequent instantiations of a ComponentMethodGuard won't throw the NotInitializedException now. */ - inline void setInitialized() { m_bInitialized = true; } + void setInitialized() { m_bInitialized = true; } public: /// helper struct to grant access to selected public methods to the ComponentMethodGuard class struct GuardAccess { friend class ComponentMethodGuard; private: GuardAccess() { } }; /// retrieves the component's mutex - inline ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); } + ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); } /// checks whether the component is already disposed, throws a DisposedException if so. void checkDisposed( GuardAccess ) const; /// checks whether the component is already initialized, throws a NotInitializedException if not. @@ -79,14 +79,14 @@ namespace comphelper protected: /// retrieves the component's broadcast helper - inline ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; } + ::cppu::OBroadcastHelper& getBroadcastHelper() { return m_rBHelper; } /// retrieves the component's mutex - inline ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; } + ::osl::Mutex& getMutex() { return m_rBHelper.rMutex; } /// determines whether the instance is already disposed - inline bool impl_isDisposed() const { return m_rBHelper.bDisposed; } + bool impl_isDisposed() const { return m_rBHelper.bDisposed; } /// determines whether the component is already initialized - inline bool + bool impl_isInitialized_nothrow() const { return m_bInitialized; } /** returns the context to be used when throwing exceptions @@ -121,7 +121,7 @@ namespace comphelper _rComponent.checkDisposed( ComponentBase::GuardAccess() ); } - inline void clear() + void clear() { m_aMutexGuard.clear(); } diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx index e4df46d6f76c..4439dbfc5da6 100644 --- a/include/comphelper/interfacecontainer2.hxx +++ b/include/comphelper/interfacecontainer2.hxx @@ -126,13 +126,13 @@ class COMPHELPER_DLLPUBLIC OInterfaceContainerHelper2 { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index ad040d1779e0..22b98c693a03 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -169,12 +169,12 @@ namespace comphelper { } - inline void addListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void addListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void removeListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } @@ -224,21 +224,21 @@ namespace comphelper typedef EVENT EventClass; public: - inline OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex ) + OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex ) { } - inline void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) + void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } - inline bool notify( const EventClass& _rEvent ) + bool notify( const EventClass& _rEvent ) { return OListenerContainer::impl_notify( _rEvent ); } diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index cb850aa26574..9b19bf2e3dda 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -83,12 +83,12 @@ namespace comphelper ~NamedValueCollection(); - inline void assign( const css::uno::Sequence< css::uno::Any >& _rArguments ) + void assign( const css::uno::Sequence< css::uno::Any >& _rArguments ) { impl_assign( _rArguments ); } - inline void clear() + void clear() { impl_assign( css::uno::Sequence< css::beans::NamedValue >() ); } @@ -195,13 +195,13 @@ namespace comphelper } /// determines whether a value with a given name is present in the collection - inline bool has( const sal_Char* _pAsciiValueName ) const + bool has( const sal_Char* _pAsciiValueName ) const { return impl_has( OUString::createFromAscii( _pAsciiValueName ) ); } /// determines whether a value with a given name is present in the collection - inline bool has( const OUString& _rValueName ) const + bool has( const OUString& _rValueName ) const { return impl_has( _rValueName ); } @@ -212,7 +212,7 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) + bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) ); } @@ -223,17 +223,17 @@ namespace comphelper which case it has been overwritten. */ template < typename VALUE_TYPE > - inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) + bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) { return impl_put( _rValueName, css::uno::makeAny( _rValue ) ); } - inline bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) + bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); } - inline bool put( const OUString& _rValueName, const css::uno::Any& _rValue ) + bool put( const OUString& _rValueName, const css::uno::Any& _rValue ) { return impl_put( _rValueName, _rValue ); } @@ -242,7 +242,7 @@ namespace comphelper @return <TRUE/> if and only if a value with the given name existed in the collection. */ - inline bool remove( const sal_Char* _pAsciiValueName ) + bool remove( const sal_Char* _pAsciiValueName ) { return impl_remove( OUString::createFromAscii( _pAsciiValueName ) ); } @@ -251,7 +251,7 @@ namespace comphelper @return <TRUE/> if and only if a value with the given name existed in the collection. */ - inline bool remove( const OUString& _rValueName ) + bool remove( const OUString& _rValueName ) { return impl_remove( _rValueName ); } @@ -272,7 +272,7 @@ namespace comphelper /** transforms the collection into a sequence of PropertyValues */ - inline css::uno::Sequence< css::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > getPropertyValues() const { css::uno::Sequence< css::beans::PropertyValue > aValues; @@ -282,7 +282,7 @@ namespace comphelper /** returns a Sequence< Any >, containing PropertyValues */ - inline css::uno::Sequence< css::uno::Any > + css::uno::Sequence< css::uno::Any > getWrappedPropertyValues() const { return impl_wrap< css::beans::PropertyValue >(); @@ -290,7 +290,7 @@ namespace comphelper /** returns a Sequence< Any >, containing NamedValues */ - inline css::uno::Sequence< css::uno::Any > + css::uno::Sequence< css::uno::Any > getWrappedNamedValues() const { return impl_wrap< css::beans::NamedValue >(); @@ -298,7 +298,7 @@ namespace comphelper /** transforms the collection into a sequence of NamedValues */ - inline css::uno::Sequence< css::beans::NamedValue > + css::uno::Sequence< css::beans::NamedValue > getNamedValues() const { css::uno::Sequence< css::beans::NamedValue > aValues; diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index 2123484ebb85..dcca91db86dd 100644 --- a/include/comphelper/propertybag.hxx +++ b/include/comphelper/propertybag.hxx @@ -130,7 +130,7 @@ namespace comphelper @param _out_rProps takes, upon return, the descriptions of all properties in the bag */ - inline void describeProperties( + void describeProperties( css::uno::Sequence< css::beans::Property >& _out_rProps ) const { @@ -202,14 +202,14 @@ namespace comphelper /** determines whether a property with a given name is part of the bag */ - inline bool hasPropertyByName( const OUString& _rName ) const + bool hasPropertyByName( const OUString& _rName ) const { return isRegisteredProperty( _rName ); } /** determines whether a property with a given handle is part of the bag */ - inline bool hasPropertyByHandle( sal_Int32 _nHandle ) const + bool hasPropertyByHandle( sal_Int32 _nHandle ) const { return isRegisteredProperty( _nHandle ); } diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index bf3c5d87233e..465d3e243666 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -88,7 +88,7 @@ namespace comphelper css::uno::Reference< css::uno::XComponentContext > m_xContext; protected: - inline const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() + const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext; } diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index d31ae21914e8..270601af7c67 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -247,7 +247,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAs @return The value of the specified property or an empty css::uno::Any. */ - inline css::uno::Any getValue(const OUString& sKey) const + css::uno::Any getValue(const OUString& sKey) const { const_iterator pIt = find(sKey); if (pIt == end()) diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 87e6717cbb84..d0fd28dd6e21 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -37,7 +37,7 @@ namespace comphelper SharedMutex( const SharedMutex& ); SharedMutex& operator=( const SharedMutex& ); - inline operator ::osl::Mutex& () { return *m_pMutexImpl; } + operator ::osl::Mutex& () { return *m_pMutexImpl; } private: std::shared_ptr< ::osl::Mutex > m_pMutexImpl; diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 0fc4e588fb51..273153cfaeb9 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -50,26 +50,26 @@ namespace comphelper m_xBroadcaster; protected: - inline css::uno::Reference< css::uno::XInterface > + css::uno::Reference< css::uno::XInterface > getListener( ) const { return m_aListener.get(); } - inline const css::uno::Reference< css::uno::XInterface >& + const css::uno::Reference< css::uno::XInterface >& getBroadcaster( ) const { return m_xBroadcaster; } - inline void resetListener( ) + void resetListener( ) { m_aListener.clear(); } protected: - inline OWeakListenerAdapterBase( + OWeakListenerAdapterBase( const css::uno::Reference< css::uno::XWeak >& _rxListener, const css::uno::Reference< css::uno::XInterface >& _rxBroadcaster ) @@ -109,7 +109,7 @@ namespace comphelper ); protected: - inline css::uno::Reference< LISTENER > getListener( ) const + css::uno::Reference< LISTENER > getListener( ) const { return css::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), css::uno::UNO_QUERY ); } diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 93b7ec28dd7c..dfde6cab9342 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -278,13 +278,13 @@ namespace connectivity free(); } - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } ORowSetValue& operator=(const ORowSetValue& _rRH); @@ -456,16 +456,16 @@ namespace connectivity ORowSetValueDecorator(const ORowSetValue& _aValue) : m_aValue(_aValue){m_aValue.setBound(true);} ORowSetValueDecorator& operator=(const ORowSetValue& _aValue); - inline operator const ORowSetValue&() const { return m_aValue; } - inline bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } - inline const ORowSetValue& getValue() const { return m_aValue; } - inline ORowSetValue& get() { return m_aValue; } - inline void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } - inline void setNull() { m_aValue.setNull(); } - inline void setBound(bool _bBound ) { m_aValue.setBound(_bBound);} - inline bool isBound( ) const { return m_aValue.isBound();} - inline void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } - inline void setModified(bool _bModified) { m_aValue.setModified(_bModified); } + operator const ORowSetValue&() const { return m_aValue; } + bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } + const ORowSetValue& getValue() const { return m_aValue; } + ORowSetValue& get() { return m_aValue; } + void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } + void setNull() { m_aValue.setNull(); } + void setBound(bool _bBound ) { m_aValue.setBound(_bBound);} + bool isBound( ) const { return m_aValue.isBound();} + void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } + void setModified(bool _bModified) { m_aValue.setModified(_bModified); } }; typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index 4d9737c2cf20..140d6328c1d2 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -55,7 +55,7 @@ namespace connectivity @param _pTable The parent. */ - inline void setParent(OTableHelper* _pTable) { m_pTable = _pTable;} + void setParent(OTableHelper* _pTable) { m_pTable = _pTable;} }; } #endif // INCLUDED_CONNECTIVITY_TCOLUMNSHELPER_HXX diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index 7330a718e61b..a7c3e731ccb1 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -41,7 +41,7 @@ namespace connectivity bool _isPrimaryKeyIndex, bool _isClustered ); - inline OTableHelper* getTable() const { return m_pTable; } + OTableHelper* getTable() const { return m_pTable; } }; } #endif // INCLUDED_CONNECTIVITY_TINDEX_HXX diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx index cfce73d09c6a..3fc9ba1f8b46 100644 --- a/include/connectivity/TKey.hxx +++ b/include/connectivity/TKey.hxx @@ -38,7 +38,7 @@ namespace connectivity ,const OUString& Name ,const std::shared_ptr<sdbcx::KeyProperties>& _rProps ); - inline OTableHelper* getTable() const { return m_pTable; } + OTableHelper* getTable() const { return m_pTable; } }; } #endif // INCLUDED_CONNECTIVITY_TKEY_HXX diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index d4ef414fe704..f2a2ca171014 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -86,7 +86,7 @@ namespace dbtools protected: // needed because we want to call a virtual method during construction void lateConstruct(); - inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } + void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; }; diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index b16f8ed8de41..ead3b9b58960 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -86,7 +86,7 @@ namespace dbtools /** resets the instance so that it's based on a new connection */ - inline void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection ) + void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection ) { *this = DatabaseMetaData( _connection ); } diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 4999dede4149..41df1c61b9f0 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -84,7 +84,7 @@ namespace dbtools const OUString& getFilterComponent( FilterComponent _eWhich ) const; void setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent ); - inline bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } + bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; } void setApplyPublicFilter( bool _bApply ); private: diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 7a101df72893..49eebb93665a 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -147,7 +147,7 @@ namespace dbtools void clearAllParameterInformation(); /// checks whether the parameter information are up-to-date - inline bool isUpToDate() const { return m_bUpToDate; } + bool isUpToDate() const { return m_bUpToDate; } /** updates all parameter information represented by the instance */ @@ -232,7 +232,7 @@ namespace dbtools private: /// checkes whether the object is already initialized, and not yet disposed - inline bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); } + bool isAlive() const { return m_xComponent.get().is() && m_xInnerParamUpdate.is(); } /** creates a filter expression from a master-detail link where the detail denotes a column name */ diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index a801a1f1eba2..4337a025843e 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -172,7 +172,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); void reFill(const TStringVector &_rVector); - inline bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } + bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } void renameObject(const OUString& _sOldName, const OUString& _sNewName); // only the name is identical to ::cppu::OComponentHelper diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 442d69d8b536..4db670eafd49 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -161,13 +161,13 @@ namespace connectivity const OSQLParser& _rParser ); ~OSQLParseTreeIterator(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } void dispose(); @@ -192,8 +192,8 @@ namespace connectivity The returned object contains a chain (via SQLException::NextException) of SQLExceptions. */ - inline const css::sdbc::SQLException& getErrors() const { return m_aErrors; } - inline bool hasErrors() const { return !m_aErrors.Message.isEmpty(); } + const css::sdbc::SQLException& getErrors() const { return m_aErrors; } + bool hasErrors() const { return !m_aErrors.Message.isEmpty(); } // statement type (already set in setParseTree): OSQLStatementType getStatementType() const { return m_eStatementType; } diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 570a17ea7289..3d9304882539 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -44,13 +44,13 @@ namespace connectivity OSQLScanner(); virtual ~OSQLScanner(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } sal_Int32 SQLyygetc(); @@ -72,7 +72,7 @@ namespace connectivity static sal_Int32 GetSQLRule(); static sal_Int32 GetDATERule(); static sal_Int32 GetSTRINGRule(); - inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } + sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } }; } diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx index 4670ab52d49e..9e6970d8e4e0 100644 --- a/include/cppu/Enterable.hxx +++ b/include/cppu/Enterable.hxx @@ -47,16 +47,16 @@ public: public: inline explicit Enterable(); - inline void enter() {m_enter(this);} - inline void leave() {m_leave(this);} + void enter() {m_enter(this);} + void leave() {m_leave(this);} - inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} - inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} + void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} + void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} inline void callInto(uno_EnvCallee * pCallee, ...); inline void callOut (uno_EnvCallee * pCallee, ...); - inline int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);} + int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);} private: Enterable(Enterable const &) SAL_DELETED_FUNCTION; diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index a9bcc2726062..40708129ae6f 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -285,7 +285,7 @@ namespace cppu { */ template< typename T > class UnoType { public: - static inline css::uno::Type const & get() { + static css::uno::Type const & get() { using namespace ::cppu::detail; #if defined LIBO_INTERNAL_ONLY typedef typename std::remove_reference<T>::type T1; diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index cf10806d9033..9158c8e0a783 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -54,21 +54,21 @@ public: /** Clears the access controller reference being used. */ - inline void SAL_CALL clear() + void SAL_CALL clear() { m_xController.clear(); } /** Returns access to the access controller reference being used. @return access controller */ - inline css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const + css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const { return m_xController; } /** Returns access to the access controller reference being used. @return access controller */ - inline css::security::XAccessController * SAL_CALL operator -> () const + css::security::XAccessController * SAL_CALL operator -> () const { return m_xController.get(); } diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index 45ad3f0143b6..ab55d4fca1ac 100644 --- a/include/cppuhelper/compbase1.hxx +++ b/include/cppuhelper/compbase1.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {}; public: - inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {}; public: - inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {}; public: - inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx index 7d499c1e9d0c..fabcf4d8035d 100644 --- a/include/cppuhelper/compbase10.hxx +++ b/include/cppuhelper/compbase10.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx index ec55cf0eba20..d914bc4aac9e 100644 --- a/include/cppuhelper/compbase11.hxx +++ b/include/cppuhelper/compbase11.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx index c43c57078720..e7f6c9ca3671 100644 --- a/include/cppuhelper/compbase12.hxx +++ b/include/cppuhelper/compbase12.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx index 4804151f3df7..3534f8a1885e 100644 --- a/include/cppuhelper/compbase2.hxx +++ b/include/cppuhelper/compbase2.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2<Ifc1, Ifc2> > > {}; public: - inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2<Ifc1, Ifc2> > > {}; public: - inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -126,7 +126,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2<Ifc1, Ifc2> > > {}; public: - inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx index 674342073e31..34fb477582b9 100644 --- a/include/cppuhelper/compbase3.hxx +++ b/include/cppuhelper/compbase3.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx index b5e06502515b..b3d1a263ed03 100644 --- a/include/cppuhelper/compbase4.hxx +++ b/include/cppuhelper/compbase4.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx index 1fe66f71254d..5e583aa3ff13 100644 --- a/include/cppuhelper/compbase5.hxx +++ b/include/cppuhelper/compbase5.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx index e8cf7ad8a5b1..1ae3a95dd443 100644 --- a/include/cppuhelper/compbase6.hxx +++ b/include/cppuhelper/compbase6.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx index 3690c9ce7d9b..ee4a9b445a56 100644 --- a/include/cppuhelper/compbase7.hxx +++ b/include/cppuhelper/compbase7.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx index 0e8600cdce3c..89b30358c805 100644 --- a/include/cppuhelper/compbase8.hxx +++ b/include/cppuhelper/compbase8.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -125,7 +125,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx index 730e63134dae..78cd2b96e0d9 100644 --- a/include/cppuhelper/compbase9.hxx +++ b/include/cppuhelper/compbase9.hxx @@ -47,7 +47,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -85,7 +85,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE @@ -124,7 +124,7 @@ namespace cppu { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw () + WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 864dd3afa31f..28535e8bb6ca 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -58,13 +58,13 @@ public: virtual ~WeakComponentImplHelperBase() SAL_OVERRIDE; // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} virtual css::uno::Any SAL_CALL queryInterface( @@ -99,13 +99,13 @@ public: virtual ~WeakAggComponentImplHelperBase() SAL_OVERRIDE; // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} virtual css::uno::Any SAL_CALL queryInterface( diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index e6de21c710c1..a8dca83861d5 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -50,7 +50,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init /** Default ctor. */ - inline ContextEntry_Init() + ContextEntry_Init() : bLateInitService( false ) {} /** Ctor. @@ -63,7 +63,7 @@ struct SAL_WARN_UNUSED ContextEntry_Init whether this entry is a late-init named object entry (value is object factory or service string) */ - inline ContextEntry_Init( + ContextEntry_Init( ::rtl::OUString const & name_, css::uno::Any const & value_, bool bLateInitService_ = false ) diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 3daa656b5664..0049cb8e2b75 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -128,13 +128,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** @@ -312,13 +312,13 @@ class OMultiTypeInterfaceContainerHelperVar { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** @@ -400,7 +400,7 @@ private: InterfaceMap *m_pMap; ::osl::Mutex & rMutex; - inline typename InterfaceMap::iterator find(const key &rKey) const + typename InterfaceMap::iterator find(const key &rKey) const { typename InterfaceMap::iterator iter = m_pMap->begin(); typename InterfaceMap::iterator end = m_pMap->end(); @@ -457,7 +457,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar /** adds a listener threadsafe. **/ - inline void addListener( + void addListener( const keyType &key, const css::uno::Reference < css::uno::XInterface > &r ) { @@ -471,7 +471,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar /** removes a listener threadsafe **/ - inline void removeListener( + void removeListener( const keyType &key, const css::uno::Reference < css::uno::XInterface > & r ) { @@ -486,7 +486,7 @@ struct SAL_WARN_UNUSED OBroadcastHelperVar was not created, null was returned. This can be used to optimize performance ( construction of an event object can be avoided ). ***/ - inline OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const + OInterfaceContainerHelper * SAL_CALL getContainer( const keyType &key ) const { return aLC.getContainer( key ); } }; @@ -512,13 +512,13 @@ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index b1f2a5082b0b..31a91b425112 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -47,13 +47,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC IPropertyArrayHelper { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** @@ -223,13 +223,13 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt { public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /** diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index e90ea3c00236..912f90865e04 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -41,17 +41,17 @@ class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OTypeCollection public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /// @endcond - inline OTypeCollection( const OTypeCollection & rCollection ) + OTypeCollection( const OTypeCollection & rCollection ) : _aTypes( rCollection._aTypes ) {} OTypeCollection( @@ -177,13 +177,13 @@ public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} ~OImplementationId(); @@ -194,7 +194,7 @@ public: @param bUseEthernetAddress whether an ethernet mac address should be taken into account */ - inline OImplementationId( bool bUseEthernetAddress = true ) + OImplementationId( bool bUseEthernetAddress = true ) : _pSeq( NULL ) , _bUseEthernetAddress( bUseEthernetAddress ) {} @@ -202,11 +202,11 @@ public: @param rSeq implementation id */ - inline OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq ) + OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq ) : _pSeq( new css::uno::Sequence< sal_Int8 >( rSeq ) ) , _bUseEthernetAddress( false ) {} - inline OImplementationId( const OImplementationId & rId ) + OImplementationId( const OImplementationId & rId ) : _pSeq( new css::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) , _bUseEthernetAddress( false ) {} diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 0bc22a49e005..cddd79590592 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -81,13 +81,13 @@ protected: public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} /// @endcond @@ -99,7 +99,7 @@ public: #else /** Default Constructor. Sets the reference count to zero. */ - inline OWeakObject() + OWeakObject() : m_refCount( 0 ) , m_pWeakConnectionPoint( NULL ) , m_pReserved(NULL) @@ -109,7 +109,7 @@ public: @param rObj dummy param */ - inline OWeakObject( const OWeakObject & rObj ) + OWeakObject( const OWeakObject & rObj ) : css::uno::XWeak() , m_refCount( 0 ) , m_pWeakConnectionPoint( NULL ) @@ -121,7 +121,7 @@ public: @return this OWeakObject */ - inline OWeakObject & SAL_CALL operator = ( const OWeakObject &) + OWeakObject & SAL_CALL operator = ( const OWeakObject &) { return *this; } /** Basic queryInterface() implementation supporting com::sun::star::uno::XWeak and @@ -151,7 +151,7 @@ public: @return XInterface reference */ - inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () + SAL_CALL operator css::uno::Reference< css::uno::XInterface > () { return this; } }; diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index b633c44ce26d..03754f3ec06f 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -45,7 +45,7 @@ class CPPUHELPER_DLLPUBLIC OWeakAggObject public: /** Constructor. No delegator set. */ - inline OWeakAggObject() + OWeakAggObject() {} /** If a delegator is set, then the delegators gets acquired. Otherwise call is delegated to diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx index d57cd2b43d12..1afdd864f136 100644 --- a/include/cppuhelper/weakref.hxx +++ b/include/cppuhelper/weakref.hxx @@ -53,7 +53,7 @@ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReferenceHelper() + WeakReferenceHelper() : m_pImpl( NULL ) {} @@ -103,7 +103,7 @@ public: @param rObj another weak ref @return true, if both weak refs reference to the same object. */ - inline bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const + bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const { return (get() == rObj.get()); } /** Gets a hard reference to the object. @@ -116,7 +116,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< XInterface > () const + SAL_CALL operator Reference< XInterface > () const { return get(); } /** Releases this reference. @@ -148,7 +148,7 @@ class SAL_WARN_UNUSED WeakReference : public WeakReferenceHelper public: /** Default ctor. Creates an empty weak reference. */ - inline WeakReference() + WeakReference() : WeakReferenceHelper() {} @@ -156,7 +156,7 @@ public: @param rRef another hard ref */ - inline WeakReference( const Reference< interface_type > & rRef ) + WeakReference( const Reference< interface_type > & rRef ) : WeakReferenceHelper( rRef ) {} @@ -176,7 +176,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ - inline SAL_CALL operator Reference< interface_type > () const + SAL_CALL operator Reference< interface_type > () const { return Reference< interface_type >::query( get() ); } }; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 6e56e67cee43..df50c19a15f2 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -72,7 +72,7 @@ namespace dbaui virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - inline IController& getCommandController() const { return *m_xController.get(); } + IController& getCommandController() const { return *m_xController.get(); } const css::uno::Reference< css::uno::XComponentContext >& getORB() { return m_xContext;} diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index e2e389c8d9a6..2a0514d85b6c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -180,7 +180,7 @@ namespace dbaui struct CompareFeatureById : ::std::binary_function< SupportedFeatures::value_type, sal_Int32, bool > { - inline bool operator()( const SupportedFeatures::value_type& _aType, sal_Int32 _nId ) const + bool operator()( const SupportedFeatures::value_type& _aType, sal_Int32 _nId ) const { return !!( _nId == _aType.second.nFeatureId ); } @@ -202,7 +202,7 @@ namespace dbaui struct FindFeatureListener : ::std::binary_function< FeatureListener, css::uno::Reference< css::frame::XStatusListener >, bool > { - inline bool operator()( const FeatureListener& lhs, const css::uno::Reference< css::frame::XStatusListener >& rhs ) const + bool operator()( const FeatureListener& lhs, const css::uno::Reference< css::frame::XStatusListener >& rhs ) const { return !!( lhs.xListener == rhs ); } diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 2af8a546c4b5..04a04ff36ee3 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -71,18 +71,18 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; - inline void SetOneWord( const SvxAdjust eType ) + void SetOneWord( const SvxAdjust eType ) { bOneBlock = eType == SVX_ADJUST_BLOCK; } - inline void SetLastBlock( const SvxAdjust eType ) + void SetLastBlock( const SvxAdjust eType ) { bLastBlock = eType == SVX_ADJUST_BLOCK; bLastCenter = eType == SVX_ADJUST_CENTER; } - inline void SetAdjust( const SvxAdjust eType ) + void SetAdjust( const SvxAdjust eType ) { bLeft = eType == SVX_ADJUST_LEFT; bRight = eType == SVX_ADJUST_RIGHT; @@ -90,7 +90,7 @@ public: bBlock = eType == SVX_ADJUST_BLOCK; } - inline SvxAdjust GetLastBlock() const + SvxAdjust GetLastBlock() const { SvxAdjust eRet = SVX_ADJUST_LEFT; @@ -101,7 +101,7 @@ public: return eRet; } - inline SvxAdjust GetOneWord() const + SvxAdjust GetOneWord() const { SvxAdjust eRet = SVX_ADJUST_LEFT; @@ -110,7 +110,7 @@ public: return eRet; } - inline SvxAdjust GetAdjust() const + SvxAdjust GetAdjust() const { SvxAdjust eRet = SVX_ADJUST_LEFT; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 5704b35c845d..06b47f657190 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -49,7 +49,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) + SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { SetValue( rAutoKern.GetValue() ); return *this; diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 4cdd649e934e..fe034a02f5b5 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { + SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); return *this; } diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index a63d4a19dfe3..984bd389d7e4 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -212,10 +212,10 @@ public: bool IsTable() const { return mbEnableHor && mbEnableVer; } void SetTable( bool bNew ) { mbEnableHor = mbEnableVer = bNew; } - inline bool IsHorEnabled() const { return mbEnableHor; } - inline void EnableHor( bool bEnable ) { mbEnableHor = bEnable; } - inline bool IsVerEnabled() const { return mbEnableVer; } - inline void EnableVer( bool bEnable ) { mbEnableVer = bEnable; } + bool IsHorEnabled() const { return mbEnableHor; } + void EnableHor( bool bEnable ) { mbEnableHor = bEnable; } + bool IsVerEnabled() const { return mbEnableVer; } + void EnableVer( bool bEnable ) { mbEnableVer = bEnable; } bool IsDist() const { return bDist; } void SetDist( bool bNew ) { bDist = bNew; } diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index daa1faaba68a..7f53bcbe0c1f 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -40,7 +40,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { + SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); return *this; } diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index c87aa57e2f14..6da13c4ee9bd 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -56,7 +56,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) + SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 2ab87f22aaa5..95e86c3a01aa 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -57,7 +57,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) + SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) { SetValue( rItem.GetValue() ); SetFitToLine( rItem.IsFitToLine() ); diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 32761e429a69..3c0539031b2a 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -54,7 +54,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) + SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 82dc4a6de32b..7223c2b9a944 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -48,9 +48,9 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - inline rtl_TextEncoding GetCharSet() const { return eFrom; } + rtl_TextEncoding GetCharSet() const { return eFrom; } - inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) + SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) { SetValue( rColor.GetValue() ); eFrom = rColor.GetCharSet(); diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index d1a38a051dee..4977b11694a0 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -52,7 +52,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetValueCount() const override; - inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) + SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) { SetValue( rMap.GetValue() ); return *this; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index d68282de5146..55bf50a8f4d1 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -57,7 +57,7 @@ public: virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override; - inline SvxColorItem& operator=(const SvxColorItem& rColor) + SvxColorItem& operator=(const SvxColorItem& rColor) { SetValue(rColor.GetValue()); return *this; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 13f4083d3afb..c7865967373a 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -46,7 +46,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxContourItem& operator=(const SvxContourItem& rCont) + SvxContourItem& operator=(const SvxContourItem& rCont) { SetValue(rCont.GetValue()); return *this; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 6bf4d4250ffe..b09654d946e2 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) + SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) { SetValue( rCross.GetValue() ); return *this; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 0f5942162a11..fe9d92a915e9 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -55,7 +55,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) + SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 427950d41062..1e8585a0f116 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -65,7 +65,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - inline void SetEscapement( const SvxEscapement eNew ) + void SetEscapement( const SvxEscapement eNew ) { if( SvxEscapement::Off == eNew ) { @@ -84,15 +84,15 @@ public: nProp = DFLT_ESC_PROP; } } - inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); } + SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); } - inline short &GetEsc() { return nEsc; } - inline short GetEsc() const { return nEsc; } + short &GetEsc() { return nEsc; } + short GetEsc() const { return nEsc; } - inline sal_uInt8 &GetProportionalHeight() { return nProp; } - inline sal_uInt8 GetProportionalHeight() const { return nProp; } + sal_uInt8 &GetProportionalHeight() { return nProp; } + sal_uInt8 GetProportionalHeight() const { return nProp; } - inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc) + SvxEscapementItem& operator=(const SvxEscapementItem& rEsc) { nEsc = rEsc.GetEsc(); nProp = rEsc.GetProportionalHeight(); diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 552f7807b13a..ac021bcca0b3 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -64,7 +64,7 @@ public: virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) + SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); nHeight = rSize.nHeight; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 2d7f2f42184e..47233b7a3c26 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -45,7 +45,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxForbiddenRuleItem& operator=( + SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) { SetValue( rItem.GetValue() ); diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 7cc444c42d10..c1b6b36134fb 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -54,7 +54,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) + SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index a79de4b2b495..00e146913360 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -55,7 +55,7 @@ public: virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) + SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) { SetWidthValue( rItem.GetWidth() ); SetProp( rItem.GetProp() ); diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index b68c2881bdec..ebb6ab406171 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -44,7 +44,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxHangingPunctuationItem& operator=( + SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) { SetValue( rItem.GetValue() ); diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index b37c2544cb99..3a46267d754d 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -60,22 +60,22 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - inline void SetHyphen( const bool bNew ) { bHyphen = bNew; } - inline bool IsHyphen() const { return bHyphen; } + void SetHyphen( const bool bNew ) { bHyphen = bNew; } + bool IsHyphen() const { return bHyphen; } - inline void SetPageEnd( const bool bNew ) { bPageEnd = bNew; } - inline bool IsPageEnd() const { return bPageEnd; } + void SetPageEnd( const bool bNew ) { bPageEnd = bNew; } + bool IsPageEnd() const { return bPageEnd; } - inline sal_uInt8 &GetMinLead() { return nMinLead; } - inline sal_uInt8 GetMinLead() const { return nMinLead; } + sal_uInt8 &GetMinLead() { return nMinLead; } + sal_uInt8 GetMinLead() const { return nMinLead; } - inline sal_uInt8 &GetMinTrail() { return nMinTrail; } - inline sal_uInt8 GetMinTrail() const { return nMinTrail; } + sal_uInt8 &GetMinTrail() { return nMinTrail; } + sal_uInt8 GetMinTrail() const { return nMinTrail; } - inline sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; } - inline sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; } + sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; } + sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; } - inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew ) + SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew ) { bHyphen = rNew.IsHyphen(); bPageEnd = rNew.IsPageEnd(); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index e246bb5b73ba..1a384c2b76b6 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -49,7 +49,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) + SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { SetValue( rHorJustify.GetValue() ); return *this; @@ -81,7 +81,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) + SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { SetValue( rVerJustify.GetValue() ); return *this; diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index a32657cdc15c..d5eca73b3104 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -53,7 +53,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { + SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); return *this; } diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index a3a1823ecba0..e2ae3e8b8186 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -51,7 +51,7 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetValueCount() const override; - inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) + SvxLanguageItem& operator=(const SvxLanguageItem& rLang) { SetValue( rLang.GetValue() ); return *this; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 856f2d8eb70e..28a9e09336e1 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -41,7 +41,7 @@ public: const IntlWrapper * pIntlWrapper = nullptr ) const override; - inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) + SvxLineColorItem& operator=(const SvxLineColorItem& rColor) { return static_cast<SvxLineColorItem&>(SvxColorItem:: operator=(static_cast<const SvxColorItem&>(rColor))); } diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 084fcb263f2e..eea64a7d0ec3 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -95,31 +95,31 @@ public: inline void SetRight( const long nR, const sal_uInt16 nProp = 100 ); // Query/direct setting of the absolute values - inline long GetLeft() const { return nLeftMargin; } - inline long GetRight() const { return nRightMargin;} - inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; } - inline void SetRightValue( const long nR ) { nRightMargin = nR; } - inline bool IsAutoFirst() const { return bAutoFirst; } - inline void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; } - - inline bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; } - inline bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; } - inline void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; } - inline void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; } - inline sal_uInt16 GetPropLeft() const { return nPropLeftMargin; } - inline sal_uInt16 GetPropRight() const { return nPropRightMargin;} + long GetLeft() const { return nLeftMargin; } + long GetRight() const { return nRightMargin;} + void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; } + void SetRightValue( const long nR ) { nRightMargin = nR; } + bool IsAutoFirst() const { return bAutoFirst; } + void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; } + + bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; } + bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; } + void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; } + void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; } + sal_uInt16 GetPropLeft() const { return nPropLeftMargin; } + sal_uInt16 GetPropRight() const { return nPropRightMargin;} // The UI/text interface: inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 ); - inline long GetTextLeft() const { return nTxtLeft; } + long GetTextLeft() const { return nTxtLeft; } inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 ); - inline short GetTextFirstLineOfst() const { return nFirstLineOfst; } - inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp ) + short GetTextFirstLineOfst() const { return nFirstLineOfst; } + void SetPropTextFirstLineOfst( const sal_uInt16 nProp ) { nPropFirstLineOfst = nProp; } - inline sal_uInt16 GetPropTextFirstLineOfst() const + sal_uInt16 GetPropTextFirstLineOfst() const { return nPropFirstLineOfst; } - inline void SetTextFirstLineOfstValue( const short nValue ) + void SetTextFirstLineOfstValue( const short nValue ) { nFirstLineOfst = nValue; } void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 75d600afeb30..2c5c6ffcc33c 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -65,16 +65,16 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; // Methods to query and edit. InterlineSpace is added to the height. - inline short GetInterLineSpace() const { return nInterLineSpace; } - inline void SetInterLineSpace( const short nSpace ) + short GetInterLineSpace() const { return nInterLineSpace; } + void SetInterLineSpace( const short nSpace ) { nInterLineSpace = nSpace; eInterLineSpaceRule = SvxInterLineSpaceRule::Fix; } // Determines the absolute or minimum row height. - inline sal_uInt16 GetLineHeight() const { return nLineHeight; } - inline void SetLineHeight( const sal_uInt16 nHeight ) + sal_uInt16 GetLineHeight() const { return nLineHeight; } + void SetLineHeight( const sal_uInt16 nHeight ) { nLineHeight = nHeight; eLineSpaceRule = SvxLineSpaceRule::Min; @@ -82,17 +82,17 @@ public: // To increase or decrease the row height. sal_uInt16 GetPropLineSpace() const { return nPropLineSpace; } - inline void SetPropLineSpace( const sal_uInt8 nProp ) + void SetPropLineSpace( const sal_uInt8 nProp ) { nPropLineSpace = nProp; eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } - inline void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; } - inline SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; } + void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; } + SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; } - inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } - inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } + void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } + SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index 3c5109b43c06..fe7a33678c49 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) + SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { SetValue( rNHH.GetValue() ); return *this; diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index fda14d94c15d..fb6a836ab318 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) + SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { SetValue( rLB.GetValue() ); return *this; diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 4e6f7d95c679..b5faa4829842 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -79,13 +79,13 @@ public: virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const override; - inline sal_uInt8 &GetMinLead() { return nMinLead; } - inline sal_uInt8 GetMinLead() const { return nMinLead; } + sal_uInt8 &GetMinLead() { return nMinLead; } + sal_uInt8 GetMinLead() const { return nMinLead; } - inline sal_uInt8 &GetMinTrail() { return nMinTrail; } - inline sal_uInt8 GetMinTrail() const { return nMinTrail; } + sal_uInt8 &GetMinTrail() { return nMinTrail; } + sal_uInt8 GetMinTrail() const { return nMinTrail; } - inline SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew ) + SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew ) { nMinLead = rNew.GetMinLead(); nMinTrail = rNew.GetMinTrail(); diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index f0bb668f86ea..8998056f02d1 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) + SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { SetValue( rOrphans.GetValue() ); return *this; diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 26926b3456ef..19aac0e99766 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -57,7 +57,7 @@ public: Align GetValue() const { return (Align) SfxUInt16Item::GetValue(); } void SetValue(Align n) { SfxUInt16Item::SetValue((sal_uInt16)n); } - inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) + SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 674f5ba8b747..a558fbd5c7a1 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { + SvxPostureItem& operator=(const SvxPostureItem& rPost) { SetValue( rPost.GetValue() ); return *this; } diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index a786e2976ebd..20cb729505e1 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -45,7 +45,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) + SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { SetValue( rPropSize.GetValue() ); return *this; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 788ed50657cc..3dc6e7473cc3 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -46,7 +46,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) + SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 82221b6b0845..2c8e21f806ab 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -49,7 +49,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { + SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); return *this; } diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 1dd09472efd4..5d40fcbf3e0e 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -91,11 +91,11 @@ public: static void ShowLanguageErrors(); void SpellDocument(); // Perform Spell Checking - inline bool IsStartDone(){ return bStartDone; } - inline bool IsEndDone(){ return bEndDone; } - inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check - inline void SetHyphen() { bHyphen = true; } - inline bool IsAllRight() { return bAllRight; } + bool IsStartDone(){ return bStartDone; } + bool IsEndDone(){ return bEndDone; } + bool IsHyphen(){ return bHyphen; } // Split instead of Spell check + void SetHyphen() { bHyphen = true; } + bool IsAllRight() { return bAllRight; } protected: const css::uno::Reference< css::uno::XInterface >& diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 23b85d41f0b5..17957ff561d0 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -323,7 +323,7 @@ public: // Query/Set the current settings of AutoCorrect long GetFlags() const { return nFlags; } - inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;} + SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;} bool IsAutoCorrFlag( long nFlag ) const { return (nFlags & nFlag) != 0; } void SetAutoCorrFlag( long nFlag, bool bOn = true ); diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 869c4ef4c755..80dcf3744a23 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -49,26 +49,26 @@ public: SvxFont( const SvxFont &rFont ); // Methods for Superscript/Subscript - inline short GetEscapement() const { return nEsc; } - inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; } + short GetEscapement() const { return nEsc; } + void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; } - inline sal_uInt8 GetPropr() const { return nPropr; } - inline void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; } - inline void SetProprRel( const sal_uInt8 nNewPropr ) + sal_uInt8 GetPropr() const { return nPropr; } + void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; } + void SetProprRel( const sal_uInt8 nNewPropr ) { SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); } // Kerning - inline short GetFixKerning() const { return nKern; } - inline void SetFixKerning( const short nNewKern ) { nKern = nNewKern; } + short GetFixKerning() const { return nKern; } + void SetFixKerning( const short nNewKern ) { nKern = nNewKern; } - inline SvxCaseMap GetCaseMap() const { return eCaseMap; } - inline void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } + SvxCaseMap GetCaseMap() const { return eCaseMap; } + void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } // Is-Methods: - inline bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } - inline bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } - inline bool IsKern() const { return 0 != nKern; } - inline bool IsEsc() const { return 0 != nEsc; } + bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } + bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } + bool IsKern() const { return 0 != nKern; } + bool IsEsc() const { return 0 != nEsc; } // Consider Upper case, Lower case letters etc. OUString CalcCaseMap(const OUString &rTxt) const; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index d3df41f8766c..f0702c6f6965 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -61,7 +61,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) + SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) { SetValue( rTextLine.GetValue() ); SetColor( rTextLine.GetColor() ); diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index eaa11698e337..1dbd1e875cd3 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { + SvxWeightItem& operator=(const SvxWeightItem& rWeight) { SetValue( rWeight.GetValue() ); return *this; } diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index fbffc6cea9d1..1d5d9eabf3db 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) + SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { SetValue( rWidows.GetValue() ); return *this; diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index d2195566da22..2459c2557cdb 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -50,7 +50,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) + SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { SetValue( rWLM.GetValue() ); return *this; diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 7a8ff2938cf7..6e7ca4a415a6 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.hxx @@ -55,7 +55,7 @@ class MSFILTER_DLLPUBLIC DffPropSet explicit DffPropSet(); ~DffPropSet(); - inline bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); }; + bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); }; bool IsHardAttribute( sal_uInt32 nId ) const; sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault ) const; /** Returns a boolean property by its real identifier. */ diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 531cced1bba9..5a2f1d3bd676 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -963,9 +963,9 @@ public: sal_uInt32 GetLastShapeId( sal_uInt32 nDrawingId ) const; /** Sets the flag indicating that the DGGCONTAINER exists. */ - inline void SetDggContainer() { mbHasDggCont = true; } + void SetDggContainer() { mbHasDggCont = true; } /** Sets the flag indicating that the DGGCONTAINER exists. */ - inline bool HasDggContainer() const { return mbHasDggCont; } + bool HasDggContainer() const { return mbHasDggCont; } /** Returns the total size of the DGG atom (including header). */ sal_uInt32 GetDggAtomSize() const; /** Writes the complete DGG atom to the passed stream (overwrites existing data!). */ @@ -981,7 +981,7 @@ public: SvStream* QueryPictureStream(); /** Returns the picture stream if existing (queried), otherwise null. */ - inline SvStream* GetPictureStream() { return mpPicStrm; } + SvStream* GetPictureStream() { return mpPicStrm; } private: /** Derived classes may implement to create a new stream used to store the @@ -999,7 +999,7 @@ private: { sal_uInt32 mnDrawingId; /// Identifier of drawing this cluster belongs to (one-based index into maDrawingInfos). sal_uInt32 mnNextShapeId; /// Next free shape identifier in this cluster. - inline explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {} + explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {} }; typedef ::std::vector< ClusterEntry > ClusterTable; @@ -1008,7 +1008,7 @@ private: sal_uInt32 mnClusterId; /// Currently used cluster (one-based index into maClusterTable). sal_uInt32 mnShapeCount; /// Current number of shapes in this drawing. sal_uInt32 mnLastShapeId; /// Last shape identifier generated for this drawing. - inline explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {} + explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {} }; typedef ::std::vector< DrawingInfo > DrawingInfoVector; @@ -1054,7 +1054,7 @@ public: /** Creates and returns a new shape identifier, updates the internal shape counters and registers the identifier in the DGG cluster table. */ - inline sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } + sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } /** Returns the graphic provider from the global object that has been passed to the constructor. @@ -1064,7 +1064,7 @@ public: /** Called if a picture shall be written and no picture stream is set at class ImplEESdrWriter. */ - inline SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); } + SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); } /// Inserts internal data into the EscherStream, this process /// may and has to be executed only once diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 5ea99506b084..f7c993db0fc3 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -681,10 +681,10 @@ public: const Rectangle& rClientRect, const Rectangle& rGlobalChildRect ); - inline const SvxMSDffShapeInfos_ById* GetShapeInfos() const + const SvxMSDffShapeInfos_ById* GetShapeInfos() const { return m_xShapeInfosById.get(); } - inline SvxMSDffShapeOrders* GetShapeOrders() const + SvxMSDffShapeOrders* GetShapeOrders() const { return m_pShapeOrders; } void StoreShapeOrder(sal_uLong nId, diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 002ee4dfa50e..57136bf6366f 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -54,7 +54,7 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo OUString msResolvedMacro; bool mbFound; - inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {} + explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {} }; MSFILTER_DLLPUBLIC OUString makeMacroURL( const OUString& sMacroName ); diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index f9ab53a78352..3c65b94973f3 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -114,16 +114,16 @@ public: void copyFrom( const OpCodeMap& r ); /// Get the symbol String -> OpCode hash map for finds. - inline const OpCodeHashMap* getHashMap() const { return mpHashMap; } + const OpCodeHashMap* getHashMap() const { return mpHashMap; } /// Get the symbol String -> AddIn String hash map for finds. - inline const ExternalHashMap* getExternalHashMap() const { return mpExternalHashMap; } + const ExternalHashMap* getExternalHashMap() const { return mpExternalHashMap; } /// Get the AddIn String -> symbol String hash map for finds. - inline const ExternalHashMap* getReverseExternalHashMap() const { return mpReverseExternalHashMap; } + const ExternalHashMap* getReverseExternalHashMap() const { return mpReverseExternalHashMap; } /// Get the symbol string matching an OpCode. - inline const OUString& getSymbol( const OpCode eOp ) const + const OUString& getSymbol( const OpCode eOp ) const { DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range"); if (sal_uInt16(eOp) < mnSymbols) @@ -133,31 +133,31 @@ public: } /// Get the first character of the symbol string matching an OpCode. - inline sal_Unicode getSymbolChar( const OpCode eOp ) const { return getSymbol(eOp)[0]; }; + sal_Unicode getSymbolChar( const OpCode eOp ) const { return getSymbol(eOp)[0]; }; /// Get the grammar. - inline FormulaGrammar::Grammar getGrammar() const { return meGrammar; } + FormulaGrammar::Grammar getGrammar() const { return meGrammar; } /// Get the symbol count. - inline sal_uInt16 getSymbolCount() const { return mnSymbols; } + sal_uInt16 getSymbolCount() const { return mnSymbols; } /** Are these English symbols, as opposed to native language (which may be English as well)? */ - inline bool isEnglish() const { return mbEnglish; } + bool isEnglish() const { return mbEnglish; } /// Is it an ODF 1.1 compatibility mapping? - inline bool isPODF() const { return FormulaGrammar::isPODF( meGrammar); } + bool isPODF() const { return FormulaGrammar::isPODF( meGrammar); } /* TODO: add isAPI() once a FormulaLanguage was added. */ /// Is it an ODFF / ODF 1.2 mapping? - inline bool isODFF() const { return FormulaGrammar::isODFF( meGrammar); } + bool isODFF() const { return FormulaGrammar::isODFF( meGrammar); } /// Is it an OOXML mapping? - inline bool isOOXML() const { return FormulaGrammar::isOOXML( meGrammar); } + bool isOOXML() const { return FormulaGrammar::isOOXML( meGrammar); } /// Does it have external symbol/name mappings? - inline bool hasExternals() const { return !mpExternalHashMap->empty(); } + bool hasExternals() const { return !mpExternalHashMap->empty(); } /// Put entry of symbol String and OpCode pair. void putOpCode( const OUString & rStr, const OpCode eOp, const CharClass* pCharClass ); @@ -250,7 +250,7 @@ public: /** Set symbol map corresponding to one of predefined formula::FormulaGrammar::Grammar, including an address reference convention. */ - inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } + FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } /** Whether current symbol set and grammar need transformation of Table structured references to A1 style references when writing / exporting diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index b708244bf08c..9fce5d6e54d2 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -37,23 +37,23 @@ public: virtual void SaveValues(); - inline sal_uInt16 GetMode() const { return nMode; } - inline sal_Int32 GetFStart() const { return nFStart; } - inline sal_uInt16 GetOffset() const { return nOffset; } - inline sal_uInt16 GetEdFocus() const { return nEdFocus; } - inline const OUString& GetUndoStr() const { return aUndoStr; } - inline bool GetMatrixFlag()const{ return bMatrix;} + sal_uInt16 GetMode() const { return nMode; } + sal_Int32 GetFStart() const { return nFStart; } + sal_uInt16 GetOffset() const { return nOffset; } + sal_uInt16 GetEdFocus() const { return nEdFocus; } + const OUString& GetUndoStr() const { return aUndoStr; } + bool GetMatrixFlag()const{ return bMatrix;} const VclPtr<vcl::Window>& GetFocusWindow()const { return xFocusWin; } - inline const Selection& GetSelection()const { return aSelection;} + const Selection& GetSelection()const { return aSelection;} - inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; } - inline void SetFStart( sal_Int32 nNew ) { nFStart = nNew; } - inline void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; } - inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } - inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } - inline void SetMatrixFlag(bool bNew) { bMatrix=bNew;} - inline void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;} - inline void SetSelection(const Selection& aSel) { aSelection=aSel;} + void SetMode( sal_uInt16 nNew ) { nMode = nNew; } + void SetFStart( sal_Int32 nNew ) { nFStart = nNew; } + void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; } + void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } + void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } + void SetMatrixFlag(bool bNew) { bMatrix=bNew;} + void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;} + void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset(); FormEditData( const FormEditData& ); diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index 58371f1e786e..753ef8e8178e 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -48,7 +48,7 @@ namespace formula public: FormulaHelper(const IFunctionManager* _pFunctionManager); - inline const CharClass* GetCharClass() const { return m_pCharClass; } + const CharClass* GetCharClass() const { return m_pCharClass; } bool GetNextFunc( const OUString& rFormula, bool bBack, diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 2bd6585a017d..5d7933dee24a 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -161,7 +161,7 @@ public: }; /// If English parsing/formatting is associated with a grammar. - static inline bool isEnglish( const Grammar eGrammar ) + static bool isEnglish( const Grammar eGrammar ) { return (eGrammar & kEnglishBit) != 0; } @@ -172,12 +172,12 @@ public: static bool isSupported( const Grammar eGrammar ); - static inline sal_Int32 extractFormulaLanguage( const Grammar eGrammar ) + static sal_Int32 extractFormulaLanguage( const Grammar eGrammar ) { return eGrammar & kFlagMask; } - static inline AddressConvention extractRefConvention( const Grammar eGrammar ) + static AddressConvention extractRefConvention( const Grammar eGrammar ) { return static_cast<AddressConvention>( ((eGrammar & ~kEnglishBit) >> kConventionShift) - @@ -189,28 +189,28 @@ public: static Grammar mergeToGrammar( const Grammar eGrammar, const AddressConvention eConv ); /// If grammar is of ODF 1.1 - static inline bool isPODF( const Grammar eGrammar ) + static bool isPODF( const Grammar eGrammar ) { return extractFormulaLanguage( eGrammar) == css::sheet::FormulaLanguage::ODF_11; } /// If grammar is of ODFF - static inline bool isODFF( const Grammar eGrammar ) + static bool isODFF( const Grammar eGrammar ) { return extractFormulaLanguage( eGrammar) == css::sheet::FormulaLanguage::ODFF; } /// If grammar is of OOXML - static inline bool isOOXML( const Grammar eGrammar ) + static bool isOOXML( const Grammar eGrammar ) { return extractFormulaLanguage( eGrammar) == css::sheet::FormulaLanguage::OOXML; } /// If grammar has an Excel syntax, determined by address convention. - static inline bool isExcelSyntax( const Grammar eGrammar ) + static bool isExcelSyntax( const Grammar eGrammar ) { AddressConvention eConv = extractRefConvention( eGrammar ); switch (eConv) diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 9ba7728c09fa..e6e5bc459b51 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -103,9 +103,9 @@ public: virtual ~FormulaToken(); - inline void Delete() { delete this; } - inline void DeleteIfZeroRef() { if (mnRefCnt == 0) delete this; } - inline StackVar GetType() const { return eType; } + void Delete() { delete this; } + void DeleteIfZeroRef() { if (mnRefCnt == 0) delete this; } + StackVar GetType() const { return eType; } bool IsFunction() const; // pure functions, no operators bool IsExternalRef() const; @@ -113,19 +113,19 @@ public: sal_uInt8 GetParamCount() const; - inline void IncRef() const + void IncRef() const { osl_atomic_increment(&mnRefCnt); } - inline void DecRef() const + void DecRef() const { if (!osl_atomic_decrement(&mnRefCnt)) const_cast<FormulaToken*>(this)->Delete(); } - inline oslInterlockedCount GetRef() const { return mnRefCnt; } - inline OpCode GetOpCode() const { return eOp; } + oslInterlockedCount GetRef() const { return mnRefCnt; } + OpCode GetOpCode() const { return eOp; } /** Dummy methods to avoid switches and casts where possible, @@ -190,7 +190,7 @@ public: /** This is dirty and only the compiler should use it! */ struct PrivateAccess { friend class FormulaCompiler; private: PrivateAccess() { } }; - inline void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; } + void NewOpCode( OpCode e, const PrivateAccess& ) { eOp = e; } }; inline void intrusive_ptr_add_ref(const FormulaToken* p) diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 65b12a940fd4..39e326b63ade 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -80,10 +80,10 @@ public: FORMULA_MISSING_CONVENTION_OOXML }; explicit MissingConvention( Convention eConvention ) : meConvention(eConvention) {} - inline bool isPODF() const { return meConvention == FORMULA_MISSING_CONVENTION_PODF; } - inline bool isODFF() const { return meConvention == FORMULA_MISSING_CONVENTION_ODFF; } - inline bool isOOXML() const { return meConvention == FORMULA_MISSING_CONVENTION_OOXML; } - inline Convention getConvention() const { return meConvention; } + bool isPODF() const { return meConvention == FORMULA_MISSING_CONVENTION_PODF; } + bool isODFF() const { return meConvention == FORMULA_MISSING_CONVENTION_ODFF; } + bool isOOXML() const { return meConvention == FORMULA_MISSING_CONVENTION_OOXML; } + Convention getConvention() const { return meConvention; } private: Convention meConvention; }; @@ -172,14 +172,14 @@ protected: */ sal_uInt16 RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ); - inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits ) + void SetCombinedBitsRecalcMode( ScRecalcMode nBits ) { nMode |= (nBits & ~ScRecalcMode::EMask); } - inline ScRecalcMode GetCombinedBitsRecalcMode() const + ScRecalcMode GetCombinedBitsRecalcMode() const { return nMode & ~ScRecalcMode::EMask; } /** Exclusive bits already set in nMode are zero'ed, nBits may contain combined bits, but only one exclusive bit may be set! */ - inline void SetMaskedRecalcMode( ScRecalcMode nBits ) + void SetMaskedRecalcMode( ScRecalcMode nBits ) { nMode = GetCombinedBitsRecalcMode() | nBits; } public: @@ -249,36 +249,36 @@ public: void SetHyperLink( bool bVal ) { bHyperLink = bVal; } bool IsHyperLink() const { return bHyperLink; } - inline ScRecalcMode GetRecalcMode() const { return nMode; } + ScRecalcMode GetRecalcMode() const { return nMode; } /** Bits aren't set directly but validated and maybe handled according to priority if more than one exclusive bit was set. */ void AddRecalcMode( ScRecalcMode nBits ); - inline void ClearRecalcMode() { nMode = ScRecalcMode::NORMAL; } - inline void SetExclusiveRecalcModeNormal() + void ClearRecalcMode() { nMode = ScRecalcMode::NORMAL; } + void SetExclusiveRecalcModeNormal() { SetMaskedRecalcMode( ScRecalcMode::NORMAL ); } - inline void SetExclusiveRecalcModeAlways() + void SetExclusiveRecalcModeAlways() { SetMaskedRecalcMode( ScRecalcMode::ALWAYS ); } - inline void SetExclusiveRecalcModeOnLoad() + void SetExclusiveRecalcModeOnLoad() { SetMaskedRecalcMode( ScRecalcMode::ONLOAD ); } - inline void SetExclusiveRecalcModeOnLoadOnce() + void SetExclusiveRecalcModeOnLoadOnce() { SetMaskedRecalcMode( ScRecalcMode::ONLOAD_ONCE ); } - inline void SetRecalcModeForced() + void SetRecalcModeForced() { nMode |= ScRecalcMode::FORCED; } - inline void SetRecalcModeOnRefMove() + void SetRecalcModeOnRefMove() { nMode |= ScRecalcMode::ONREFMOVE; } - inline bool IsRecalcModeNormal() const + bool IsRecalcModeNormal() const { return bool(nMode & ScRecalcMode::NORMAL); } - inline bool IsRecalcModeAlways() const + bool IsRecalcModeAlways() const { return bool(nMode & ScRecalcMode::ALWAYS); } - inline bool IsRecalcModeOnLoad() const + bool IsRecalcModeOnLoad() const { return bool(nMode & ScRecalcMode::ONLOAD); } - inline bool IsRecalcModeOnLoadOnce() const + bool IsRecalcModeOnLoadOnce() const { return bool(nMode & ScRecalcMode::ONLOAD_ONCE); } - inline bool IsRecalcModeForced() const + bool IsRecalcModeForced() const { return bool(nMode & ScRecalcMode::FORCED); } - inline bool IsRecalcModeOnRefMove() const + bool IsRecalcModeOnRefMove() const { return bool(nMode & ScRecalcMode::ONREFMOVE); } /** Get OpCode of the most outer function */ diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index 1db3616c3d9a..c3b73c8a0341 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -37,19 +37,19 @@ class SAL_WARN_UNUSED I18NLANGTAG_DLLPUBLIC MsLangId public: /// Create a LangID from a primary and a sublanguage. - static inline LanguageType makeLangID( LanguageType nSubLangId, LanguageType nPriLangId) + static LanguageType makeLangID( LanguageType nSubLangId, LanguageType nPriLangId) { return (nSubLangId << 10) | nPriLangId; } /// Get the primary language of a LangID. - static inline LanguageType getPrimaryLanguage( LanguageType nLangID) + static LanguageType getPrimaryLanguage( LanguageType nLangID) { return nLangID & LANGUAGE_MASK_PRIMARY; } /// Get the sublanguage of a LangID. - static inline LanguageType getSubLanguage( LanguageType nLangID) + static LanguageType getSubLanguage( LanguageType nLangID) { return (nLangID & ~LANGUAGE_MASK_PRIMARY) >> 10; } diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx index 4b0025587093..df18b5791e40 100644 --- a/include/jvmaccess/virtualmachine.hxx +++ b/include/jvmaccess/virtualmachine.hxx @@ -79,7 +79,7 @@ public: @return A valid JNI environment pointer. Will never be null. */ - inline JNIEnv * getEnvironment() const { return m_pEnvironment; } + JNIEnv * getEnvironment() const { return m_pEnvironment; } private: AttachGuard(AttachGuard &) = delete; diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx index bc35ba77d588..c1bfff733f5b 100644 --- a/include/o3tl/lru_map.hxx +++ b/include/o3tl/lru_map.hxx @@ -47,7 +47,7 @@ private: map_t mLruMap; const size_t mMaxSize; - inline void checkLRU() + void checkLRU() { if (mLruMap.size() > mMaxSize) { diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 952e53a0d777..042a1dfc9d49 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -127,7 +127,7 @@ public: @see DirectoryItem::getFileStatus() */ - static inline RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL ) + static RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL ) { return static_cast< RC >( osl_getCanonicalName( ustrRequestedURL.pData, &ustrValidURL.pData ) ); } @@ -167,7 +167,7 @@ public: @see DirectoryItem::getFileStatus() */ - static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, const ::rtl::OUString& ustrRelativeFileURL, ::rtl::OUString& ustrAbsoluteFileURL ) + static RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, const ::rtl::OUString& ustrRelativeFileURL, ::rtl::OUString& ustrAbsoluteFileURL ) { return static_cast< RC >( osl_getAbsoluteFileURL( ustrBaseDirectoryURL.pData, ustrRelativeFileURL.pData, &ustrAbsoluteFileURL.pData ) ); } @@ -187,7 +187,7 @@ public: @see getFileURLFromSystemPath() */ - static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, ::rtl::OUString& ustrSystemPath ) + static RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, ::rtl::OUString& ustrSystemPath ) { return static_cast< RC >( osl_getSystemPathFromFileURL( ustrFileURL.pData, &ustrSystemPath.pData ) ); } @@ -207,7 +207,7 @@ public: @see getSystemPathFromFileURL() */ - static inline RC getFileURLFromSystemPath( const ::rtl::OUString& ustrSystemPath, ::rtl::OUString& ustrFileURL ) + static RC getFileURLFromSystemPath( const ::rtl::OUString& ustrSystemPath, ::rtl::OUString& ustrFileURL ) { return static_cast< RC >( osl_getFileURLFromSystemPath( ustrSystemPath.pData, &ustrFileURL.pData ) ); } @@ -240,7 +240,7 @@ public: @see getSystemPathFromFileURL() */ - static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, const ::rtl::OUString& ustrSearchPath, ::rtl::OUString& ustrFileURL ) + static RC searchFileURL( const ::rtl::OUString& ustrFileName, const ::rtl::OUString& ustrSearchPath, ::rtl::OUString& ustrFileURL ) { return static_cast< RC >( osl_searchFileURL( ustrFileName.pData, ustrSearchPath.pData, &ustrFileURL.pData ) ); } @@ -255,7 +255,7 @@ public: E_NOENT no such file or directory not found */ - static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL ) + static RC getTempDirURL( ::rtl::OUString& ustrTempDirURL ) { return static_cast< RC >( osl_getTempDirURL( &ustrTempDirURL.pData ) ); } @@ -308,7 +308,7 @@ public: @see getTempDirURL() */ - static inline RC createTempFile( + static RC createTempFile( ::rtl::OUString* pustrDirectoryURL, oslFileHandle* pHandle, ::rtl::OUString* pustrTempFileURL) @@ -367,7 +367,7 @@ public: The other volume device. */ - inline VolumeDevice & operator =( const VolumeDevice & rDevice ) + VolumeDevice & operator =( const VolumeDevice & rDevice ) { oslVolumeDeviceHandle newHandle = rDevice._aHandle; @@ -387,7 +387,7 @@ public: @return The full qualified URL where the device is mounted to. */ - inline rtl::OUString getMountPath() + rtl::OUString getMountPath() { rtl::OUString aPath; osl_getVolumeDeviceMountPath( _aHandle, &aPath.pData ); @@ -457,7 +457,7 @@ public: @return true if all fields are valid else false. */ - inline bool isValid( sal_uInt32 nMask ) const + bool isValid( sal_uInt32 nMask ) const { return ( nMask & _aInfo.uValidFields ) == nMask; } @@ -468,7 +468,7 @@ public: true if Attributes are valid and the volume is remote else false. */ - inline bool getRemoteFlag() const + bool getRemoteFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_Remote); } @@ -479,7 +479,7 @@ public: true if attributes are valid and the volume is removable else false. */ - inline bool getRemoveableFlag() const + bool getRemoveableFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_Removeable); } @@ -490,7 +490,7 @@ public: true if attributes are valid and the volume is a CDROM else false. */ - inline bool getCompactDiscFlag() const + bool getCompactDiscFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_CompactDisc); } @@ -501,7 +501,7 @@ public: true if attributes are valid and the volume is a floppy disk else false. */ - inline bool getFloppyDiskFlag() const + bool getFloppyDiskFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_FloppyDisk); } @@ -512,7 +512,7 @@ public: true if attributes are valid and the volume is a fixed disk else false. */ - inline bool getFixedDiskFlag() const + bool getFixedDiskFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_FixedDisk); } @@ -523,7 +523,7 @@ public: true if attributes are valid and the volume is a RAM disk else false. */ - inline bool getRAMDiskFlag() const + bool getRAMDiskFlag() const { return 0 != (_aInfo.uAttributes & osl_Volume_Attribute_RAMDisk); } @@ -535,7 +535,7 @@ public: 0 otherwise. */ - inline sal_uInt64 getTotalSpace() const + sal_uInt64 getTotalSpace() const { return _aInfo.uTotalSpace; } @@ -547,7 +547,7 @@ public: 0 otherwise. */ - inline sal_uInt64 getFreeSpace() const + sal_uInt64 getFreeSpace() const { return _aInfo.uFreeSpace; } @@ -559,7 +559,7 @@ public: 0 otherwise. */ - inline sal_uInt64 getUsedSpace() const + sal_uInt64 getUsedSpace() const { return _aInfo.uUsedSpace; } @@ -571,7 +571,7 @@ public: 0 otherwise. */ - inline sal_uInt32 getMaxNameLength() const + sal_uInt32 getMaxNameLength() const { return _aInfo.uMaxNameLength; } @@ -583,7 +583,7 @@ public: 0 otherwise. */ - inline sal_uInt32 getMaxPathLength() const + sal_uInt32 getMaxPathLength() const { return _aInfo.uMaxPathLength; } @@ -595,7 +595,7 @@ public: otherwise an empty string. */ - inline ::rtl::OUString getFileSystemName() const + ::rtl::OUString getFileSystemName() const { return _aInfo.ustrFileSystemName ? ::rtl::OUString( _aInfo.ustrFileSystemName ) : ::rtl::OUString(); } @@ -608,7 +608,7 @@ public: otherwise returns NULL; */ - inline VolumeDevice getDeviceHandle() const + VolumeDevice getDeviceHandle() const { return _aDevice; } @@ -708,7 +708,7 @@ public: true if all fields are valid else false. */ - inline bool isValid( sal_uInt32 nMask ) const + bool isValid( sal_uInt32 nMask ) const { return ( nMask & _aStatus.uValidFields ) == nMask; } @@ -718,7 +718,7 @@ public: @return The file type. */ - inline Type getFileType() const + Type getFileType() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_Type), "sal.osl", @@ -736,7 +736,7 @@ public: @see getFileType @since LibreOffice 3.6 */ - inline bool isDirectory() const + bool isDirectory() const { return ( getFileType() == Directory || getFileType() == Volume ); } @@ -751,7 +751,7 @@ public: @see isLink @since LibreOffice 3.6 */ - inline bool isRegular() const + bool isRegular() const { return ( getFileType() == Regular ); } @@ -764,7 +764,7 @@ public: @see getFileType @since LibreOffice 3.6 */ - inline bool isLink() const + bool isLink() const { return ( getFileType() == Link ); } @@ -775,7 +775,7 @@ public: The set of attribute flags of this file. */ - inline sal_uInt64 getAttributes() const + sal_uInt64 getAttributes() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_Attributes), "sal.osl", @@ -790,7 +790,7 @@ public: TimeValue otherwise. */ - inline TimeValue getCreationTime() const + TimeValue getCreationTime() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_CreationTime), "sal.osl", @@ -805,7 +805,7 @@ public: TimeValue otherwise. */ - inline TimeValue getAccessTime() const + TimeValue getAccessTime() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_AccessTime), "sal.osl", @@ -820,7 +820,7 @@ public: TimeValue otherwise. */ - inline TimeValue getModifyTime() const + TimeValue getModifyTime() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_ModifyTime), "sal.osl", @@ -834,7 +834,7 @@ public: The actual file size if this information is valid, 0 otherwise. */ - inline sal_uInt64 getFileSize() const + sal_uInt64 getFileSize() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_FileSize), "sal.osl", @@ -848,7 +848,7 @@ public: The file name if this information is valid, an empty string otherwise. */ - inline ::rtl::OUString getFileName() const + ::rtl::OUString getFileName() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_FileName), "sal.osl", @@ -865,7 +865,7 @@ public: empty string otherwise. */ - inline ::rtl::OUString getFileURL() const + ::rtl::OUString getFileURL() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_FileURL), "sal.osl", @@ -881,7 +881,7 @@ public: otherwise. */ - inline ::rtl::OUString getLinkTargetURL() const + ::rtl::OUString getLinkTargetURL() const { SAL_INFO_IF( !isValid(osl_FileStatus_Mask_LinkTargetURL), "sal.osl", @@ -928,7 +928,7 @@ public: /** Destructor */ - inline ~File() + ~File() { close(); } @@ -940,7 +940,7 @@ public: @since LibreOffice 4.1 */ - inline rtl::OUString getURL() const { return _aPath; } + rtl::OUString getURL() const { return _aPath; } /** Open a regular file. @@ -985,7 +985,7 @@ public: @see setSize() */ - inline RC open( sal_uInt32 uFlags ) + RC open( sal_uInt32 uFlags ) { return static_cast< RC >( osl_openFile( _aPath.pData, &_pData, uFlags ) ); } @@ -1004,7 +1004,7 @@ public: @see open() */ - inline RC close() + RC close() { oslFileError Error = osl_File_E_BADF; @@ -1034,7 +1034,7 @@ public: @see getPos() */ - inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT + RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT { return static_cast< RC >( osl_setFilePos( _pData, uHow, uPos ) ); } @@ -1055,7 +1055,7 @@ public: @see write() */ - inline RC getPos( sal_uInt64& uPos ) + RC getPos( sal_uInt64& uPos ) { return static_cast< RC >( osl_getFilePos( _pData, &uPos ) ); } @@ -1082,7 +1082,7 @@ public: @see setPos() */ - inline RC isEndOfFile( sal_Bool *pIsEOF ) + RC isEndOfFile( sal_Bool *pIsEOF ) { return static_cast< RC >( osl_isEndOfFile( _pData, pIsEOF ) ); } @@ -1105,7 +1105,7 @@ public: @see getStatus() */ - inline RC setSize( sal_uInt64 uSize ) + RC setSize( sal_uInt64 uSize ) { return static_cast< RC >( osl_setFileSize( _pData, uSize ) ); } @@ -1130,7 +1130,7 @@ public: @see getStatus() */ - inline RC getSize( sal_uInt64 &rSize ) + RC getSize( sal_uInt64 &rSize ) { return static_cast< RC >( osl_getFileSize( _pData, &rSize ) ); } @@ -1167,7 +1167,7 @@ public: @see setPos() */ - inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead ) + RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead ) { return static_cast< RC >( osl_readFile( _pData, pBuffer, uBytesRequested, &rBytesRead ) ); } @@ -1206,7 +1206,7 @@ public: @see setPos() */ - inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten) + RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten) { return static_cast< RC >( osl_writeFile( _pData, pBuffer, uBytesToWrite, &rBytesWritten ) ); } @@ -1236,7 +1236,7 @@ public: @see setPos() */ - inline RC readLine( ::rtl::ByteSequence& aSeq ) + RC readLine( ::rtl::ByteSequence& aSeq ) { return static_cast< RC >( osl_readLine( _pData, reinterpret_cast<sal_Sequence**>(&aSeq) ) ); } @@ -1271,7 +1271,7 @@ public: @see open() @see write() */ - inline RC sync() const + RC sync() const { OSL_PRECOND(_pData, "File::sync(): File not open"); return static_cast< RC >(osl_syncFile(_pData)); @@ -1303,7 +1303,7 @@ public: @see remove() */ - inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) + static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) { return static_cast< RC >( osl_copyFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) ); } @@ -1332,7 +1332,7 @@ public: @see copy() */ - inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) + static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) { return static_cast< RC >( osl_moveFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) ); } @@ -1365,7 +1365,7 @@ public: @see open() */ - inline static RC remove( const ::rtl::OUString& ustrFileURL ) + static RC remove( const ::rtl::OUString& ustrFileURL ) { return static_cast< RC >( osl_removeFile( ustrFileURL.pData ) ); } @@ -1385,7 +1385,7 @@ public: @see FileStatus */ - inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes ) + static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes ) { return static_cast< RC >( osl_setFileAttributes( ustrFileURL.pData, uAttributes ) ); } @@ -1412,7 +1412,7 @@ public: @see FileStatus */ - inline static RC setTime( + static RC setTime( const ::rtl::OUString& ustrFileURL, const TimeValue& rCreationTime, const TimeValue& rLastAccessTime, @@ -1489,7 +1489,7 @@ public: true if object is valid directory item else false. */ - inline bool is() + bool is() { return _pData != NULL; } @@ -1528,7 +1528,7 @@ public: @see Directory::getNextItem() */ - static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem ) + static RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem ) { if( rItem._pData) { @@ -1571,7 +1571,7 @@ public: @see FileStatus */ - inline RC getFileStatus( FileStatus& rStatus ) + RC getFileStatus( FileStatus& rStatus ) { return static_cast< RC >( osl_getFileStatus( _pData, &rStatus._aStatus, rStatus._nMask ) ); } @@ -1592,7 +1592,7 @@ public: @since LibreOffice 3.6 */ - inline bool isIdenticalTo( const DirectoryItem &pOther ) + bool isIdenticalTo( const DirectoryItem &pOther ) { return osl_identicalDirectoryItem( _pData, pOther._pData ); } @@ -1685,7 +1685,7 @@ public: @since LibreOffice 4.1 */ - inline rtl::OUString getURL() const { return _aPath; } + rtl::OUString getURL() const { return _aPath; } /** Open a directory for enumerating its contents. @@ -1705,7 +1705,7 @@ public: @see close() */ - inline RC open() + RC open() { return static_cast< RC >( osl_openDirectory( _aPath.pData, &_pData ) ); } @@ -1721,7 +1721,7 @@ public: @see close() */ - inline bool isOpen() { return _pData != NULL; } + bool isOpen() { return _pData != NULL; } /** Close a directory. @@ -1735,7 +1735,7 @@ public: @see open() */ - inline RC close() + RC close() { oslFileError Error = osl_File_E_BADF; @@ -1766,7 +1766,7 @@ public: @see open() */ - inline RC reset() + RC reset() { close(); return open(); @@ -1795,7 +1795,7 @@ public: @see DirectoryItem */ - inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 ) + RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 ) { if( rItem._pData ) { @@ -1837,7 +1837,7 @@ public: @see VolumeInfo */ - inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo ) + static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo ) { return static_cast< RC >( osl_getVolumeInformation( ustrDirectoryURL.pData, &rInfo._aInfo, rInfo._nMask ) ); } @@ -1873,7 +1873,7 @@ public: @see remove() */ - inline static RC create( + static RC create( const ::rtl::OUString& ustrDirectoryURL, sal_uInt32 flags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ) { @@ -1909,7 +1909,7 @@ public: @see create() */ - inline static RC remove( const ::rtl::OUString& ustrDirectoryURL ) + static RC remove( const ::rtl::OUString& ustrDirectoryURL ) { return static_cast< RC >( osl_removeDirectory( ustrDirectoryURL.pData ) ); } diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx index 6c2392f0da30..4708ec011386 100644 --- a/include/osl/thread.hxx +++ b/include/osl/thread.hxx @@ -51,13 +51,13 @@ class Thread Thread& operator= ( const Thread& ) SAL_DELETED_FUNCTION; public: // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new( size_t, void * pMem ) + static void * SAL_CALL operator new( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete( void *, void * ) + static void SAL_CALL operator delete( void *, void * ) {} Thread(): m_hThread(NULL){} @@ -148,7 +148,7 @@ public: osl_yieldThread(); } - static inline void setName(char const * name) throw () { + static void setName(char const * name) throw () { osl_setThreadName(name); } diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx index e058724e8e9f..4c1ce0e29a3b 100644 --- a/include/rtl/bootstrap.hxx +++ b/include/rtl/bootstrap.hxx @@ -120,21 +120,21 @@ namespace rtl @param macro [inout] The macro to be expanded */ - inline void expandMacrosFrom( ::rtl::OUString & macro ) const + void expandMacrosFrom( ::rtl::OUString & macro ) const { rtl_bootstrap_expandMacros_from_handle( _handle, ¯o.pData ); } /** Expands a macro using default bootstrap variables. @param macro [inout] The macro to be expanded */ - static inline void expandMacros( ::rtl::OUString & macro ) + static void expandMacros( ::rtl::OUString & macro ) { rtl_bootstrap_expandMacros( ¯o.pData ); } /** Provides the bootstrap internal handle. @return bootstrap handle */ - inline rtlBootstrapHandle getHandle() const + rtlBootstrapHandle getHandle() const { return _handle; } /** Escapes special characters ("$" and "\"). diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h index ef003026ab51..14b8c8cd5ac2 100644 --- a/include/rtl/byteseq.h +++ b/include/rtl/byteseq.h @@ -171,13 +171,13 @@ class SAL_WARN_UNUSED ByteSequence public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -243,7 +243,7 @@ public: @return length of sequence */ - inline sal_Int32 SAL_CALL getLength() const + sal_Int32 SAL_CALL getLength() const { return _pSequence->nElements; } /** Gets a pointer to byte array for READING. If the sequence has a length of 0, then the @@ -251,7 +251,7 @@ public: @return pointer to byte array */ - inline const sal_Int8 * SAL_CALL getConstArray() const + const sal_Int8 * SAL_CALL getConstArray() const { return reinterpret_cast<sal_Int8 *>(_pSequence->elements); } /** Gets a pointer to elements array for READING AND WRITING. In general if the sequence has a handle acquired by other sequences (reference count > 1), then a new sequence is @@ -282,7 +282,7 @@ public: @param nIndex index @return const C++ reference to byte at element of index nIndex */ - inline const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const + const sal_Int8 & SAL_CALL operator [] ( sal_Int32 nIndex ) const { return getConstArray()[ nIndex ]; } /** Equality operator: Compares two sequences. @@ -310,13 +310,13 @@ public: @return UNacquired handle of the sequence */ - inline sal_Sequence * SAL_CALL getHandle() const + sal_Sequence * SAL_CALL getHandle() const { return _pSequence; } /** Returns the UNnacquired C handle of the sequence (for compatibility reasons) @return UNacquired handle of the sequence */ - inline sal_Sequence * SAL_CALL get() const + sal_Sequence * SAL_CALL get() const { return _pSequence; } }; diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx index 740c581df1ca..d1d8d9eaa44e 100644 --- a/include/rtl/instance.hxx +++ b/include/rtl/instance.hxx @@ -270,7 +270,7 @@ template< typename Inst, typename InstCtor, class rtl_Instance { public: - static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor) + static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor) { #if defined _MSC_VER static Inst * m_pInstance = 0; @@ -294,7 +294,7 @@ public: return p; } - static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor, + static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor, DataCtor aDataCtor) { #if defined _MSC_VER @@ -320,7 +320,7 @@ public: return p; } - static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor, + static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor, const Data &rData) { #if defined _MSC_VER diff --git a/include/rtl/malformeduriexception.hxx b/include/rtl/malformeduriexception.hxx index effe116fdc3e..3e294516a21f 100644 --- a/include/rtl/malformeduriexception.hxx +++ b/include/rtl/malformeduriexception.hxx @@ -36,15 +36,15 @@ public: @param rMessage A message containing any details about the exception. */ - inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException( + SAL_EXCEPTION_DLLPRIVATE MalformedUriException( rtl::OUString const & rMessage): m_aMessage(rMessage) {} - inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException( + SAL_EXCEPTION_DLLPRIVATE MalformedUriException( MalformedUriException const & other): m_aMessage(other.m_aMessage) {} - inline SAL_EXCEPTION_DLLPRIVATE ~MalformedUriException() {} + SAL_EXCEPTION_DLLPRIVATE ~MalformedUriException() {} - inline SAL_EXCEPTION_DLLPRIVATE MalformedUriException operator =( + SAL_EXCEPTION_DLLPRIVATE MalformedUriException operator =( MalformedUriException const & rOther) { m_aMessage = rOther.m_aMessage; return *this; } @@ -54,7 +54,7 @@ public: A reference to the message. The reference is valid for the lifetime of this MalformedUriException. */ - inline SAL_EXCEPTION_DLLPRIVATE rtl::OUString const & getMessage() const + SAL_EXCEPTION_DLLPRIVATE rtl::OUString const & getMessage() const { return m_aMessage; } private: diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 5eeb857f8a42..e8f624a93d6f 100644 --- a/include/rtl/ref.hxx +++ b/include/rtl/ref.hxx @@ -42,21 +42,21 @@ class Reference public: /** Constructor... */ - inline Reference() + Reference() : m_pBody (NULL) {} /** Constructor... */ - inline Reference (reference_type * pBody, __sal_NoAcquire) + Reference (reference_type * pBody, __sal_NoAcquire) : m_pBody (pBody) { } /** Constructor... */ - inline Reference (reference_type * pBody) + Reference (reference_type * pBody) : m_pBody (pBody) { if (m_pBody) @@ -65,7 +65,7 @@ public: /** Copy constructor... */ - inline Reference (const Reference<reference_type> & handle) + Reference (const Reference<reference_type> & handle) : m_pBody (handle.m_pBody) { if (m_pBody) @@ -75,7 +75,7 @@ public: #ifdef LIBO_INTERNAL_ONLY /** Move constructor... */ - inline Reference (Reference<reference_type> && handle) + Reference (Reference<reference_type> && handle) : m_pBody (handle.m_pBody) { handle.m_pBody = nullptr; @@ -84,7 +84,7 @@ public: /** Destructor... */ - inline ~Reference() + ~Reference() { if (m_pBody) m_pBody->release(); @@ -93,7 +93,7 @@ public: /** Set... Similar to assignment. */ - inline Reference<reference_type> & + Reference<reference_type> & SAL_CALL set (reference_type * pBody) { if (pBody) @@ -109,7 +109,7 @@ public: Unbinds this instance from its body (if bound) and bind it to the body represented by the handle. */ - inline Reference<reference_type> & + Reference<reference_type> & SAL_CALL operator= (const Reference<reference_type> & handle) { return set( handle.m_pBody ); @@ -121,7 +121,7 @@ public: * bind it to the body represented by the handle, and * set the body represented by the handle to nullptr. */ - inline Reference<reference_type> & + Reference<reference_type> & operator= (Reference<reference_type> && handle) { // self-movement guts ourself @@ -135,7 +135,7 @@ public: /** Assignment... */ - inline Reference<reference_type> & + Reference<reference_type> & SAL_CALL operator= (reference_type * pBody) { return set( pBody ); @@ -148,7 +148,7 @@ public: since in the second case two large objects exist in memory (the old body and the new body). */ - inline Reference<reference_type> & SAL_CALL clear() + Reference<reference_type> & SAL_CALL clear() { if (m_pBody) { @@ -164,7 +164,7 @@ public: I.e. handle->someBodyOp() and handle.get()->someBodyOp() are the same. */ - inline reference_type * SAL_CALL get() const + reference_type * SAL_CALL get() const { return m_pBody; } @@ -172,7 +172,7 @@ public: /** Probably most common used: handle->someBodyOp(). */ - inline reference_type * SAL_CALL operator->() const + reference_type * SAL_CALL operator->() const { assert(m_pBody != NULL); return m_pBody; @@ -181,7 +181,7 @@ public: /** Allows (*handle).someBodyOp(). */ - inline reference_type & SAL_CALL operator*() const + reference_type & SAL_CALL operator*() const { assert(m_pBody != NULL); return *m_pBody; @@ -190,7 +190,7 @@ public: /** Returns True if the handle does point to a valid body. */ - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (m_pBody != NULL); } @@ -198,7 +198,7 @@ public: #if defined LIBO_INTERNAL_ONLY /** Returns True if the handle does point to a valid body. */ - inline explicit operator bool() const + explicit operator bool() const { return is(); } @@ -206,7 +206,7 @@ public: /** Returns True if this points to pBody. */ - inline bool SAL_CALL operator== (const reference_type * pBody) const + bool SAL_CALL operator== (const reference_type * pBody) const { return (m_pBody == pBody); } @@ -214,7 +214,7 @@ public: /** Returns True if handle points to the same body. */ - inline bool + bool SAL_CALL operator== (const Reference<reference_type> & handle) const { return (m_pBody == handle.m_pBody); @@ -223,7 +223,7 @@ public: /** Needed to place References into STL collection. */ - inline bool + bool SAL_CALL operator!= (const Reference<reference_type> & handle) const { return (m_pBody != handle.m_pBody); @@ -232,7 +232,7 @@ public: /** Needed to place References into STL collection. */ - inline bool + bool SAL_CALL operator< (const Reference<reference_type> & handle) const { return (m_pBody < handle.m_pBody); @@ -241,7 +241,7 @@ public: /** Needed to place References into STL collection. */ - inline bool + bool SAL_CALL operator> (const Reference<reference_type> & handle) const { return (m_pBody > handle.m_pBody); diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 8f5d044e5a4e..37876983cd1b 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -154,7 +154,7 @@ public: @param str a OString data. */ - inline OString( rtl_String * str, __sal_NoAcquire ) + OString( rtl_String * str, __sal_NoAcquire ) { pData = str; } diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index a313307dd7d6..32ce9cabe269 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -1277,7 +1277,7 @@ public: This output parameter receives a pointer to the internal capacity. pInternalCapacity itself must not be null. */ - inline void accessInternals(rtl_uString *** pInternalData, + void accessInternals(rtl_uString *** pInternalData, sal_Int32 ** pInternalCapacity) { *pInternalData = &pData; diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 4c8e373a1c04..50f3be69bbbd 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -180,7 +180,7 @@ public: @param str OUString data */ - inline OUString( rtl_uString * str, __sal_NoAcquire ) + OUString( rtl_uString * str, __sal_NoAcquire ) { pData = str; } /** @@ -375,7 +375,7 @@ public: @since UDK 3.2.7 */ - inline explicit OUString( + explicit OUString( sal_uInt32 const * codePoints, sal_Int32 codePointCount): pData(NULL) { @@ -424,7 +424,7 @@ public: @return OUString const & based on given storage */ - static inline OUString const & unacquired( rtl_uString * const * ppHandle ) + static OUString const & unacquired( rtl_uString * const * ppHandle ) { return * reinterpret_cast< OUString const * >( ppHandle ); } /** @@ -1570,7 +1570,7 @@ public: @since UDK 3.2.7 */ - inline bool endsWithAsciiL(char const * asciiStr, sal_Int32 asciiStrLength) + bool endsWithAsciiL(char const * asciiStr, sal_Int32 asciiStrLength) const { return asciiStrLength <= pData->length @@ -1691,7 +1691,7 @@ public: @return true if this string ends with asciiStr, ignoring the case of ASCII letters ("A"--"Z" and "a"--"z"); otherwise, false is returned */ - inline bool endsWithIgnoreAsciiCaseAsciiL( + bool endsWithIgnoreAsciiCaseAsciiL( char const * asciiStr, sal_Int32 asciiStrLength) const { return asciiStrLength <= pData->length @@ -1732,7 +1732,7 @@ public: * @since LibreOffice 3.6 */ template< typename T > - friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& rString, T& literal ) + friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& rString, T& literal ) { assert( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal)); @@ -1748,7 +1748,7 @@ public: * @since LibreOffice 3.6 */ template< typename T > - friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& rString ) + friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& rString ) { assert( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal)); @@ -1764,7 +1764,7 @@ public: * @since LibreOffice 3.6 */ template< typename T > - friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& rString, T& literal ) + friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& rString, T& literal ) { assert( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal)); @@ -1780,7 +1780,7 @@ public: * @since LibreOffice 3.6 */ template< typename T > - friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& rString ) + friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& rString ) { assert( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal)); @@ -1791,8 +1791,7 @@ public: #if defined LIBO_INTERNAL_ONLY /** @overload @since LibreOffice 5.3 */ - template<typename T> friend inline - typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 + template<typename T> friend typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 operator ==(OUString & string, T & literal) { return rtl_ustr_reverseCompare_WithLength( @@ -1803,8 +1802,7 @@ public: == 0; } /** @overload @since LibreOffice 5.3 */ - template<typename T> friend inline - typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 + template<typename T> friend typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 operator ==(T & literal, OUString & string) { return rtl_ustr_reverseCompare_WithLength( @@ -1815,8 +1813,7 @@ public: == 0; } /** @overload @since LibreOffice 5.3 */ - template<typename T> friend inline - typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 + template<typename T> friend typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 operator !=(OUString & string, T & literal) { return rtl_ustr_reverseCompare_WithLength( @@ -1827,8 +1824,7 @@ public: != 0; } /** @overload @since LibreOffice 5.3 */ - template<typename T> friend inline - typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 + template<typename T> friend typename libreoffice_internal::ConstCharArrayDetector<T, bool>::TypeUtf16 operator !=(T & literal, OUString & string) { return rtl_ustr_reverseCompare_WithLength( @@ -3226,7 +3222,7 @@ public: @return True if the conversion succeeded, false otherwise. */ - inline bool convertToString(OString * pTarget, rtl_TextEncoding nEncoding, + bool convertToString(OString * pTarget, rtl_TextEncoding nEncoding, sal_uInt32 nFlags) const { return rtl_convertUStringToString(&pTarget->pData, pData->buffer, @@ -3284,7 +3280,7 @@ public: @since UDK 3.2.7 */ - inline sal_uInt32 iterateCodePoints( + sal_uInt32 iterateCodePoints( sal_Int32 * indexUtf16, sal_Int32 incrementCodePoints = 1) const { return rtl_uString_iterateCodePoints( @@ -3300,7 +3296,7 @@ public: * * @since LibreOffice 4.4 */ - static inline OUString fromUtf8(const OString& rSource) + static OUString fromUtf8(const OString& rSource) { OUString aTarget; bool bSuccess = rtl_convertStringToUString(&aTarget.pData, @@ -3323,7 +3319,7 @@ public: * * @since LibreOffice 4.4 */ - inline OString toUtf8() const + OString toUtf8() const { OString aTarget; bool bSuccess = rtl_convertUStringToString(&aTarget.pData, diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index c1535334fb2c..bb2f31bcd78f 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -62,7 +62,7 @@ public: public: /** Construction. */ - inline ReferenceObject() : m_nReferenceCount(0) + ReferenceObject() : m_nReferenceCount(0) {} diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx index 46b00ac332c2..e21797ce91be 100644 --- a/include/salhelper/simplereferenceobject.hxx +++ b/include/salhelper/simplereferenceobject.hxx @@ -57,7 +57,7 @@ namespace salhelper { class SALHELPER_DLLPUBLIC SimpleReferenceObject { public: - inline SimpleReferenceObject(): m_nCount(0) {} + SimpleReferenceObject(): m_nCount(0) {} /** @attention The results are undefined if, for any individual instance of @@ -65,10 +65,10 @@ public: the total number of calls to release() by a platform dependent amount (which, hopefully, is quite large). */ - inline void acquire() + void acquire() { osl_atomic_increment(&m_nCount); } - inline void release() + void release() { if (osl_atomic_decrement(&m_nCount) == 0) delete this; } /** see general class documentation diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx index 7b61a2972204..9cf827f0edc9 100644 --- a/include/salhelper/thread.hxx +++ b/include/salhelper/thread.hxx @@ -62,10 +62,10 @@ public: using osl::Thread::wait; using osl::Thread::yield; - static inline void * operator new(std::size_t size) + static void * operator new(std::size_t size) { return SimpleReferenceObject::operator new(size); } - static inline void operator delete(void * pointer) + static void operator delete(void * pointer) { SimpleReferenceObject::operator delete(pointer); } protected: diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx index 60c0b87b6b56..25c31550a079 100644 --- a/include/sax/fshelper.hxx +++ b/include/sax/fshelper.hxx @@ -111,15 +111,15 @@ public: void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, sal_Int32 attribute, const OString& value, FSEND_t) { singleElementInternal( FSNS( namespaceTokenId, elementTokenId), attribute, value.getStr(), FSEND_internal ); } void endElement(sal_Int32 elementTokenId); - inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId) + void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId) { endElement( FSNS( namespaceTokenId, elementTokenId ) ); } void singleElement(sal_Int32 elementTokenId, const XFastAttributeListRef& xAttrList); - inline void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList) + void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList) { singleElement(FSNS( namespaceTokenId, elementTokenId), xAttrList); } void startElement(sal_Int32 elementTokenId, const XFastAttributeListRef& xAttrList); - inline void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList) + void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, XFastAttributeListRef const & xAttrList) { startElement( FSNS( namespaceTokenId, elementTokenId ), xAttrList ); } FastSerializerHelper* write(const char* value); diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 1e4a2c8f28f2..d85b681de705 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -79,7 +79,7 @@ public: is used (simply casting between list position and values). If the map exists, it *MUST* be terminated by an entry containing the special "not found" list position. */ - inline explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) : + explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) : mpMap( pMap ), mnNFPos( nNFPos ) {} /** Returns the value at the specified list position. @@ -90,7 +90,7 @@ public: PosT GetPosFromValue( ValueT nValue ) const; /** Returns the special "not found" list position. */ - inline PosT GetNotFoundPos() const { return mnNFPos; } + PosT GetNotFoundPos() const { return mnNFPos; } private: const MapEntryType* mpMap; /// The list position/value map. @@ -143,7 +143,7 @@ private: class SFX2_DLLPUBLIC ControlWrapperBase { public: - inline explicit ControlWrapperBase() {} + explicit ControlWrapperBase() {} virtual ~ControlWrapperBase(); /** Derived classes enable, disable, show, or hide control(s). @@ -185,12 +185,12 @@ public: typedef ValueT ControlValueType; typedef SingleControlWrapper< ControlT, ValueT > SingleControlWrapperType; - inline explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {} + explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {} /** Returns a reference to the control this connection works on. */ - inline const ControlT& GetControl() const { return mrControl; } + const ControlT& GetControl() const { return mrControl; } /** Returns a reference to the control this connection works on. */ - inline ControlT& GetControl() { return mrControl; } + ControlT& GetControl() { return mrControl; } /** Enables, disables, shows, or hides the control. @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ @@ -251,7 +251,7 @@ template< typename ValueT > class MetricFieldWrapper : public SingleControlWrapper< MetricField, ValueT > { public: - inline explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) : + explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) : SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE; @@ -285,7 +285,7 @@ public: /** @param pMap Optional list position <-> value map. See PosValueMapper documentation for details. */ - inline explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) : + explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) : SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE @@ -318,7 +318,7 @@ public: /** @param pMap Optional position <-> value map. See PosValueMapper documentation for details. */ - inline explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) : + explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) : SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE @@ -388,9 +388,9 @@ public: MultiControlWrapper() : maDefValue( 0 ){} /** Returns the default value that can be used in GetControlValue(). */ - inline const ValueT& GetDefaultValue() const { return maDefValue; } + const ValueT& GetDefaultValue() const { return maDefValue; } /** Sets a default value that can be used in GetControlValue(). */ - inline void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; } + void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; } /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index bea1e06311d8..216fa6fc9aee 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -358,9 +358,9 @@ public: virtual void Resize() override; - inline void CheckYes() { m_aYesButton->Check(); } - inline void CheckNo() { m_aNoButton->Check(); } - inline bool IsYesChecked() const { return m_aYesButton->IsChecked(); } + void CheckYes() { m_aYesButton->Check(); } + void CheckNo() { m_aNoButton->Check(); } + bool IsYesChecked() const { return m_aYesButton->IsChecked(); } }; // struct CustomPropertyLine --------------------------------------------- @@ -436,7 +436,7 @@ public: bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); sal_uInt16 GetVisibleLineCount() const; - inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } + sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const OUString& sName, css::uno::Any& rAny ); bool AreAllLinesValid() const; void ClearAllLines(); @@ -472,9 +472,9 @@ public: void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive ); - inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } - inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } - inline css::uno::Sequence< css::beans::PropertyValue > + bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } + void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } + css::uno::Sequence< css::beans::PropertyValue > GetCustomProperties() const { return m_pPropertiesWin->GetCustomProperties(); } void Init(VclBuilderContainer& rParent); @@ -562,8 +562,8 @@ public: CmisPropertiesWindow(SfxTabPage* pParent); ~CmisPropertiesWindow(); - inline sal_Int32 GetItemHeight() const { return m_nItemHeight; } - inline long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); }; + sal_Int32 GetItemHeight() const { return m_nItemHeight; } + long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); }; void AddLine( const OUString& sId, const OUString& sName, const OUString& sType, const bool bUpdatable, const bool bRequired, const bool bMultiValued, @@ -601,7 +601,7 @@ public: css::uno::Any& rAny ); void ClearAllLines(); - inline css::uno::Sequence< css::document::CmisProperty > + css::uno::Sequence< css::document::CmisProperty > GetCmisProperties() const { return m_pPropertiesWin.GetCmisProperties(); } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 039a9e54cb9c..28159ec0cb45 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -134,7 +134,7 @@ public: ErrCode Execute(); void StartExecuteModal( const Link<FileDialogHelper*,void>& rEndDialogHdl ); - inline ErrCode GetError() const { return m_nError; } + ErrCode GetError() const { return m_nError; } sal_Int16 GetDialogType() const; bool IsPasswordEnabled() const; OUString GetRealFilter() const; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 0633bf2d0a92..a379a1120ed7 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -90,12 +90,12 @@ public: typedef ValueT ItemValueType; typedef SingleItemWrapper< ItemT, ValueT > SingleItemWrapperType; - inline explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} + explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} virtual ~SingleItemWrapper() {} /** Returns the SID this wrapper works on. */ - inline sal_uInt16 GetSlotId() const { return mnSlot; } + sal_uInt16 GetSlotId() const { return mnSlot; } /** Returns the item from an item set, if it is not in "don't know" state. @descr Similar to ItemWrapperHelper::GetUniqueItem(), but works always @@ -131,7 +131,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT > class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT > { public: - inline explicit ValueItemWrapper( sal_uInt16 nSlot ) : + explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE @@ -151,7 +151,7 @@ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > { public: - inline explicit IdentItemWrapper( sal_uInt16 nSlot ) : + explicit IdentItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {} virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index ceca0fd2aeab..339c8032ccb8 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -164,7 +164,7 @@ public: // #i88291# void clearStreamToLoadFrom(); - inline bool WasLastEditOK() const { return bWasLastEditOK; } + bool WasLastEditOK() const { return bWasLastEditOK; } FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const; }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9a42e24c5917..cf1ca2a2fe2d 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -792,7 +792,7 @@ class SfxObjectShellLock protected: SfxObjectShell * pObj; public: - inline SfxObjectShellLock() { pObj = nullptr; } + SfxObjectShellLock() { pObj = nullptr; } inline SfxObjectShellLock( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock( SfxObjectShellLock && rObj ); inline SfxObjectShellLock( SfxObjectShell * pObjP ); @@ -801,11 +801,11 @@ public: inline SfxObjectShellLock & operator = ( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock & operator = ( SfxObjectShellLock && rObj ); inline SfxObjectShellLock & operator = ( SfxObjectShell * pObj ); - inline bool Is() const { return pObj != nullptr; } - inline SfxObjectShell * operator & () const { return pObj; } - inline SfxObjectShell * operator -> () const { return pObj; } - inline SfxObjectShell & operator * () const { return *pObj; } - inline operator SfxObjectShell * () const { return pObj; } + bool Is() const { return pObj != nullptr; } + SfxObjectShell * operator & () const { return pObj; } + SfxObjectShell * operator -> () const { return pObj; } + SfxObjectShell & operator * () const { return *pObj; } + operator SfxObjectShell * () const { return pObj; } }; inline SfxObjectShellLock::SfxObjectShellLock( const SfxObjectShellLock & rObj ) { diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index c1302571972e..8e0473df1825 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -167,15 +167,15 @@ public: void HideNewCategoryOption(); - inline const OUString& GetSelectedCategory() const { + const OUString& GetSelectedCategory() const { return msSelectedCategory; }; - inline void SetSelectLabelText(OUString const & sText) const { + void SetSelectLabelText(OUString const & sText) const { mpSelectLabel->SetText(sText); }; - inline bool IsNewCategoryCreated() const { + bool IsNewCategoryCreated() const { return mbIsNewCategory; } @@ -199,8 +199,8 @@ public: virtual void dispose() override; virtual short Execute() override; - inline OUString const & getTemplatePath() const { return msTemplatePath; }; - inline bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; + OUString const & getTemplatePath() const { return msTemplatePath; }; + bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; private: DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); diff --git a/include/store/store.hxx b/include/store/store.hxx index 012afd1ab9b2..fc25856b903a 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -39,13 +39,13 @@ class OStoreStream public: /** Construction. */ - inline OStoreStream() + OStoreStream() : m_hImpl (nullptr) {} /** Destruction. */ - inline ~OStoreStream() + ~OStoreStream() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -53,7 +53,7 @@ public: /** Copy construction. */ - inline OStoreStream (OStoreStream const & rhs) + OStoreStream (OStoreStream const & rhs) : m_hImpl (rhs.m_hImpl) { if (m_hImpl) @@ -62,7 +62,7 @@ public: /** Assignment. */ - inline OStoreStream & operator= (OStoreStream const & rhs) + OStoreStream & operator= (OStoreStream const & rhs) { if (rhs.m_hImpl) (void) store_acquireHandle (rhs.m_hImpl); @@ -75,7 +75,7 @@ public: /** Open the stream. @see store_openStream() */ - inline storeError create ( + storeError create ( storeFileHandle hFile, rtl::OUString const & rPath, rtl::OUString const & rName, @@ -92,7 +92,7 @@ public: /** Read from the stream. @see store_readStream() */ - inline storeError readAt ( + storeError readAt ( sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes, @@ -107,7 +107,7 @@ public: /** Write to the stream. @see store_writeStream() */ - inline storeError writeAt ( + storeError writeAt ( sal_uInt32 nOffset, void const * pBuffer, sal_uInt32 nBytes, @@ -135,13 +135,13 @@ class OStoreDirectory public: /** Construction. */ - inline OStoreDirectory() + OStoreDirectory() : m_hImpl (nullptr) {} /** Destruction. */ - inline ~OStoreDirectory() + ~OStoreDirectory() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -149,7 +149,7 @@ public: /** Copy construction. */ - inline OStoreDirectory (OStoreDirectory const & rhs) + OStoreDirectory (OStoreDirectory const & rhs) : m_hImpl (rhs.m_hImpl) { if (m_hImpl) @@ -158,7 +158,7 @@ public: /** Move construction. */ - inline OStoreDirectory (OStoreDirectory && rhs) + OStoreDirectory (OStoreDirectory && rhs) : m_hImpl (rhs.m_hImpl) { rhs.m_hImpl = nullptr; @@ -166,7 +166,7 @@ public: /** Assignment. */ - inline OStoreDirectory & operator= (OStoreDirectory const & rhs) + OStoreDirectory & operator= (OStoreDirectory const & rhs) { if (rhs.m_hImpl) (void) store_acquireHandle (rhs.m_hImpl); @@ -178,7 +178,7 @@ public: /** Move assignment. */ - inline OStoreDirectory & operator= (OStoreDirectory && rhs) + OStoreDirectory & operator= (OStoreDirectory && rhs) { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -190,7 +190,7 @@ public: /** Open the directory. @see store_openDirectory() */ - inline storeError create ( + storeError create ( storeFileHandle hFile, rtl::OUString const & rPath, rtl::OUString const & rName, @@ -213,7 +213,7 @@ public: /** Find first directory entry. @see store_findFirst() */ - inline storeError first (iterator& it) + storeError first (iterator& it) { if (!m_hImpl) return store_E_InvalidHandle; @@ -224,7 +224,7 @@ public: /** Find next directory entry. @see store_findNext() */ - inline storeError next (iterator& it) + storeError next (iterator& it) { if (!m_hImpl) return store_E_InvalidHandle; @@ -248,13 +248,13 @@ class OStoreFile public: /** Construction. */ - inline OStoreFile() + OStoreFile() : m_hImpl (nullptr) {} /** Destruction. */ - inline ~OStoreFile() + ~OStoreFile() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -262,7 +262,7 @@ public: /** Copy construction. */ - inline OStoreFile (OStoreFile const & rhs) + OStoreFile (OStoreFile const & rhs) : m_hImpl (rhs.m_hImpl) { if (m_hImpl) @@ -271,7 +271,7 @@ public: /** Assignment. */ - inline OStoreFile & operator= (OStoreFile const & rhs) + OStoreFile & operator= (OStoreFile const & rhs) { if (rhs.m_hImpl) (void) store_acquireHandle (rhs.m_hImpl); @@ -283,7 +283,7 @@ public: /** Conversion into File Handle. */ - inline operator storeFileHandle() const + operator storeFileHandle() const { return m_hImpl; } @@ -291,7 +291,7 @@ public: /** Check for a valid File Handle. @return sal_True if valid, sal_False otherwise. */ - inline bool isValid() const + bool isValid() const { return (m_hImpl != nullptr); } @@ -299,7 +299,7 @@ public: /** Open the file. @see store_openFile() */ - inline storeError create( + storeError create( rtl::OUString const & rFilename, storeAccessMode eAccessMode ) { @@ -314,7 +314,7 @@ public: /** Open the temporary file in memory. @see store_createMemoryFile() */ - inline storeError createInMemory () + storeError createInMemory () { if (m_hImpl) { @@ -327,7 +327,7 @@ public: /** Close the file. @see store_closeFile() */ - inline void close() + void close() { if (m_hImpl) { @@ -339,7 +339,7 @@ public: /** Flush the file. @see store_flushFile() */ - inline storeError flush() const + storeError flush() const { if (!m_hImpl) return store_E_InvalidHandle; @@ -350,7 +350,7 @@ public: /** Remove a file entry. @see store_remove() */ - inline storeError remove ( + storeError remove ( rtl::OUString const & rPath, rtl::OUString const & rName) { if (!m_hImpl) diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 767bd7fa8509..e3b7d589ece7 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -81,8 +81,8 @@ class SVL_DLLPUBLIC SvxMacroTableDtor private: SvxMacroTable aSvxMacroTable; public: - inline SvxMacroTableDtor() {} - inline SvxMacroTableDtor( const SvxMacroTableDtor &rCpy ) : aSvxMacroTable(rCpy.aSvxMacroTable) { } + SvxMacroTableDtor() {} + SvxMacroTableDtor( const SvxMacroTableDtor &rCpy ) : aSvxMacroTable(rCpy.aSvxMacroTable) { } SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy ); bool operator==( const SvxMacroTableDtor& rOther ) const; @@ -133,8 +133,8 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override; - inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} - inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } + const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} + void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } inline const SvxMacro& GetMacro( sal_uInt16 nEvent ) const; inline bool HasMacro( sal_uInt16 nEvent ) const; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 54571a6a48f8..78ed4120841f 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -173,7 +173,7 @@ public: SfxPoolItem* CloneSetWhich( sal_uInt16 nNewWhich ) const; sal_uInt32 GetRefCount() const { return m_nRefCount; } - inline SfxItemKind GetKind() const { return m_nKind; } + SfxItemKind GetKind() const { return m_nKind; } virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index aa39e273e288..a7187df469d7 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -41,7 +41,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline sal_uInt16& From() { return nFrom; } + sal_uInt16& From() { return nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const override; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override; }; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 1f6d5553d336..0c3a86772f78 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -191,8 +191,8 @@ public: inline bool IsMatchFullHalfWidthForms() const; void SetMatchFullHalfWidthForms( bool bVal ); - inline bool IsUseAsianOptions() const { return m_bAsianOptions; } - inline void SetUseAsianOptions( bool bVal ) { m_bAsianOptions = bVal; } + bool IsUseAsianOptions() const { return m_bAsianOptions; } + void SetUseAsianOptions( bool bVal ) { m_bAsianOptions = bVal; } sal_Int32 GetStartPointX() const; sal_Int32 GetStartPointY() const; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index dfdd8ebe2623..a1e87a7f58c3 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -293,7 +293,7 @@ public: sal_uInt16 nCurrFormat, bool bBank ); /// General Unicode Euro symbol - static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } + static sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } }; typedef std::vector< OUString > NfWSStringsDtor; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 6784f807344a..b226137f9da3 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -243,9 +243,9 @@ public: void SelectEntry( sal_uInt16 nStyle, bool bSelect = true ); sal_uInt16 GetSelectEntryStyle() const; - inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } + void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } + void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } void SetColor( const Color& rColor ); const Color& GetColor() const { return aColor; } diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 91ec525f110b..b129bddf5555 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -47,7 +47,7 @@ namespace svt public: DialogClosedListener(); - inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } + void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods virtual void SAL_CALL dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) override; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index d11dcafb07f5..4bf90f3a4792 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -106,7 +106,7 @@ namespace svt // suspending the controller is not culmulative! void suspend( ); void resume( ); - inline bool isSuspended( ) const { return bSuspended; } + bool isSuspended( ) const { return bSuspended; } protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const; diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 2f3c9559c41b..16df99b9f756 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -49,12 +49,12 @@ public: ,m_nDefaultColor(_nDefaultColor) {} - inline const OUString& getName() const { return m_sName; } - inline const OUString& getDisplayName() const { return m_sDisplayName; } - inline sal_Int32 getColor() const { return m_nColor; } - inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } + const OUString& getName() const { return m_sName; } + const OUString& getDisplayName() const { return m_sDisplayName; } + sal_Int32 getColor() const { return m_nColor; } + sal_Int32 getDefaultColor() const { return m_nDefaultColor; } - inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } + void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } }; class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 2256a8614f15..bd79fb2e9e59 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -82,7 +82,7 @@ namespace svt css::uno::Reference<css::uno::XComponentContext> m_aContext; public: - inline bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; } + bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; } protected: OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index b39e69102486..60be20134dc3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -564,7 +564,7 @@ private: const GraphicObject* pCopyObj ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); - inline bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } + bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } // Only used in swap case by GraphicObject void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index e0fb1dfdd559..186a70b68ce8 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -295,7 +295,7 @@ public: void Clear(); void SetOffset( long nNewOffset ); - inline void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; } + void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -321,13 +321,13 @@ public: using Window::SetHelpId; - inline void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } - inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } - inline void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } - inline void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } - inline void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } + void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } + void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } + void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } + void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } + void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } - inline bool IsDragable() const { return mbDragable; } + bool IsDragable() const { return mbDragable; } /** Creates and returns the accessible object of the header bar. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index b6335631de88..e79e57105812 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -114,8 +114,8 @@ public: bool IsEqual( const IMapObject& rEqObj ); // IMap-Events - inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} - inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } + const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} + void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } }; #endif diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 0954185138ba..141363d1d068 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -81,7 +81,7 @@ public: void SetFilter(const OUString& _sFilter); - inline void EnableAutocompletion( bool _bEnable ) + void EnableAutocompletion( bool _bEnable ) { bIsAutoCompleteEnabled = _bEnable; } void SetPlaceHolder( const OUString& sPlaceHolder ) { aPlaceHolder = sPlaceHolder; } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 40c31d12e46c..a7a7ac7c7172 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -117,7 +117,7 @@ public: SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const; const CommandEvent& GetCommandEvent() const { return aCEvt; } - inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } + bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } void SetCommandHdl( const Link<SvSimpleTable*,void>& rLink ) { aCommandLink = rLink; } void SetHeaderBarClickHdl( const Link<SvSimpleTable*,void>& rLink ) { aHeaderBarClickLink = rLink; } diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index ff699e3f5fe1..67f77ee2ab28 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -110,19 +110,19 @@ public: virtual SvParserState CallParser() = 0; // calling of the parser - inline SvParserState GetStatus() const { return eState; } // StatusInfo + SvParserState GetStatus() const { return eState; } // StatusInfo - inline sal_uLong GetLineNr() const { return nlLineNr; } - inline sal_uLong GetLinePos() const { return nlLinePos; } - inline void IncLineNr() { ++nlLineNr; } - inline sal_uLong IncLinePos() { return ++nlLinePos; } + sal_uLong GetLineNr() const { return nlLineNr; } + sal_uLong GetLinePos() const { return nlLinePos; } + void IncLineNr() { ++nlLineNr; } + sal_uLong IncLinePos() { return ++nlLinePos; } inline void SetLineNr( sal_uLong nlNum ); // inline bottom inline void SetLinePos( sal_uLong nlPos ); // inline bottom sal_uInt32 GetNextChar(); // Return next Unicode codepoint in UTF32. void RereadLookahead(); - inline bool IsParserWorking() const { return SvParserState::Working == eState; } + bool IsParserWorking() const { return SvParserState::Working == eState; } Link<LinkParamNone*,void> GetAsynchCallLink() const { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); } diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 71e3629158ed..2e10dcf3df01 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -160,8 +160,8 @@ public: // Accessible ------------------------------------------------------------- - inline void DisableTransientChildren() { SetChildrenNotTransient(); } - inline bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); } + void DisableTransientChildren() { SetChildrenNotTransient(); } + bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); } bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 8cf82f4e29a5..623721180bae 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -162,7 +162,7 @@ private: std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; protected: - inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& + const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& getOwnClipboard() const { return mxClipboard; } private: @@ -195,7 +195,7 @@ protected: // derivees need to access lostOwnership in case hey override it // on windows, changing the access rights to a method gives unresolved externals, so we introduce // this impl-method here 'til the next incompatible update - inline void implCallOwnLostOwnership( + void implCallOwnLostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 002174236bc7..97e0ce929a68 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -613,7 +613,7 @@ public: /** Sets default bitmaps for collapsed and expanded nodes. */ - inline void SetNodeDefaultImages( ) + void SetNodeDefaultImages( ) { SetNodeBitmaps( GetDefaultCollapsedNodeImage( ), diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 0c40da37bd6e..08c6150d74e6 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -347,7 +347,7 @@ public: @param _nIndex The new index in parent. */ - inline void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; } + void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; } protected: /// Children manager. May be empty if there are no children. diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 57378da738c7..05feaab75582 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -51,7 +51,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) + SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) { SetValue( rOrientation.GetValue() ); return *this; @@ -99,7 +99,7 @@ public: sal_Int16 GetBottomMargin() const {return nBottomMargin; } void SetBottomMargin(sal_Int16 nBottom); - inline SvxMarginItem& operator=(const SvxMarginItem& rMargin) + SvxMarginItem& operator=(const SvxMarginItem& rMargin) { nLeftMargin = rMargin.nLeftMargin; nTopMargin = rMargin.nTopMargin; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index eb1fd88c8ba6..36ece5e8cc7a 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -64,8 +64,8 @@ public: void SelectIndex( int index, bool bFocus = false ); void OutputIndex( int index ); void DeSelect(); - inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } - inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } + bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } + sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } static sal_uInt16 GetRowPos(sal_uInt16 _nPos); static sal_uInt16 GetColumnPos(sal_uInt16 _nPos); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index ab5e4728c89a..7520faf6ca21 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -117,20 +117,20 @@ public: /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0 ); - inline RefMode GetRefMode() const { return meRefMode; } - inline const Color& GetColorPrim() const { return maColorPrim; } - inline const Color& GetColorSecn() const { return maColorSecn; } - inline const Color& GetColorGap() const { return maColorGap; } - inline bool UseGapColor() const { return mbUseGapColor; } - inline double Prim() const { return mfPrim; } - inline double Dist() const { return mfDist; } - inline double Secn() const { return mfSecn; } + RefMode GetRefMode() const { return meRefMode; } + const Color& GetColorPrim() const { return maColorPrim; } + const Color& GetColorSecn() const { return maColorSecn; } + const Color& GetColorGap() const { return maColorGap; } + bool UseGapColor() const { return mbUseGapColor; } + double Prim() const { return mfPrim; } + double Dist() const { return mfDist; } + double Secn() const { return mfSecn; } double PatternScale() const { return mfPatternScale;} void SetPatternScale( double fScale ); - inline editeng::SvxBorderStyle Type() const { return mnType; } + editeng::SvxBorderStyle Type() const { return mnType; } /** Returns the total width of this frame style. */ - inline double GetWidth() const { return mfPrim + mfDist + mfSecn; } + double GetWidth() const { return mfPrim + mfDist + mfSecn; } /** Sets the frame style to invisible state. */ void Clear(); @@ -145,12 +145,12 @@ public: void Set( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets a new reference point handling mode, does not modify other settings. */ - inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } + void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } /** Sets a new color, does not modify other settings. */ - inline void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } - inline void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } + void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } + void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } /** Sets whether to use dotted style for single hair lines. */ - inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } + void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); @@ -187,15 +187,15 @@ class SAL_WARN_UNUSED DiagStyle : public Style { public: /** Constructs an invisible diagonal frame style. */ - inline explicit DiagStyle() : mfAngle( 0.0 ) {} + explicit DiagStyle() : mfAngle( 0.0 ) {} /** Constructs a diagonal frame style passed style and angle. */ - inline explicit DiagStyle( const Style& rStyle, double fAngle ) : + explicit DiagStyle( const Style& rStyle, double fAngle ) : Style( rStyle ), mfAngle( fAngle ) {} - inline double GetAngle() const { return mfAngle; } + double GetAngle() const { return mfAngle; } /** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */ - inline DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); } + DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); } private: double mfAngle; /// Angle between this and hor. or vert. border. diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 8fec54cc2571..18989a121ca4 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -53,7 +53,7 @@ public: SvxFrameDirection GetSelectEntryValue() const; /** Saves the currently selected frame direction. */ - inline void SaveValue() { meSaveValue = GetSelectEntryValue(); } + void SaveValue() { meSaveValue = GetSelectEntryValue(); } private: SvxFrameDirection meSaveValue; /// Saved value for later comparison. diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 2a153301e015..cbe6f7186bea 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -143,7 +143,7 @@ public: /** Selects or deselects all frame borders. */ void SelectAllBorders( bool bSelect ); /** Deselects all frame borders. */ - inline void DeselectAllBorders() { SelectAllBorders( false ); } + void DeselectAllBorders() { SelectAllBorders( false ); } /** Selects or deselects all visible frame borders (ignores hidden and "don't care" borders). */ void SelectAllVisibleBorders(); diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index bbae2350ba66..0526b4409070 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -60,7 +60,7 @@ public: sal_Int32 GetTop() const { return nTop; } sal_Int32 GetBottom() const { return nBottom; } - inline SvxGrfCrop& operator=( const SvxGrfCrop& rCrop ) + SvxGrfCrop& operator=( const SvxGrfCrop& rCrop ) { nLeft = rCrop.GetLeft(); nTop = rCrop.GetTop(); nRight = rCrop.GetRight(); nBottom = rCrop.GetBottom(); diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index baf56b67b583..f3d16bc9d614 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -75,7 +75,7 @@ public: /** Shows or hides the dial control and all dependent windows. */ void Show( bool bShow ); /** Hides the dial control and all dependent windows. */ - inline void Hide() { Show( false ); } + void Hide() { Show( false ); } /** Sets the "stacked" check box to the passed state and updates dependent controls. */ void SetStackedState( TriState eState ); diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 7f9a374cf009..ea3230211ac0 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) + SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) { SetValue( rAuthor.GetValue() ); return *this; @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) + SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) { SetValue( rDate.GetValue() ); return *this; @@ -106,7 +106,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) + SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) { SetValue( rText.GetValue() ); return *this; @@ -129,7 +129,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItIdItem& operator=( const SvxPostItIdItem& rId ) + SvxPostItIdItem& operator=( const SvxPostItIdItem& rId ) { SetValue( rId.GetValue() ); return *this; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index b4aa64ade87f..bd0034030258 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -140,7 +140,7 @@ public: // Add own implementation for TRSetBaseGeometry to handle TailPos over changes virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; - inline const Point& GetFixedTailPos() const {return maFixedTailPos;} + const Point& GetFixedTailPos() const {return maFixedTailPos;} // geometry access ::basegfx::B2DPolygon getTailPolygon() const; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index adda37c3d9e6..15e476e33e89 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -57,15 +57,15 @@ public: void ResetVars(); bool TakeGluePoint(SdrGluePoint& rGP) const; - inline void SetBestConnection( bool rB ) { bBestConn = rB; }; - inline void SetBestVertex( bool rB ) { bBestVertex = rB; }; - inline void SetAutoVertex( bool rB ) { bAutoVertex = rB; }; - inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; - - inline bool IsBestConnection() const { return bBestConn; }; - inline bool IsAutoVertex() const { return bAutoVertex; }; - inline sal_uInt16 GetConnectorId() const { return nConId; }; - inline SdrObject* GetObject() const { return pObj; } + void SetBestConnection( bool rB ) { bBestConn = rB; }; + void SetBestVertex( bool rB ) { bBestVertex = rB; }; + void SetAutoVertex( bool rB ) { bAutoVertex = rB; }; + void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; + + bool IsBestConnection() const { return bBestConn; }; + bool IsAutoVertex() const { return bAutoVertex; }; + sal_uInt16 GetConnectorId() const { return nConId; }; + SdrObject* GetObject() const { return pObj; } }; diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 6ac7f6b31af5..8b17f6290da4 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -74,16 +74,16 @@ public: SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle); - inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } + void SetWrap(sal_uInt16 nW) { nWrap = nW; } - inline void SetHAlign(short nH) { nHAlign = nH; } - inline void SetHoriRel(short nR) { nHRel = nR; } + void SetHAlign(short nH) { nHAlign = nH; } + void SetHoriRel(short nR) { nHRel = nR; } - inline void SetVAlign(short nV) { nVAlign = nV; } - inline void SetVertRel(short nR) { nVRel = nR; } + void SetVAlign(short nV) { nVAlign = nV; } + void SetVertRel(short nR) { nVRel = nR; } - inline void SetTransparent(bool bT) { bTrans = bT; } - inline void SetAnchor(short nA) { nAnchor = nA; } + void SetTransparent(bool bT) { bTrans = bT; } + void SetAnchor(short nA) { nAnchor = nA; } void SetRelPos(const Point& rP); }; diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 89ff80132568..6d2c0bfc1bae 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -48,9 +48,9 @@ namespace svx OUString szServiceName; css::uno::Reference< css::beans::XPropertySet > xPropSet; - inline OXFormsDescriptor() {} - inline OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; } - inline OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) { + OXFormsDescriptor() {} + OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; } + OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) { szName = rhs.szName; szServiceName = rhs.szServiceName; xPropSet = rhs.xPropSet; diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index f5e10a5411f6..9080d918304e 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -127,7 +127,7 @@ protected: void DisposeAccessibleContext(css::uno::Reference< css::lang::XComponent> const& xContext); - inline void setPeer( const css::uno::Reference< css::awt::XWindowPeer >& _xPeer) + void setPeer( const css::uno::Reference< css::awt::XWindowPeer >& _xPeer) { mxPeer = _xPeer; mxVclWindowPeer = css::uno::Reference< css::awt::XVclWindowPeer >(mxPeer,css::uno::UNO_QUERY); // just to avoid the query_interface thing diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 2ec345c40b56..bb32d486339e 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -214,17 +214,17 @@ class SAL_WARN_UNUSED SvCompatWeakRef { tools::SvRef< SvCompatWeakHdl<T> > _xHdl; public: - inline SvCompatWeakRef( ) {} - inline SvCompatWeakRef( T* pObj ) + SvCompatWeakRef( ) {} + SvCompatWeakRef( T* pObj ) { if( pObj ) _xHdl = pObj->GetHdl(); } - inline SvCompatWeakRef& operator = ( T * pObj ) + SvCompatWeakRef& operator = ( T * pObj ) { _xHdl = pObj ? pObj->GetHdl() : nullptr; return *this; } - inline bool is() const + bool is() const { return _xHdl.is() && _xHdl->GetObj(); } explicit operator bool() const { return is(); } - inline T* operator -> () const + T* operator -> () const { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } - inline operator T* () const + operator T* () const { return _xHdl.is() ? _xHdl->GetObj() : nullptr; } }; diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index d1a9408c4bd0..cdbede709e29 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -253,12 +253,12 @@ public: // General Structure: - inline INetURLObject(): + INetURLObject(): m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) {} - inline bool HasError() const { return m_eScheme == INetProtocol::NotValid; } + bool HasError() const { return m_eScheme == INetProtocol::NotValid; } - inline OUString GetMainURL(DecodeMechanism eMechanism, + OUString GetMainURL(DecodeMechanism eMechanism, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aAbsURIRef, eMechanism, eCharset); } @@ -280,7 +280,7 @@ public: bool operator ==(INetURLObject const & rObject) const; - inline bool operator !=(INetURLObject const & rObject) const + bool operator !=(INetURLObject const & rObject) const { return !(*this == rObject); } // Strict Parsing: @@ -307,7 +307,7 @@ public: rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSysStyle::Detect); - inline void SetSmartProtocol(INetProtocol eTheSmartScheme) + void SetSmartProtocol(INetProtocol eTheSmartScheme) { m_eSmartScheme = eTheSmartScheme; } inline bool @@ -377,7 +377,7 @@ public: struct SchemeInfo; - inline INetProtocol GetProtocol() const { return m_eScheme; } + INetProtocol GetProtocol() const { return m_eScheme; } bool isSchemeEqualTo(INetProtocol scheme) const { return scheme == m_eScheme; } @@ -411,19 +411,19 @@ public: // User Info: - inline bool HasUserData() const { return m_aUser.isPresent(); } + bool HasUserData() const { return m_aUser.isPresent(); } - inline OUString GetUser(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetUser(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aUser, eMechanism, eCharset); } - inline OUString GetPass(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetPass(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aAuth, eMechanism, eCharset); } - inline bool SetUser(OUString const & rTheUser) + bool SetUser(OUString const & rTheUser) { return setUser(rTheUser, RTL_TEXTENCODING_UTF8); } inline bool SetPass(OUString const & rThePassword); @@ -433,9 +433,9 @@ public: // Host and Port: - inline bool HasPort() const { return m_aPort.isPresent(); } + bool HasPort() const { return m_aPort.isPresent(); } - inline OUString GetHost(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetHost(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aHost, eMechanism, eCharset); } @@ -445,21 +445,21 @@ public: sal_uInt32 GetPort() const; - inline bool SetHost(OUString const & rTheHost) + bool SetHost(OUString const & rTheHost) { return setHost(rTheHost, RTL_TEXTENCODING_UTF8); } bool SetPort(sal_uInt32 nThePort); // Path: - inline bool HasURLPath() const { return !m_aPath.isEmpty(); } + bool HasURLPath() const { return !m_aPath.isEmpty(); } - inline OUString GetURLPath(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetURLPath(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aPath, eMechanism, eCharset); } - inline bool SetURLPath(OUString const & rThePath, + bool SetURLPath(OUString const & rThePath, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setPath(rThePath, eMechanism, eCharset); } @@ -724,9 +724,9 @@ public: // Query: - inline bool HasParam() const { return m_aQuery.isPresent(); } + bool HasParam() const { return m_aQuery.isPresent(); } - inline OUString GetParam(rtl_TextEncoding eCharset + OUString GetParam(rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aQuery, DecodeMechanism::NONE, eCharset); } @@ -736,9 +736,9 @@ public: // Fragment: - inline bool HasMark() const { return m_aFragment.isPresent(); } + bool HasMark() const { return m_aFragment.isPresent(); } - inline OUString GetMark(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetMark(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return decode(m_aFragment, eMechanism, eCharset); } @@ -930,14 +930,14 @@ public: EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline OUString GetName(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, + OUString GetName(DecodeMechanism eMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const { return GetLastName(eMechanism, eCharset); } void SetExtension(OUString const & rTheExtension); - inline OUString GetExtension() const + OUString GetExtension() const { return GetFileExtension(); } OUString CutExtension(); @@ -954,19 +954,19 @@ private: sal_Int32 m_nLength; public: - explicit inline SubString(sal_Int32 nTheBegin = -1, + explicit SubString(sal_Int32 nTheBegin = -1, sal_Int32 nTheLength = 0): m_nBegin(nTheBegin), m_nLength(nTheLength) {} - inline bool isPresent() const { return m_nBegin != -1; } + bool isPresent() const { return m_nBegin != -1; } - inline bool isEmpty() const { return m_nLength == 0; } + bool isEmpty() const { return m_nLength == 0; } - inline sal_Int32 getBegin() const { return m_nBegin; } + sal_Int32 getBegin() const { return m_nBegin; } - inline sal_Int32 getLength() const { return m_nLength; } + sal_Int32 getLength() const { return m_nLength; } - inline sal_Int32 getEnd() const { return m_nBegin + m_nLength; } + sal_Int32 getEnd() const { return m_nBegin + m_nLength; } inline sal_Int32 clear(); diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx index 8ce75bd1691b..8ec814173604 100644 --- a/include/typelib/typedescription.hxx +++ b/include/typelib/typedescription.hxx @@ -52,13 +52,13 @@ class TypeDescription public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -111,7 +111,7 @@ public: @param rTypeDescr another type description @return this TypeDescription */ - inline TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) + TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) { return this->operator =( rTypeDescr.get() ); } #if defined LIBO_INTERNAL_ONLY @@ -136,7 +136,7 @@ public: @param rTypeDescr another type description @return true, if both type descriptions are equal, false otherwise */ - inline bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const + bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const { return equals( rTypeDescr._pTypeDescr ); } /** Makes stored type description complete. @@ -147,13 +147,13 @@ public: @return stored pointer of type description */ - inline typelib_TypeDescription * SAL_CALL get() const + typelib_TypeDescription * SAL_CALL get() const { return _pTypeDescr; } /** Tests if a type description is set. @return true, if a type description is set, false otherwise */ - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (_pTypeDescr != NULL); } }; diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx index d4d5608f83af..8031f9bcbfee 100644 --- a/include/uno/current_context.hxx +++ b/include/uno/current_context.hxx @@ -92,7 +92,7 @@ public: @return the previously set context */ - inline Reference< XCurrentContext > SAL_CALL getPreviousContext() const + Reference< XCurrentContext > SAL_CALL getPreviousContext() const { return m_xPreviousContext; } }; diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx index c32d8b312b1f..67e77ab56105 100644 --- a/include/uno/dispatcher.hxx +++ b/include/uno/dispatcher.hxx @@ -49,7 +49,7 @@ class UnoInterfaceReference public: uno_Interface * m_pUnoI; - inline bool is() const + bool is() const { return m_pUnoI != NULL; } inline ~UnoInterfaceReference(); @@ -64,7 +64,7 @@ public: { other.m_pUnoI = nullptr; } #endif - inline uno_Interface * get() const + uno_Interface * get() const { return m_pUnoI; } inline UnoInterfaceReference & set( @@ -73,10 +73,10 @@ public: uno_Interface * pUnoI, __sal_NoAcquire ); inline void clear(); - inline UnoInterfaceReference & operator = ( + UnoInterfaceReference & operator = ( UnoInterfaceReference const & ref ) { return set( ref.m_pUnoI ); } - inline UnoInterfaceReference & operator = ( + UnoInterfaceReference & operator = ( uno_Interface * pUnoI ) { return set( pUnoI ); } diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx index e8b99a6ec14d..31eca6f04fad 100644 --- a/include/uno/environment.hxx +++ b/include/uno/environment.hxx @@ -63,13 +63,13 @@ public: /// @cond INTERNAL // these are here to force memory de/allocation to sal lib. - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -114,7 +114,7 @@ public: @param rEnv another environment @return this environment */ - inline Environment & SAL_CALL operator = ( const Environment & rEnv ) + Environment & SAL_CALL operator = ( const Environment & rEnv ) { return operator = ( rEnv._pEnv ); } #if defined LIBO_INTERNAL_ONLY @@ -132,28 +132,28 @@ public: @return UNacquired pointer to the C environment struct */ - inline uno_Environment * SAL_CALL get() const + uno_Environment * SAL_CALL get() const { return _pEnv; } /** Gets type name of set environment. @return type name of set environment */ - inline ::rtl::OUString SAL_CALL getTypeName() const + ::rtl::OUString SAL_CALL getTypeName() const { return _pEnv->pTypeName; } /** Gets free context pointer of set environment. @return free context pointer of set environment */ - inline void * SAL_CALL getContext() const + void * SAL_CALL getContext() const { return _pEnv->pContext; } /** Tests if a environment is set. @return true, if a environment is set, false otherwise */ - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (_pEnv != NULL); } /** Releases a set environment. diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 352f375ff58d..f520b6f5b2bf 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -57,13 +57,13 @@ class Mapping public: // these are here to force memory de/allocation to sal lib. /// @cond INTERNAL - inline static void * SAL_CALL operator new ( size_t nSize ) + static void * SAL_CALL operator new ( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void SAL_CALL operator delete ( void * pMem ) + static void SAL_CALL operator delete ( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + static void * SAL_CALL operator new ( size_t, void * pMem ) { return pMem; } - inline static void SAL_CALL operator delete ( void *, void * ) + static void SAL_CALL operator delete ( void *, void * ) {} /// @endcond @@ -130,7 +130,7 @@ public: @param rMapping another mapping @return this mapping */ - inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) + Mapping & SAL_CALL operator = ( const Mapping & rMapping ) { return operator = ( rMapping._pMapping ); } #if defined LIBO_INTERNAL_ONLY @@ -148,14 +148,14 @@ public: @return UNacquired C mapping */ - inline uno_Mapping * SAL_CALL get() const + uno_Mapping * SAL_CALL get() const { return _pMapping; } /** Tests if a mapping is set. @return true if a mapping is set */ - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (_pMapping != NULL); } /** Releases a set mapping. @@ -175,7 +175,7 @@ public: @param pTypeDescr type description of interface @return mapped interface */ - inline void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const + void * SAL_CALL mapInterface( void * pInterface, typelib_TypeDescription * pTypeDescr ) const { return mapInterface( pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); } /** Maps an interface from one environment to another. @@ -193,7 +193,7 @@ public: @param pInterface source interface @param pTypeDescr type description of interface */ - inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const + void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr ) const { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, pTypeDescr ); } /** Maps an interface from one environment to another. @@ -201,7 +201,7 @@ public: @param pInterface source interface @param pTypeDescr type description of interface */ - inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const + void SAL_CALL mapInterface( void ** ppOut, void * pInterface, typelib_TypeDescription * pTypeDescr ) const { (*_pMapping->mapInterface)( _pMapping, ppOut, pInterface, reinterpret_cast<typelib_InterfaceTypeDescription *>(pTypeDescr) ); } /** Maps an interface from one environment to another. diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index cd4f63509bba..c4811508e029 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -98,11 +98,11 @@ public: // convenience methods /// get epoch start (should be 01Jan1970) - inline const DateTime& getEpochStart() const + const DateTime& getEpochStart() const { return aEpochStart; } /// set a local (!) Gregorian DateTime - inline void setGregorianDateTime( const DateTime& rDateTime ) + void setGregorianDateTime( const DateTime& rDateTime ) { setLocalDateTime( rDateTime - aEpochStart ); } }; diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index 15041eb82314..5c050ccba2a5 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -96,14 +96,14 @@ public: static bool isAsciiAlpha( const OUString& rStr ); /// whether type is pure numeric or not, e.g. return of getStringType - static inline bool isNumericType( sal_Int32 nType ) + static bool isNumericType( sal_Int32 nType ) { return ((nType & nCharClassNumericType) != 0) && ((nType & ~(nCharClassNumericTypeMask)) == 0); } /// whether type is pure alphanumeric or not, e.g. return of getStringType - static inline bool isAlphaNumericType( sal_Int32 nType ) + static bool isAlphaNumericType( sal_Int32 nType ) { return ((nType & (nCharClassAlphaType | nCharClassNumericType)) != 0) && @@ -112,14 +112,14 @@ public: } /// whether type is pure letter or not, e.g. return of getStringType - static inline bool isLetterType( sal_Int32 nType ) + static bool isLetterType( sal_Int32 nType ) { return ((nType & nCharClassLetterType) != 0) && ((nType & ~(nCharClassLetterTypeMask)) == 0); } /// whether type is pure letternumeric or not, e.g. return of getStringType - static inline bool isLetterNumericType( sal_Int32 nType ) + static bool isLetterNumericType( sal_Int32 nType ) { return ((nType & (nCharClassLetterType | nCharClassNumericType)) != 0) && diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 8d18092b3bd9..defbabdf8563 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -69,17 +69,17 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry static OUString getName( const Index rIdx ); - static inline OUString getUserEntryName() + static OUString getUserEntryName() { return OUString( "_user" ); } - static inline OUString getDefaultEntryName() + static OUString getDefaultEntryName() { return OUString( "_default" ); } - static inline Index getIndex( const OUString& rName ) + static Index getIndex( const OUString& rName ) { for ( int i = static_cast<int>(Index::Name); i < static_cast<int>(Index::INVALID); ++i ) if ( getName( Index(i) ) == rName ) @@ -91,12 +91,12 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry return Index::INVALID; } - static inline size_t getElementCount() + static size_t getElementCount() { return static_cast<size_t>(Index::INVALID); } - inline css::uno::Any getValue( const Index rIdx ) const + css::uno::Any getValue( const Index rIdx ) const { if ( static_cast<size_t>(rIdx) < getElementCount() ) { @@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry } template<typename T> - inline T getValue( const Index rIdx ) const + T getValue( const Index rIdx ) const { T aValue = T(); @@ -126,7 +126,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry return aValue; } - inline void setValue( const Index rIdx, css::uno::Any& rValue ) + void setValue( const Index rIdx, css::uno::Any& rValue ) { if ( static_cast<size_t>(rIdx) < getElementCount() ) { @@ -139,7 +139,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry } template<typename T> - inline void setValue( const Index rIdx, T rValue ) + void setValue( const Index rIdx, T rValue ) { if ( static_cast<size_t>(rIdx) < getElementCount() ) { @@ -151,12 +151,12 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry } } - inline bool isDefaultEntry() const + bool isDefaultEntry() const { return m_bDefaultEntry; } - inline void setDefaultEntry( bool rValue ) + void setDefaultEntry( bool rValue ) { m_bDefaultEntry = rValue; } diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index ccb549b2398b..02ec91526245 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -286,14 +286,14 @@ public: bool bUseThousandSep = true ) const; // dummy returns, to be implemented - inline sal_Unicode getCurrZeroChar() const + sal_Unicode getCurrZeroChar() const { return cCurrZeroChar; } - static inline bool isNumLeadingZero() + static bool isNumLeadingZero() { return true; } /// standard decimal places - static inline sal_uInt16 getNumDigits() + static sal_uInt16 getNumDigits() { return 2; } - static inline bool isNumTrailingZeros() + static bool isNumTrailingZeros() { return true; } // reserved words @@ -315,7 +315,7 @@ public: OOO_ENABLE_LOCALE_DATA_CHECKS is set to 'Y' or 'Yes' (or any other string starting with 'Y') or '1'. Also used in conjunction with the number formatter. */ - static inline bool areChecksEnabled() + static bool areChecksEnabled() { if (nLocaleDataChecking == 0) evaluateLocaleDataChecking(); diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index bb94742ecb5a..60685334461d 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -150,16 +150,16 @@ namespace utl }; public: - inline SharedUNOComponent() + SharedUNOComponent() { } - explicit inline SharedUNOComponent( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership ) + explicit SharedUNOComponent( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership ) { reset( _rxComponent, eMode ); } - inline SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) + SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) { set( _rRef, _queryThrow ); } diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 570a8d2a7a3d..774111269569 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -86,12 +86,12 @@ public: void processVbaEventNoThrow( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ); /** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value at the specified index. */ - static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) + static void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); } /** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value of a specific at the specified index. */ template< typename Type > - static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) + static void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); } protected: @@ -125,8 +125,8 @@ protected: { sal_Int32 mnEventId; css::uno::Sequence< css::uno::Any > maArgs; - inline /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {} - inline EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} + /*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId( nEventId ) {} + EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} }; typedef ::std::deque< EventQueueEntry > EventQueue; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 75c1f900bebe..ef5f23cfed63 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -316,8 +316,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const override; - inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } - inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } + void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } + void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } // draws the radio button (the knob image), in its current state (pressed/checked) // at the usual location, which can be overridden with SetStateRect diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index e8b79ad3742f..973f12421347 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -348,7 +348,7 @@ public: when the control loses the focus - instead, the invalid input will be preserved. */ void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } + bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -421,7 +421,7 @@ public: when the control loses the focus - instead, the invalid input will be preserved. */ void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } + bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -481,13 +481,13 @@ public: virtual void SetUnit( FieldUnit meUnit ) override; void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit ); - inline void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } + void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } sal_Int64 GetFirst( FieldUnit eOutUnit ) const; - inline sal_Int64 GetFirst() const { return GetFirst(FUNIT_NONE); } + sal_Int64 GetFirst() const { return GetFirst(FUNIT_NONE); } void SetLast( sal_Int64 nNewLast, FieldUnit eInUnit ); - inline void SetLast(sal_Int64 last) { SetLast(last, FUNIT_NONE); } + void SetLast(sal_Int64 last) { SetLast(last, FUNIT_NONE); } sal_Int64 GetLast( FieldUnit eOutUnit ) const; - inline sal_Int64 GetLast() const { return GetLast(FUNIT_NONE); } + sal_Int64 GetLast() const { return GetLast(FUNIT_NONE); } static void SetDefaultUnit( FieldUnit eDefaultUnit ); static FieldUnit GetDefaultUnit(); diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index dea9b3c5470f..4a5dd3a69160 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -93,7 +93,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText m_aClickHdl is called if the text is clicked. */ - inline void SetClickHdl( const Link<FixedHyperlink&,void>& rLink ) { m_aClickHdl = rLink; } + void SetClickHdl( const Link<FixedHyperlink&,void>& rLink ) { m_aClickHdl = rLink; } // ::FixedHyperbaseLink diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 30997a984911..2d392b596897 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -300,7 +300,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue ControlState mnPage1State; ControlState mnPage2State; - inline ScrollbarValue() + ScrollbarValue() : ImplControlValue( ControlType::Scrollbar, 0 ) { mnMin = 0; mnMax = 0; mnCur = 0; mnVisibleSize = 0; diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index b4ed9e988ec8..a34c7c14f9ab 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -88,7 +88,7 @@ class VCL_DLLPUBLIC Task protected: static void StartTimer( sal_uInt64 nMS ); - inline const ImplSchedulerData* GetSchedulerData() const { return mpSchedulerData; } + const ImplSchedulerData* GetSchedulerData() const { return mpSchedulerData; } virtual void SetDeletionFlags(); /// Is this item ready to be dispatched at nTimeNow diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index f88969c733b9..95655b7b9192 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -83,11 +83,11 @@ private: SAL_DLLPRIVATE bool ImplMoveFocus( bool _bUpper ); SAL_DLLPRIVATE void ImplCalcFocusRect( bool _bUpper ); - SAL_DLLPRIVATE inline bool ImplIsUpperEnabled( ) const + SAL_DLLPRIVATE bool ImplIsUpperEnabled( ) const { return mnValue + mnValueStep <= mnMaxRange; } - SAL_DLLPRIVATE inline bool ImplIsLowerEnabled( ) const + SAL_DLLPRIVATE bool ImplIsLowerEnabled( ) const { return mnValue >= mnMinRange + mnValueStep; } diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index a02ef5850446..97fd9034160d 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -92,7 +92,7 @@ public: virtual TextAttrib* Clone() const override; virtual bool operator==( const TextAttrib& rAttr ) const override; - inline FontWeight getFontWeight() const { return meWeight; } + FontWeight getFontWeight() const { return meWeight; } }; diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index e3e0e827ee8e..c8bd45084318 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -104,19 +104,19 @@ class VclPtr public: /** Constructor... */ - inline VclPtr() + VclPtr() : m_rInnerRef() {} /** Constructor... */ - inline VclPtr (reference_type * pBody) + VclPtr (reference_type * pBody) : m_rInnerRef(pBody) {} /** Constructor... that doesn't take a ref. */ - inline VclPtr (reference_type * pBody, __sal_NoAcquire) + VclPtr (reference_type * pBody, __sal_NoAcquire) : m_rInnerRef(pBody, SAL_NO_ACQUIRE) {} @@ -129,7 +129,7 @@ public: @param rRef another reference */ template< class derived_type > - inline VclPtr( + VclPtr( const VclPtr< derived_type > & rRef, typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 ) : m_rInnerRef( static_cast<reference_type*>(rRef) ) @@ -152,7 +152,7 @@ public: /** Probably most common used: handle->someBodyOp(). */ - inline reference_type * operator->() const + reference_type * operator->() const { return m_rInnerRef.get(); } @@ -161,17 +161,17 @@ public: I.e. handle->someBodyOp() and handle.get()->someBodyOp() are the same. */ - inline reference_type * get() const + reference_type * get() const { return m_rInnerRef.get(); } - inline void set(reference_type *pBody) + void set(reference_type *pBody) { m_rInnerRef.set(pBody); } - inline void reset(reference_type *pBody) + void reset(reference_type *pBody) { m_rInnerRef.set(pBody); } @@ -198,27 +198,27 @@ public: return *this; } - inline operator reference_type * () const + operator reference_type * () const { return m_rInnerRef.get(); } - inline explicit operator bool () const + explicit operator bool () const { return m_rInnerRef.get() != nullptr; } - inline void clear() + void clear() { m_rInnerRef.clear(); } - inline void reset() + void reset() { m_rInnerRef.clear(); } - inline void disposeAndClear() + void disposeAndClear() { // hold it alive for the lifetime of this method ::rtl::Reference<reference_type> aTmp(m_rInnerRef); @@ -230,7 +230,7 @@ public: /** Needed to place VclPtr's into STL collection. */ - inline bool operator< (const VclPtr<reference_type> & handle) const + bool operator< (const VclPtr<reference_type> & handle) const { return (m_rInnerRef < handle.m_rInnerRef); } @@ -314,26 +314,26 @@ class ScopedVclPtr : public VclPtr<reference_type> public: /** Constructor... */ - inline ScopedVclPtr() + ScopedVclPtr() : VclPtr<reference_type>() {} /** Constructor */ - inline ScopedVclPtr (reference_type * pBody) + ScopedVclPtr (reference_type * pBody) : VclPtr<reference_type>(pBody) {} /** Copy constructor... */ - inline ScopedVclPtr (const VclPtr<reference_type> & handle) + ScopedVclPtr (const VclPtr<reference_type> & handle) : VclPtr<reference_type>(handle) {} /** Assignment that releases the last reference. */ - inline void disposeAndReset(reference_type *pBody) + void disposeAndReset(reference_type *pBody) { VclPtr<reference_type>::disposeAndClear(); VclPtr<reference_type>::set(pBody); @@ -342,7 +342,7 @@ public: /** Assignment that releases the last reference. */ - inline ScopedVclPtr<reference_type>& operator = (reference_type * pBody) + ScopedVclPtr<reference_type>& operator = (reference_type * pBody) { disposeAndReset(pBody); return *this; @@ -357,7 +357,7 @@ public: @param rRef another reference */ template< class derived_type > - inline ScopedVclPtr( + ScopedVclPtr( const VclPtr< derived_type > & rRef, typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 ) : VclPtr<reference_type>( rRef ) @@ -386,7 +386,7 @@ private: void reset(reference_type *pBody) = delete; protected: - inline ScopedVclPtr (reference_type * pBody, __sal_NoAcquire) + ScopedVclPtr (reference_type * pBody, __sal_NoAcquire) : VclPtr<reference_type>(pBody, SAL_NO_ACQUIRE) {} }; diff --git a/include/vcl/vclreferencebase.hxx b/include/vcl/vclreferencebase.hxx index 1813f866ade3..af60e2db9514 100644 --- a/include/vcl/vclreferencebase.hxx +++ b/include/vcl/vclreferencebase.hxx @@ -33,13 +33,13 @@ class VCL_DLLPUBLIC VclReferenceBase template<typename T> friend class VclPtr; public: - inline void acquire() const + void acquire() const { assert(mnRefCnt>0); mnRefCnt++; } - inline void release() const + void release() const { assert(mnRefCnt>0); if (!--mnRefCnt) diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index 748fb4e95c87..a69e8ef31dec 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -53,7 +53,7 @@ public: void SetReference(sal_Int32 nVal) { nReference = nVal; } void SetValue(sal_Int32 nValue); void SetRepeat(bool bValue) { bRepeat = bValue; } - inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); } + void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); } void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); } // set the new reference and returns the new value which gives the diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index ee2692fe0ba3..7015a616ea3c 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -99,7 +99,7 @@ public: virtual void FillPropertySet( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; - inline bool HasCombinedCharactersLetter() + bool HasCombinedCharactersLetter() { return bHasCombinedCharactersLetter; } const ::std::vector< XMLPropertyState > & GetProperties_() { return GetProperties(); } diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 2a6040bd4f25..b8f274cc90b2 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -411,7 +411,7 @@ public: GetModel() const { return mxModel; } // Get XNumberFormatsSupplier css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; } - inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) + void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) { mxNumberFormatsSupplier = _xNumberFormatSupplier; if ( mxNumberFormatsSupplier.is() && mxHandler.is() ) @@ -468,7 +468,7 @@ public: bool *pEncoded=nullptr ) const; // save linked sections? - inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; } + bool IsSaveLinkedSections() { return mbSaveLinkedSections; } // get export flags SvXMLExportFlags getExportFlags() const { return mnExportFlags; } diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 330e92a0da9a..c53b9c1bebac 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -220,10 +220,10 @@ protected: const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList ); virtual XMLTextImportHelper* CreateTextImport(); - inline void ClearTextImport() { mxTextImport = nullptr; } + void ClearTextImport() { mxTextImport = nullptr; } virtual XMLShapeImportHelper* CreateShapeImport(); - inline bool HasShapeImport() const { return mxShapeImport.is(); } - inline void ClearShapeImport() { mxShapeImport = nullptr; } + bool HasShapeImport() const { return mxShapeImport.is(); } + void ClearShapeImport() { mxShapeImport = nullptr; } static SchXMLImportHelper* CreateChartImport(); ::xmloff::OFormLayerXMLImport* CreateFormImport(); @@ -359,7 +359,7 @@ public: const css::uno::Reference< css::container::XNameContainer > & GetMarkerHelper(); const css::uno::Reference< css::container::XNameContainer > & GetDashHelper(); inline css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier(); - inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) + void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) { mxNumberFormatsSupplier = _xNumberFormatSupplier; } diff --git a/include/xmlreader/span.hxx b/include/xmlreader/span.hxx index 1d8bc838dc44..1f4630efca42 100644 --- a/include/xmlreader/span.hxx +++ b/include/xmlreader/span.hxx @@ -35,32 +35,32 @@ struct SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Span { char const * begin; sal_Int32 length; - inline Span(): begin(nullptr), length(0) {} + Span(): begin(nullptr), length(0) {} // init length to avoid compiler warnings - inline Span(char const * theBegin, sal_Int32 theLength): + Span(char const * theBegin, sal_Int32 theLength): begin(theBegin), length(theLength) {} - template< std::size_t N > explicit inline Span(char const (& literal)[N]): + template< std::size_t N > explicit Span(char const (& literal)[N]): begin(literal), length(N - 1) {} - inline void clear() throw() { begin = nullptr; } + void clear() throw() { begin = nullptr; } - inline bool is() const { return begin != nullptr; } + bool is() const { return begin != nullptr; } - inline bool equals(Span const & text) const { + bool equals(Span const & text) const { return length == text.length && (rtl_str_compare_WithLength( begin, length, text.begin, text.length) == 0); } - inline bool equals(char const * textBegin, sal_Int32 textLength) const { + bool equals(char const * textBegin, sal_Int32 textLength) const { return equals(Span(textBegin, textLength)); } - template< std::size_t N > inline bool equals(char const (& literal)[N]) + template< std::size_t N > bool equals(char const (& literal)[N]) const { return equals(Span(literal, N - 1)); diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index c25c456c8983..364590b05243 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -129,9 +129,9 @@ private: enum class State { Content, StartTag, EndTag, EmptyElementTag, Done }; - SAL_DLLPRIVATE inline char read() { return pos_ == end_ ? '\0' : *pos_++; } + SAL_DLLPRIVATE char read() { return pos_ == end_ ? '\0' : *pos_++; } - SAL_DLLPRIVATE inline char peek() { return pos_ == end_ ? '\0' : *pos_; } + SAL_DLLPRIVATE char peek() { return pos_ == end_ ? '\0' : *pos_; } SAL_DLLPRIVATE void normalizeLineEnds(Span const & text); diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index ba31f5c5f022..e7bac7bcb071 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -42,7 +42,7 @@ class XMLSCRIPT_DLLPUBLIC XMLElement : public cppu::WeakImplHelper< css::xml::sax::XAttributeList > { public: - inline XMLElement( OUString const & name ) + XMLElement( OUString const & name ) : _name( name ) {} |