Remove redundant 'inline' keyword

...from function definitions occurring within class definitions.  Done with
a rewriting Clang plugin (to be pushed later).

Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index a2b31ba..781a9af 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -120,7 +120,7 @@ public:

    /** returns the accessible object for the row or the column header bar
    */
    inline css::uno::Reference<
    css::uno::Reference<
        css::accessibility::XAccessible >
        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
        {
@@ -129,7 +129,7 @@ public:

    /** returns the accessible object for the table representation
    */
    inline css::uno::Reference<
    css::uno::Reference<
        css::accessibility::XAccessible >
        getTable( )
        {
@@ -203,7 +203,7 @@ public:
    );

    /// returns the AccessibleContext belonging to this Accessible
    inline AccessibleBrowseBox*            getContext() { return m_xContext.get(); }
    AccessibleBrowseBox*            getContext() { return m_xContext.get(); }

protected:
    virtual ~AccessibleBrowseBoxAccess() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 217e20a..0448ddf 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -285,7 +285,7 @@ protected:

public:
    /** @return  The osl::Mutex member provided by the class BaseMutex. */
    inline ::osl::Mutex&    getMutex( ) { return m_aMutex; }
    ::osl::Mutex&    getMutex( ) { return m_aMutex; }

    /** @throws <type>DisposedException</type>  If the object is not alive. */
    void ensureIsAlive() const;
@@ -386,7 +386,7 @@ protected:
class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard
{
public:
    inline SolarMethodGuard( osl::Mutex& rMutex )
    SolarMethodGuard( osl::Mutex& rMutex )
        :SolarMutexGuard( )
        ,osl::MutexGuard( rMutex )
    {
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index cfe00b4..c965970 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -45,7 +45,7 @@ namespace accessibility
        /** Grabs the focus to the BrowseBox. */
        virtual void SAL_CALL grabFocus() override;

        inline bool isRowBarCell() const
        bool isRowBarCell() const
        {
            return getType() == ::svt::BBTYPE_ROWHEADERCELL;
        }
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index b55523d..362dee2 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -168,7 +168,7 @@ public:
    );

    /// returns the AccessibleContext belonging to this Accessible
    inline AccessibleGridControl*            getContext()  { return m_xContext.get(); }
    AccessibleGridControl*            getContext()  { return m_xContext.get(); }

protected:
    virtual ~AccessibleGridControlAccess() override;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index e3d138f..eeef6d3 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -34,8 +34,8 @@ namespace accessibility

    protected:
        // attribute access
        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
        sal_Int32    getRowPos( ) const { return m_nRowPos; }
        sal_Int32    getColumnPos( ) const { return m_nColPos; }

        // XAccessibleComponent
        virtual void SAL_CALL grabFocus() override;
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index 113e38f..eb82e486 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -40,8 +40,8 @@ namespace accessibility

    protected:
        // attribute access
        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
        sal_Int32    getRowPos( ) const { return m_nRowPos; }
        sal_Int32    getColumnPos( ) const { return m_nColPos; }

    protected:
        // AccessibleBrowseBoxBase overridables
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 1a3bfc6..6313524 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -59,7 +59,7 @@ private:
    sal_Int32 implGetSelRowCount() const;

    /** Returns the row index from cell index. */
    inline sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
    sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
    /** Returns the absolute row index of the nSelRow-th selected row. */
    sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;

diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index 7e17bf5..6fc4610 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -40,12 +40,12 @@ namespace accessibility
        VclPtr<SvTreeListBox> m_pWindow;

    protected:
        inline SvTreeListBox*       getListBox() const
        SvTreeListBox*       getListBox() const
        {
            return  const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
        }

        inline  bool                    isAlive() const     { return nullptr != m_pWindow; }
        bool                    isAlive() const     { return nullptr != m_pWindow; }

    public:
        ListBoxAccessibleBase( SvTreeListBox& _rWindow );
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index 8db74f5..c44c028 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -67,10 +67,10 @@ class Document;
class SfxListenerGuard
{
public:
    inline SfxListenerGuard(::SfxListener & rListener):
    SfxListenerGuard(::SfxListener & rListener):
        m_rListener(rListener), m_pNotifier(nullptr) {}

    inline ~SfxListenerGuard() { endListening(); }
    ~SfxListenerGuard() { endListening(); }

    // Not thread safe:
    void startListening(::SfxBroadcaster & rNotifier);
@@ -86,10 +86,10 @@ private:
class WindowListenerGuard
{
public:
    inline WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
    WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
        m_aListener(rListener), m_pNotifier(nullptr) {}

    inline ~WindowListenerGuard() { endListening(); }
    ~WindowListenerGuard() { endListening(); }

    // Not thread safe:
    void startListening(vcl::Window & rNotifier);
@@ -105,19 +105,18 @@ private:
class ParagraphInfo
{
public:
    inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
    ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}

    inline
    css::uno::WeakReference< css::accessibility::XAccessible > const &
    getParagraph() const { return m_xParagraph; }

    inline ::sal_Int32 getHeight() const { return m_nHeight; }
    ::sal_Int32 getHeight() const { return m_nHeight; }

    inline void setParagraph(
    void setParagraph(
        css::uno::Reference< css::accessibility::XAccessible > const &
        rParagraph) { m_xParagraph = rParagraph; }

    inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
    void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }

private:
    css::uno::WeakReference< css::accessibility::XAccessible >
@@ -148,7 +147,7 @@ public:
                  Paragraphs::size_type nNumber);

    // Not thread-safe.
    inline Paragraphs::size_type getNumber() const { return m_nNumber; }
    Paragraphs::size_type getNumber() const { return m_nNumber; }

    // Not thread-safe.
    void numberChanged(bool bIncremented);
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 9236d32..570e46f 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -41,7 +41,6 @@ private:
    T&  m_aComboListBox;

public:
    inline
    VCLListBoxHelper( T& _pListBox ) :
        m_aComboListBox( _pListBox ){}

diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 57c9399..a9d9db5 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -92,7 +92,7 @@ public:

    void                    NotifyAccessibleEvent(  sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );

    inline bool         IsSelected() const { return m_bSelected; }
    bool         IsSelected() const { return m_bSelected; }
    void                    SetSelected( bool _bSelected );
    void                    SetVisible( bool _bVisible );

diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 77f8411..9abaaec 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -59,8 +59,8 @@ private:
    css::uno::Reference< css::accessibility::XAccessible >    m_xChild;

public:
    inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
    inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
    sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
    void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }

protected:
    virtual ~VCLXAccessibleToolBoxItem() override;
@@ -81,10 +81,10 @@ public:
    VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );

    void                SetFocus( bool _bFocus );
    inline bool         HasFocus() const { return m_bHasFocus; }
    bool         HasFocus() const { return m_bHasFocus; }
    void                SetChecked( bool _bCheck );
    void                SetIndeterminate( bool _bIndeterminate );
    inline void         ReleaseToolBox() { m_pToolBox = nullptr; }
    void         ReleaseToolBox() { m_pToolBox = nullptr; }
    void                NameChanged();
    void                SetChild( const css::uno::Reference< css::accessibility::XAccessible >& _xChild );
    const css::uno::Reference< css::accessibility::XAccessible >&
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index a4111ae..c4cd2cb 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -87,8 +87,8 @@ namespace
        sal_Int32 m_nIndexInParent;

    public:
        inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
        inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
        sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
        void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }

        static  bool    isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation );

diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx
index 76d800b..241caf6 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/wrapper/Instance.hxx
@@ -27,7 +27,7 @@ namespace wrapper
        Instance& operator=( const Instance& other );
        virtual ~Instance();

        inline operator libvlc_instance_t*()
        operator libvlc_instance_t*()
        {
            return mInstance;
        }
diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx
index cf1d4e7..a7535f7 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/wrapper/Media.hxx
@@ -33,7 +33,7 @@ namespace wrapper

        virtual ~Media();

        inline operator libvlc_media_t*()
        operator libvlc_media_t*()
        {
            return mMedia;
        }
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index e8058a8..a730682 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -63,7 +63,7 @@ namespace wrapper
        unsigned getWidth() const;
        unsigned getHeight() const;

        inline operator libvlc_media_player_t*()
        operator libvlc_media_player_t*()
        {
            return mPlayer;
        }
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 721dee8..e84824d 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -192,14 +192,14 @@ namespace basctl
        /** determines whether the instance refers to a valid "document" with script and
            dialog libraries
        */
        inline  bool    isValid()       const   { return m_bValid; }
        bool    isValid()       const   { return m_bValid; }
        /** determines whether the instance refers to a non-closed document
        */
        inline  bool    isAlive()       const   { return m_bValid && ( m_bIsApplication || !m_bDocumentClosed ); }
        bool    isAlive()       const   { return m_bValid && ( m_bIsApplication || !m_bDocumentClosed ); }
        /// determines whether the "document" refers to the application in real
        inline  bool    isApplication() const   { return m_bValid && m_bIsApplication; }
        bool    isApplication() const   { return m_bValid && m_bIsApplication; }
        /// determines whether the document refers to a real document (instead of the application)
        inline  bool    isDocument()    const   { return m_bValid && !m_bIsApplication; }
        bool    isDocument()    const   { return m_bValid && !m_bIsApplication; }

        /** invalidates the instance
        */
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index 04db4f1..f307190 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -159,7 +159,7 @@ namespace basctl

        // comparison
                bool operator==( const ScriptDocument& _rhs ) const;
        inline  bool operator!=( const ScriptDocument& _rhs ) const { return !( *this == _rhs ); }
        bool operator!=( const ScriptDocument& _rhs ) const { return !( *this == _rhs ); }

        /// retrieves a (pretty simple) hash code for the document
        sal_Int32   hashCode() const;
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index e77143c..5fb8bcd 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -881,7 +881,7 @@ public:
        }
    }

    inline bool impBColorsAreEqual(const ImplB3DPolygon& rCandidate) const
    bool impBColorsAreEqual(const ImplB3DPolygon& rCandidate) const
    {
        bool bBColorsAreEqual(true);

@@ -909,7 +909,7 @@ public:
        return bBColorsAreEqual;
    }

    inline bool impNormalsAreEqual(const ImplB3DPolygon& rCandidate) const
    bool impNormalsAreEqual(const ImplB3DPolygon& rCandidate) const
    {
        bool bNormalsAreEqual(true);

@@ -937,7 +937,7 @@ public:
        return bNormalsAreEqual;
    }

    inline bool impTextureCoordinatesAreEqual(const ImplB3DPolygon& rCandidate) const
    bool impTextureCoordinatesAreEqual(const ImplB3DPolygon& rCandidate) const
    {
        bool bTextureCoordinatesAreEqual(true);

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index fdb8caf..bc89862 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -70,8 +70,8 @@ public:
    explicit DocBasicItem( StarBASIC& rDocBasic );
    virtual ~DocBasicItem() override;

    inline const SbxObjectRef& getClassModules() const { return mxClassModules; }
    inline bool isDocClosed() const { return mbDocClosed; }
    const SbxObjectRef& getClassModules() const { return mxClassModules; }
    bool isDocClosed() const { return mbDocClosed; }

    void clearDependingVarsOnDelete( StarBASIC& rDeletedBasic );

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index cd785d0..5cc2c0d 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -146,15 +146,15 @@ public:
    {
    }

    inline  bool    isModified() const  { return mbModified; }
    bool    isModified() const  { return mbModified; }
            void    setModified( bool _bModified );

    inline  void    addModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
    void    addModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
    {
        m_aModifyListeners.addInterface( _rxListener );
    }

    inline  void    removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
    void    removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener )
    {
        m_aModifyListeners.removeInterface( _rxListener );
    }
@@ -510,7 +510,7 @@ private:
    virtual void storeResourcesToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) = 0;

protected:
    inline  bool    implIsModified() const  { return mbIsModified; }
    bool    implIsModified() const  { return mbIsModified; }
            void    implSetModified( bool _bIsModified );

private:
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 3799d29..3ac72d5 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -146,8 +146,8 @@ public:
    SbiTokenizer( const OUString&, StarBASIC* = nullptr );
   ~SbiTokenizer();

    inline bool IsEof()             { return bEof; }
    inline bool IsEos()             { return bEos; }
    bool IsEof()             { return bEof; }
    bool IsEos()             { return bEos; }

    void  Push( SbiToken );
    const OUString& Symbol( SbiToken );   // reconversion
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 5f4ada3..88f43bc9 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -63,19 +63,19 @@ class JNI_context

    void java_exc_occurred() const;
public:
    inline explicit JNI_context(
    explicit JNI_context(
        JNI_info const * jni_info, JNIEnv * env, jobject class_loader )
        : m_jni_info( jni_info ),
          m_env( env ),
          m_class_loader( class_loader )
        {}

    inline JNI_info const * get_info() const
    JNI_info const * get_info() const
        { return m_jni_info; }

    inline JNIEnv * operator -> () const
    JNIEnv * operator -> () const
        { return m_env; }
    inline JNIEnv * get_jni_env() const
    JNIEnv * get_jni_env() const
        { return m_env; }

    // does not handle exceptions, *classClass will be null if exception
@@ -125,7 +125,7 @@ class JNI_guarded_context
    void operator = ( JNI_guarded_context ) = delete;

public:
    inline explicit JNI_guarded_context(
    explicit JNI_guarded_context(
        JNI_info const * jni_info,
        rtl::Reference<jvmaccess::UnoVirtualMachine> const & vm_access)
        : AttachGuard( vm_access->getVirtualMachine() ),
@@ -204,13 +204,13 @@ inline JLocalAutoRef & JLocalAutoRef::operator = ( JLocalAutoRef & auto_ref )

struct rtl_mem
{
    inline static void * operator new ( size_t nSize )
    static void * operator new ( size_t nSize )
        { return rtl_allocateMemory( nSize ); }
    inline static void operator delete ( void * mem )
    static void operator delete ( void * mem )
        { if (mem) rtl_freeMemory( mem ); }
    inline static void * operator new ( size_t, void * mem )
    static void * operator new ( size_t, void * mem )
        { return mem; }
    inline static void operator delete ( void *, void * )
    static void operator delete ( void *, void * )
        {}

    static inline rtl_mem * allocate( std::size_t bytes );
@@ -234,10 +234,10 @@ class TypeDescr

public:
    inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
    inline ~TypeDescr()
    ~TypeDescr()
        { TYPELIB_DANGER_RELEASE( m_td ); }

    inline typelib_TypeDescription * get() const
    typelib_TypeDescription * get() const
        { return m_td; }
};

diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index 1abc051..577a74c 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -70,9 +70,9 @@ struct JNI_type_info

    virtual void destroy( JNIEnv * jni_env ) = 0;
protected:
    inline void destruct( JNIEnv * jni_env )
    void destruct( JNIEnv * jni_env )
        { jni_env->DeleteGlobalRef( m_class ); }
    virtual inline ~JNI_type_info() {}
    virtual ~JNI_type_info() {}
    explicit JNI_type_info(
        JNI_context const & jni, typelib_TypeDescription * td );
};
@@ -115,7 +115,7 @@ struct JNI_type_info_holder
    JNI_type_info_holder(const JNI_type_info_holder&) = delete;
    const JNI_type_info_holder& operator=(const JNI_type_info_holder&) = delete;

    inline JNI_type_info_holder() : m_info( nullptr ) {}
    JNI_type_info_holder() : m_info( nullptr ) {}
};

typedef std::unordered_map<
@@ -235,7 +235,7 @@ private:

    JNI_info( JNIEnv * jni_env, jobject class_loader,
              jclass classClass, jmethodID methodForName );
    inline ~JNI_info() {}
    ~JNI_info() {}
};

inline void JNI_info::destroy( JNIEnv * jni_env )
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index 4be22de..52a38ed 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -140,7 +140,7 @@ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & 

struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess
{
    inline bool operator() ( const css::beans::Property & first,
    bool operator() ( const css::beans::Property & first,
                             const css::beans::Property & second )
    {
        return ( first.Name.compareTo( second.Name ) < 0 );
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index e4b9481..60ab60d 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -63,7 +63,7 @@ tDoubleVectorPair
class isValid : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
@@ -74,7 +74,7 @@ public:
class isValidAndXPositive : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
@@ -86,7 +86,7 @@ public:
class isValidAndYPositive : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
@@ -98,7 +98,7 @@ public:
class isValidAndYNegative : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
@@ -110,7 +110,7 @@ public:
class isValidAndBothPositive : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
@@ -123,7 +123,7 @@ public:
class isValidAndXPositiveAndYNegative : public std::binary_function< double, double, bool >
{
public:
    inline bool operator()( double x, double y )
    bool operator()( double x, double y )
    { return ! ( ::rtl::math::isNan( x ) ||
                 ::rtl::math::isNan( y ) ||
                 ::rtl::math::isInf( x ) ||
diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx
index 455b9d5..207770d 100644
--- a/chart2/source/inc/XMLRangeHelper.hxx
+++ b/chart2/source/inc/XMLRangeHelper.hxx
@@ -44,7 +44,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS Cell
            bIsEmpty(true)
    {}

    inline bool empty() const { return bIsEmpty; }
    bool empty() const { return bIsEmpty; }
};

struct OOO_DLLPUBLIC_CHARTTOOLS CellRange
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 00aa027..de69e20 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -80,7 +80,7 @@ protected:
    virtual void SAL_CALL setSourceDocument(
        const css::uno::Reference< css::lang::XComponent >& Document ) override;

    inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
    void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }

    virtual OUString getMediaType(bool _bOasis);

diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 0c58e65..bfe6fdb 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -42,7 +42,7 @@ struct lcl_getPropertyStateByHandle :
            : m_rMap( rMap )
    {}

    inline beans::PropertyState operator() ( sal_Int32 nHandle )
    beans::PropertyState operator() ( sal_Int32 nHandle )
    {
        if( m_rMap.end() == m_rMap.find( nHandle ))
            return beans::PropertyState_DEFAULT_VALUE;
@@ -61,7 +61,7 @@ struct lcl_eraseMapEntry :
            : m_rMap( rMap )
    {}

    inline void operator() ( const K & aKey )
    void operator() ( const K & aKey )
    {
        m_rMap.erase( aKey );
    }
@@ -73,7 +73,7 @@ private:
struct lcl_replaceInterfacePropertiesByClones :
    public std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void >
{
    inline void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp )
    void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp )
    {
        if( rProp.second.hasValue() &&
            rProp.second.getValueType().getTypeClass() == uno::TypeClass_INTERFACE )
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 8a38c8c..75c7bff 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1095,7 +1095,7 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
    inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
    bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
    {
        return ( rPos1.aScreenPos.getX() < rPos2.aScreenPos.getX() );
    }
@@ -1103,7 +1103,7 @@ struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos

struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
    inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
    bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
    {
        return ( rPos1.aScreenPos.getY() > rPos2.aScreenPos.getY() );
    }
diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
index 303c1c5..8afe792 100644
--- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
+++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
@@ -89,8 +89,8 @@ private:
    typedef std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet;
    MinimumAndMaximumSupplierSet m_aMinimumAndMaximumSupplierList;

    inline MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); }
    inline MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); }
    MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); }
    MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); }
};

} //namespace chart
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index e9a16e7..53bf1ad 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -96,7 +96,7 @@ namespace
{
struct lcl_LessXOfPoint
{
    inline bool operator() ( const std::vector< double >& first,
    bool operator() ( const std::vector< double >& first,
                             const std::vector< double >& second )
    {
        if( !first.empty() && !second.empty() )
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index abd94a0..f03598d 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -48,15 +48,15 @@ namespace comphelper
        AccessibleEventNotifier::TClientId  m_nClientId;

    public:
        inline  Reference< XAccessible >    getCreator( ) const                 { return m_aCreator; }
        Reference< XAccessible >    getCreator( ) const                 { return m_aCreator; }
        inline  void                        setCreator( const Reference< XAccessible >& _rAcc );

        inline  IMutex*                     getExternalLock( )                  { return m_pExternalLock; }
        inline  void                        setExternalLock( IMutex* _pLock )   { m_pExternalLock = _pLock; }
        IMutex*                     getExternalLock( )                  { return m_pExternalLock; }
        void                        setExternalLock( IMutex* _pLock )   { m_pExternalLock = _pLock; }

        inline  AccessibleEventNotifier::TClientId
        AccessibleEventNotifier::TClientId
                                            getClientId() const                 { return m_nClientId; }
        inline  void                        setClientId( const AccessibleEventNotifier::TClientId _nId )
        void                        setClientId( const AccessibleEventNotifier::TClientId _nId )
                                                                                { m_nClientId = _nId; }

    public:
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 105956c..7e5de71 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -53,9 +53,9 @@ public:
class PasswordContinuation : public ::cppu::WeakImplHelper< XInteractionPassword2 >
{
public:
    inline explicit     PasswordContinuation() : mbReadOnly( false ), mbSelected( false ) {}
    explicit     PasswordContinuation() : mbReadOnly( false ), mbSelected( false ) {}

    inline bool     isSelected() const { return mbSelected; }
    bool     isSelected() const { return mbSelected; }

    virtual void SAL_CALL select() override { mbSelected = true; }

diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index df08b94..650f981 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -46,7 +46,7 @@ namespace comphelper

    struct UnoTypeLess : public std::unary_function< css::uno::Type, bool >
    {
        inline bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const
        bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const
        {
            return rtl_ustr_compare(
                _rLHS.getTypeLibType()->pTypeName->buffer,
diff --git a/configmgr/source/config_map.hxx b/configmgr/source/config_map.hxx
index 0e9f614..0bba600 100644
--- a/configmgr/source/config_map.hxx
+++ b/configmgr/source/config_map.hxx
@@ -19,7 +19,7 @@

struct LengthContentsCompare
{
    inline bool operator()( const OUString &a, const OUString &b ) const
    bool operator()( const OUString &a, const OUString &b ) const
    {
        if (a.getLength() == b.getLength())
            return a < b;
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
index 36d4a23..d662ff4 100644
--- a/configmgr/source/xcsparser.hxx
+++ b/configmgr/source/xcsparser.hxx
@@ -80,7 +80,7 @@ private:
        rtl::Reference< Node > node;
        OUString name;

        inline Element(
        Element(
            rtl::Reference< Node > const & theNode,
            OUString const & theName):
            node(theNode), name(theName) {}
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index d1c72e0..db67c57 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -33,7 +33,7 @@ struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::val
    {
    }
    // return false if compared values are equal otherwise true
    inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs)   const
    bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs)   const
    {
        const std::vector<OKeyType>& aKeyType = pIndex->getKeyType();
        std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 3f851a6..9281643 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -89,7 +89,7 @@ public:
    {
    }
    void clear() { m_pComponent = nullptr; }
    inline void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); }
    void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); }
};
}
namespace connectivity
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 83be72e..2d56355 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -51,7 +51,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index ee72917..3028eec 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -51,7 +51,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 87c819c..43856f7 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -54,7 +54,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index bb5db84..04919d6 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -51,7 +51,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 54003db..fcbd064 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -52,7 +52,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 7e0dd97..0712ff6 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -51,7 +51,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index cf79a19..ef6088a 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -35,7 +35,7 @@ namespace connectivity
        public:
            explicit MacabCatalog(MacabConnection* _pCon);

            inline MacabConnection* getConnection() const { return m_pConnection; }
            MacabConnection* getConnection() const { return m_pConnection; }

            static const OUString& getDot();

diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 93d395a..01bcae6 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -111,7 +111,7 @@ namespace connectivity
            css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();

            // accessors
            inline MacabDriver*         getDriver()         const { return m_pDriver;}
            MacabDriver*         getDriver()         const { return m_pDriver;}
                   MacabAddressBook* getAddressBook()   const;
        };
    }
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 3ba29cc..540db16 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -41,7 +41,7 @@ namespace connectivity

        public:

            inline MacabConnection* getOwnConnection() const { return m_xConnection.get(); }
            MacabConnection* getOwnConnection() const { return m_xConnection.get(); }

            explicit MacabDatabaseMetaData(MacabConnection* _pCon);
            virtual ~MacabDatabaseMetaData() override;
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 08af069..d1b846e 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -50,13 +50,13 @@ namespace connectivity
            MacabResultSetMetaData(MacabConnection* _pConnection, OUString const & _sTableName);

            // avoid ambigous cast error from the compiler
            inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
            operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
                { return this; }

            /// @throws css::sdbc::SQLException
            void setMacabFields(
                const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
            inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
            sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                { return m_aMacabFields[columnIndex - 1]; }

            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 5468813..469e342 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -52,7 +52,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 9d956f6..1319ca7 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -150,7 +150,7 @@ namespace connectivity
                    ) override;

            // other methods
            inline MacabConnection* getOwnConnection() const { return m_pConnection; }
            MacabConnection* getOwnConnection() const { return m_pConnection; }
        };


diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index c97149c..8dd54ba 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -60,8 +60,8 @@ namespace connectivity

            OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const;

            inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); }
            inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); }
            AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); }
            AliasMap::const_iterator end() const { return m_aAliasMap.end(); }


        private:
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx
index c84c9b7..6c1e659 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -39,21 +39,21 @@ namespace connectivity
            {
            }

            inline void setResId( const sal_uInt16 _nErrorResourceId )
            void setResId( const sal_uInt16 _nErrorResourceId )
            {
                m_nErrorResourceId = _nErrorResourceId;
            }
            inline void reset()
            void reset()
            {
                m_nErrorResourceId = 0;
                m_nErrorCondition = 0;
            }

            inline sal_uInt16 getResId() const                  { return m_nErrorResourceId; }
            inline sal_Int32  getErrorCondition() const         { return m_nErrorCondition; }
            inline const OUString& getParameter() const  { return m_sParameter; }
            sal_uInt16 getResId() const                  { return m_nErrorResourceId; }
            sal_Int32  getErrorCondition() const         { return m_nErrorCondition; }
            const OUString& getParameter() const  { return m_sParameter; }

            inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); }
            bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); }
        };
    }
}
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 8e8d1aa..f9795c0 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -184,7 +184,7 @@ namespace connectivity
            sal_Int32                  executeQuery(OConnection* xConnection, MQueryExpression & expr);
            const OColumnAlias&        getColumnAlias() const { return m_rColumnAlias; }
            bool                       hadError() const { return m_aError.is(); }
            inline ErrorDescriptor&    getError() { return m_aError; }
            ErrorDescriptor&    getError() { return m_aError; }

            void                       setAddressbook( OUString&);
        };
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 6c18cd6..eb87579 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -231,7 +231,7 @@ protected:
            ::rtl::Reference<OKeySet>     m_pKeySet;
            sal_Int32                     m_nUpdatedRow;    //updated row
            TriState                      m_bIsReadOnly;
            inline void resetParameters() { m_nParamIndex = 0; }
            void resetParameters() { m_nParamIndex = 0; }

            ::rtl::Reference<connectivity::OSQLColumns>  m_xColumns; // this are the select columns
            ::rtl::Reference<connectivity::OSQLColumns>  m_xParamColumns;
@@ -318,7 +318,7 @@ public:
            void            methodEntry();

            private:
                inline void impl_ensureKeySet()
                void impl_ensureKeySet()
                {
                    if ( !m_pKeySet.is() )
                        m_pKeySet = new OKeySet();
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index dcf4f97..6895a9b 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -52,7 +52,6 @@ struct ProviderRequest
    {
    }

    inline
    bool CREATE_PROVIDER(
                const OUString& Implname,
                const Sequence< OUString > & Services,
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index 74be60c..f24d94f 100644
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
@@ -32,10 +32,10 @@ namespace connectivity
        OAutoRetrievingBase() : m_bAutoRetrievingEnabled(false) {}
        virtual ~OAutoRetrievingBase(){}

        inline void enableAutoRetrievingEnabled(bool _bAutoEnable)          { m_bAutoRetrievingEnabled = _bAutoEnable; }
        inline void setAutoRetrievingStatement(const OUString& _sStmt)   { m_sGeneratedValueStatement = _sStmt; }
        void enableAutoRetrievingEnabled(bool _bAutoEnable)          { m_bAutoRetrievingEnabled = _bAutoEnable; }
        void setAutoRetrievingStatement(const OUString& _sStmt)   { m_sGeneratedValueStatement = _sStmt; }
    public:
        inline bool                 isAutoRetrievingEnabled()       const { return m_bAutoRetrievingEnabled; }
        bool                 isAutoRetrievingEnabled()       const { return m_bAutoRetrievingEnabled; }

        /** transform the statement to query for auto generated values
            @param  _sInsertStatement
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index 948d6f8..fb087a8 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -102,13 +102,13 @@ namespace connectivity
                m_ColumnLabel = _aColumnName;
        }

        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* )
            {  }

        bool isAutoIncrement()              const { return m_AutoIncrement; }
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 2ad3d35..1b7f24b 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -63,13 +63,13 @@ namespace connectivity
                ,bUnsigned(false)
        {}

        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 /*nSize*/,void* _pHint )
        static void * SAL_CALL operator new( size_t /*nSize*/,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 * /*pMem*/,void* /*_pHint*/ )
        static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
            {  }

        bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 5c54480..cc9ad49 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -59,14 +59,14 @@ namespace connectivity

        OMetaConnection();

        inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; }
        rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; }
        const OUString&         getURL() const  { return m_sURL; }
        inline void             setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; }
        void             setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; }
        void                    throwGenericSQLException( sal_uInt16 _nErrorResourceId,const css::uno::Reference< css::uno::XInterface>& _xContext  );
        const SharedResources& getResources() const { return m_aResources;}

        inline void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; }
        inline const css::uno::Sequence< css::beans::PropertyValue >&
        void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; }
        const css::uno::Sequence< css::beans::PropertyValue >&
            getConnectionInfo() const { return m_aConnectionInfo; }

        // OComponentHelper
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 6d7f1b3..0a9d833 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -36,19 +36,19 @@ namespace connectivity

        ~OKeyValue();

        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* )
            {  }

        static OKeyValue* createKeyValue(sal_Int32 nVal);
        //  static OKeyValue* createEmptyKeyValue();

        inline void pushKey(const ORowSetValueDecoratorRef& _aValueRef)
        void pushKey(const ORowSetValueDecoratorRef& _aValueRef)
        {
            m_aKeys.push_back(_aValueRef);
        }
@@ -64,7 +64,7 @@ namespace connectivity
            return m_aKeys[i]->getValue();
        }

        inline sal_Int32 getValue() const { return m_nValue; }
        sal_Int32 getValue() const { return m_nValue; }
    };
}

diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 6b8231a..2a24588 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -41,13 +41,13 @@ namespace connectivity
        OSkipDeletedSet(IResultSetHelper* _pHelper);
        ~OSkipDeletedSet();

        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* )
            {  }

        /**
@@ -85,7 +85,7 @@ namespace connectivity
                sal_Int32 _nPos the logical position
        */
        void        deletePosition(sal_Int32 _nPos);
        inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
        void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
    };
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_TSKIPDELETEDSET_HXX
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index be1a04d..075d371 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -63,13 +63,13 @@ namespace connectivity

        ~OSortIndex();

        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* )
            {  }


@@ -92,8 +92,8 @@ namespace connectivity
        */
        ::rtl::Reference<OKeySet> CreateKeySet();

        inline const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; }
        inline TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; }
        const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; }
        TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; }

    };

diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index c9a18d1..09fca40 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -125,12 +125,12 @@ namespace connectivity

            bool                matchesExtension( const OUString& _rExt ) const;

            inline const OUString&    getExtension()            const { return m_aFilenameExtension; }
            inline bool         isCaseSensitveExtension()   const { return m_bCaseSensitiveExtension; }
            inline OFileDriver*     getDriver()                 const { return m_pDriver; }
            inline bool         showDeleted()               const { return m_bShowDeleted; }
            inline bool         isCheckEnabled()            const { return m_bCheckSQL92; }
            inline bool             isTextEncodingDefaulted()   const { return m_bDefaultTextEncoding; }
            const OUString&    getExtension()            const { return m_aFilenameExtension; }
            bool         isCaseSensitveExtension()   const { return m_bCaseSensitiveExtension; }
            OFileDriver*     getDriver()                 const { return m_pDriver; }
            bool         showDeleted()               const { return m_bShowDeleted; }
            bool         isCheckEnabled()            const { return m_bCheckSQL92; }
            bool             isTextEncodingDefaulted()   const { return m_bDefaultTextEncoding; }

        public:
            struct GrantAccess
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 7044200..912bcc2 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -135,7 +135,7 @@ namespace connectivity
            bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] >= 0;}

            // return true when the select statement is "select count(*) from table"
            inline bool isCount() const { return m_bIsCount; }
            bool isCount() const { return m_bIsCount; }
            /// @throws css::sdbc::SQLException
            void checkIndex(sal_Int32 columnIndex );

@@ -263,23 +263,23 @@ namespace connectivity
            bool OpenImpl();
            void doTableSpecials(const OSQLTable& _xTable);

            inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
            inline void setParameterRow(const OValueRefRow& _rParaRow)                  { m_aParameterRow = _rParaRow; }
            inline void setEvaluationRow(const OValueRefRow& _aRow)                     { m_aEvaluateRow = _aRow; }
            inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>&  _xParamColumns) { m_xParamColumns = _xParamColumns; }
            inline void setAssignValues(const ORefAssignValues& _aAssignValues)         { m_aAssignValues = _aAssignValues; }
            inline void setBindingRow(const OValueRefRow& _aRow)                        { m_aRow = _aRow; }
            inline void setSelectRow(const OValueRefRow& _rRow)
            sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
            void setParameterRow(const OValueRefRow& _rParaRow)                  { m_aParameterRow = _rParaRow; }
            void setEvaluationRow(const OValueRefRow& _aRow)                     { m_aEvaluateRow = _aRow; }
            void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>&  _xParamColumns) { m_xParamColumns = _xParamColumns; }
            void setAssignValues(const ORefAssignValues& _aAssignValues)         { m_aAssignValues = _aAssignValues; }
            void setBindingRow(const OValueRefRow& _aRow)                        { m_aRow = _aRow; }
            void setSelectRow(const OValueRefRow& _rRow)
            {
                m_aSelectRow = _rRow;
                m_nColumnCount = m_aSelectRow->get().size();
            }
            inline void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping)   { m_aColMapping = _aColumnMapping; }
            inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer)                     { m_pSQLAnalyzer = _pSQLAnalyzer; }
            void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping)   { m_aColMapping = _aColumnMapping; }
            void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer)                     { m_pSQLAnalyzer = _pSQLAnalyzer; }

            inline void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy)  { m_aOrderbyColumnNumber = _aColumnOrderBy; }
            inline void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc)    { m_aOrderbyAscending = _aOrderbyAsc; }
            inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
            void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy)  { m_aOrderbyColumnNumber = _aColumnOrderBy; }
            void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc)    { m_aOrderbyAscending = _aOrderbyAsc; }
            void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}

            static void setBoundedColumns(const OValueRefRow& _rRow,
                                    const OValueRefRow& _rSelectRow,
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 919f31df..d92b3cf 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -45,13 +45,13 @@ namespace connectivity
        public:
            OSQLAnalyzer(OConnection* _pConnection);
            ~OSQLAnalyzer();
            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 /*nSize*/,void* _pHint )
            static void * SAL_CALL operator new( size_t /*nSize*/,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 * /*pMem*/,void* /*_pHint*/ )
            static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                {  }

            OConnection* getConnection() const { return m_pConnection; }
@@ -72,7 +72,7 @@ namespace connectivity
            void start(OSQLParseNode* pSQLParseNode);
            bool hasRestriction() const;
            bool hasFunctions() const;
            inline bool evaluateRestriction()   { return m_aInterpreter->start(); }
            bool evaluateRestriction()   { return m_aInterpreter->start(); }
            void setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping);
            void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols);
            static OOperandAttr* createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 14d6683..d3a3b8a 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -55,13 +55,13 @@ namespace connectivity
            OCode& operator=(OCode&&) = default;
#endif

            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 /*nSize*/,void* _pHint )
            static void * SAL_CALL operator new( size_t /*nSize*/,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 * /*pMem*/,void* /*_pHint*/ )
            static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                {  }

        };
@@ -269,7 +269,7 @@ namespace connectivity
            OOp_COMPARE(sal_Int32 aPType)
                         :aPredicateType(aPType) {}

            inline sal_Int32 getPredicateType() const { return aPredicateType; }
            sal_Int32 getPredicateType() const { return aPredicateType; }
            virtual bool operate(const OOperand*, const OOperand*) const override;
        };

diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index aa04fb5..97c58a1 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -49,13 +49,13 @@ namespace connectivity

            virtual ~OPredicateCompiler() override;

            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 /*nSize*/,void* _pHint )
            static void * SAL_CALL operator new( size_t /*nSize*/,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 * /*pMem*/,void* /*_pHint*/ )
            static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                {  }
            void dispose();

@@ -105,12 +105,12 @@ namespace connectivity
            bool        evaluate(OCodeList& rCodeList);
            void        evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal);

            inline bool start()
            bool start()
            {
                return evaluate(m_rCompiler->m_aCodeList);
            }

            inline void startSelection(ORowSetValueDecoratorRef& _rVal)
            void startSelection(ORowSetValueDecoratorRef& _rVal)
            {
                evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
            }
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 832fa1d9..f5c9268 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -37,10 +37,10 @@ namespace connectivity

        sal_Int32  GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const;
        OUString   GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok, sal_Unicode cStrDel = '\0') const;
        inline OUString& GetString() { return m_sString; }
        inline void SetString(const OUString& aStr) { m_sString = aStr;}
        inline sal_Int32 Len() const { return m_sString.getLength(); }
        inline operator OUString&() { return m_sString; }
        OUString& GetString() { return m_sString; }
        void SetString(const OUString& aStr) { m_sString = aStr;}
        sal_Int32 Len() const { return m_sString.getLength(); }
        operator OUString&() { return m_sString; }
    };
}

diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 57e36fc..ef181a0 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -43,12 +43,12 @@ namespace connectivity
            virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override;

            // own methods
            inline bool     isHeaderLine()          const { return m_bHeaderLine;       }
            inline sal_Unicode  getFieldDelimiter()     const { return m_cFieldDelimiter;   }
            inline sal_Unicode  getStringDelimiter()    const { return m_cStringDelimiter;  }
            inline sal_Unicode  getDecimalDelimiter()   const { return m_cDecimalDelimiter; }
            inline sal_Unicode  getThousandDelimiter()  const { return m_cThousandDelimiter;}
            inline sal_Int32    getMaxRowsToScan()      const { return m_nMaxRowsToScan;}
            bool     isHeaderLine()          const { return m_bHeaderLine;       }
            sal_Unicode  getFieldDelimiter()     const { return m_cFieldDelimiter;   }
            sal_Unicode  getStringDelimiter()    const { return m_cStringDelimiter;  }
            sal_Unicode  getDecimalDelimiter()   const { return m_cDecimalDelimiter; }
            sal_Unicode  getThousandDelimiter()  const { return m_cThousandDelimiter;}
            sal_Int32    getMaxRowsToScan()      const { return m_nMaxRowsToScan;}
            // XServiceInfo
            DECLARE_SERVICE_INFO();

diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 68071ad..777bcc8 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -50,8 +50,8 @@ namespace connectivity
        public:
            OHCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection);

            inline sdbcx::OCollection*      getPrivateTables()  const { return m_pTables;}
            inline sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
            sdbcx::OCollection*      getPrivateTables()  const { return m_pTables;}
            sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
            const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; }

            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index b7fae0f..8aa2abd 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -94,10 +94,10 @@ namespace connectivity
        const css::uno::Sequence< css::beans::PropertyValue >&
            getConnectionInfo() const { return m_aConnectionInfo; }

        inline  bool isIgnoreDriverPrivilegesEnabled() const { return   m_bIgnoreDriverPrivileges;}
        inline  bool isIgnoreCurrencyEnabled() const { return   m_bIgnoreCurrency; }
        inline const css::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; }
        inline const css::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; }
        bool isIgnoreDriverPrivilegesEnabled() const { return   m_bIgnoreDriverPrivileges;}
        bool isIgnoreCurrencyEnabled() const { return   m_bIgnoreCurrency; }
        const css::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; }
        const css::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; }

        /** returns the instance used for logging events related to this connection
        */
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 8fa7def..28fc468 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -50,8 +50,8 @@ namespace connectivity
        public:
            OMySQLCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection);

            inline sdbcx::OCollection*      getPrivateTables()  const { return m_pTables;}
            inline sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
            sdbcx::OCollection*      getPrivateTables()  const { return m_pTables;}
            sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
            const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; }

            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 1c33aca..f93e1e4 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -120,12 +120,12 @@ namespace connectivity
            SQLHANDLE       getConnection() { return m_aConnectionHandle; }

            // should we use the catalog on filebased databases
            inline bool     isCatalogUsed()                     const { return m_bUseCatalog; }
            inline bool     isParameterSubstitutionEnabled()    const { return m_bParameterSubstitution; }
            inline bool     isIgnoreDriverPrivilegesEnabled()   const { return m_bIgnoreDriverPrivileges; }
            inline bool     preventGetVersionColumns()          const { return m_bPreventGetVersionColumns; }
            inline bool     useOldDateFormat()                  const { return m_bUseOldDateFormat; }
            inline ODBCDriver*      getDriver()                     const { return m_pDriver;}
            bool     isCatalogUsed()                     const { return m_bUseCatalog; }
            bool     isParameterSubstitutionEnabled()    const { return m_bParameterSubstitution; }
            bool     isIgnoreDriverPrivilegesEnabled()   const { return m_bIgnoreDriverPrivileges; }
            bool     preventGetVersionColumns()          const { return m_bPreventGetVersionColumns; }
            bool     useOldDateFormat()                  const { return m_bUseOldDateFormat; }
            ODBCDriver*      getDriver()                     const { return m_pDriver;}

            SQLHANDLE       createStatementHandle();
            // close and free the handle and set it to SQL_NULLHANDLE
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 6f83876..56e3b50 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -116,7 +116,7 @@ namespace connectivity
            ODatabaseMetaDataResultSet(OConnection* _pConnection);


            inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            {
                return m_pConnection->getOdbcFunction(_nIndex);
            }
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 9b79a07..7bdbfa0 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -69,7 +69,7 @@ namespace connectivity
        /// unary_function Functor object for class ZZ returntype is void
        struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool >
        {
            inline bool operator()( const css::uno::Sequence<sal_Int8>& _rLH,
            bool operator()( const css::uno::Sequence<sal_Int8>& _rLH,
                                    const css::uno::Sequence<sal_Int8>& _rRH) const
            {
                if(_rLH.getLength() == _rRH.getLength())
@@ -234,7 +234,7 @@ namespace connectivity

            void construct();

            inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            {
                return m_pStatement->getOdbcFunction(_nIndex);
            }
@@ -244,7 +244,7 @@ namespace connectivity
                return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this));
            }

            inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
            void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}

            // ::cppu::OComponentHelper
            virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index e9357c9..864b1be 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -87,7 +87,7 @@ namespace connectivity
                                              ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                              ,sal_Int32 column);

            inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            {
                return m_pConnection->getOdbcFunction(_nIndex);
            }
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 5f130f9..64e22af 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -161,7 +161,7 @@ namespace connectivity
            OStatement_Base(OConnection* _pConnection );
            using OStatement_BASE::operator css::uno::Reference< css::uno::XInterface >;

            inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
            {
                return m_pConnection->getOdbcFunction(_nIndex);
            }
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 1b2e957..ed206b4 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -98,7 +98,7 @@ namespace connectivity
        }

    public:
        inline  bool    isQueryAllowed( const OUString& _rQueryName )
        bool    isQueryAllowed( const OUString& _rQueryName )
        {
            if ( !m_pForbiddenQueryNames.get() )
                return true;
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index 1e74f02..0bdf225 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -47,10 +47,10 @@ namespace cppu_threadpool {

        bool launch();

        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); }

    private:
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 7cfba7a..476198a 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -66,7 +66,7 @@ public:
    { other._pMapping = nullptr; }
    inline ~Mapping();
    inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping );
    inline Mapping & SAL_CALL operator = ( const Mapping & rMapping )
    Mapping & SAL_CALL operator = ( const Mapping & rMapping )
        { return operator = ( rMapping._pMapping ); }
    Mapping & operator =(Mapping && other) {
        if (_pMapping != nullptr) {
@@ -76,9 +76,9 @@ public:
        other._pMapping = nullptr;
        return *this;
    }
    inline uno_Mapping * SAL_CALL get() const
    uno_Mapping * SAL_CALL get() const
        { return _pMapping; }
    inline bool SAL_CALL is() const
    bool SAL_CALL is() const
        { return (_pMapping != nullptr); }
};

diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 08e2e7a..355445d 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -133,7 +133,7 @@ protected:
        Any value;
        bool lateInit;

        inline ContextEntry( Any const & value_, bool lateInit_ )
        ContextEntry( Any const & value_, bool lateInit_ )
            : value( value_ )
            , lateInit( lateInit_ )
            {}
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 6bec688..a49f3aa 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -47,7 +47,7 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower

    virtual ~ExceptionThrower() {}

    static inline Type const & getCppuType()
    static Type const & getCppuType()
    {
        return cppu::UnoType<XExceptionThrower>::get();
    }
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 8180065..c0b2cda 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -126,7 +126,7 @@ protected:
    virtual void SAL_CALL disposing() override;

public:
    inline Bootstrap_MacroExpander()
    Bootstrap_MacroExpander()
        : t_uno_impl( m_mutex )
        {}

diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index 8895119..c2e4266 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -60,7 +60,7 @@ public:
     */
    explicit inline Impl(rtl::OUString const & m_aDescriptor);

    inline Impl * clone() const { return new Impl(*this); }
    Impl * clone() const { return new Impl(*this); }
};

inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor)
@@ -188,7 +188,7 @@ public:
    UnoUrlDescriptor m_aProtocol;
    rtl::OUString m_aObjectName;

    inline Impl * clone() const { return new Impl(*this); }
    Impl * clone() const { return new Impl(*this); }

    /** @exception rtl::MalformedUriException
     */
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index fd22cd3..9db35dd 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -64,13 +64,13 @@ namespace svx
            OutputDevice& m_rDev;

        public:
            inline FontSwitch( OutputDevice& _rDev, const vcl::Font& _rTemporaryFont )
            FontSwitch( OutputDevice& _rDev, const vcl::Font& _rTemporaryFont )
                :m_rDev( _rDev )
            {
                m_rDev.Push( PushFlags::FONT );
                m_rDev.SetFont( _rTemporaryFont );
            }
            inline ~FontSwitch( )
            ~FontSwitch( )
            {
                m_rDev.Pop( );
            }
@@ -1250,7 +1250,7 @@ namespace svx
        const OUString*     First();
        const OUString*     Next();

        inline sal_uInt16   GetCount() const { return m_nNumOfEntries; }
        sal_uInt16   GetCount() const { return m_nNumOfEntries; }
    };

    SuggestionList::SuggestionList() :
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 5c83243..3a34ca6 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -78,9 +78,9 @@ class OfaACorrCheckListBox : public SvSimpleTable
        {
        }

        inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
        inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
        inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
        void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
        void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
        sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }

        bool            IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
        void            CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked);
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 056e4cd..19feaf2 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -86,9 +86,9 @@ public:

    void                    SetPage( SvxHyperlinkItem* pItem );
    void                    SetReadOnlyMode( bool bReadOnly );
    inline bool             IsHTMLDoc() const { return mbIsHTMLDoc; }
    bool             IsHTMLDoc() const { return mbIsHTMLDoc; }

    inline SfxDispatcher*   GetDispatcher() const { return mpBindings->GetDispatcher(); }
    SfxDispatcher*   GetDispatcher() const { return mpBindings->GetDispatcher(); }
};


diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 52076b1..5debbd7 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -99,7 +99,7 @@ protected:

    static OUString GetSchemeFromURL( const OUString& rStrURL );

    inline void     DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
    void     DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; }

public:
    SvxHyperlinkTabPageBase (
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 044e749..3c9e79d 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -138,7 +138,7 @@ protected:

    virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
    static SfxItemSet*      CreateInputItemSet( sal_uInt16 nId );
    inline IconChoicePage*  GetTabPage( sal_uInt16 nPageId )
    IconChoicePage*  GetTabPage( sal_uInt16 nPageId )
                                { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : nullptr); }

    void                    ActivatePageImpl ();
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 845944b..22a24e8 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -137,24 +137,24 @@ private:

    DECL_LINK(EditHdl_Impl, Button*, void);

    inline void             EnableRemoveButton()
    void             EnableRemoveButton()
                                { m_pRemoveBtn->Enable(
                                    m_pAssignedList->GetSelectEntryPos()
                                    != LISTBOX_ENTRY_NOTFOUND ); }


    inline void             EnableEditButton()
    void             EnableEditButton()
                                { m_pEditBtn->Enable(
                                    m_pAssignedList->GetSelectEntryPos()
                                    != LISTBOX_ENTRY_NOTFOUND ); }

    inline void             DisableAssignButton()
    void             DisableAssignButton()
                                { m_pAssignBtn->Disable(); }

    inline void             DisableRemoveButton()
    void             DisableRemoveButton()
                                { m_pRemoveBtn->Disable(); }

    inline void             DisableEditButton()
    void             DisableEditButton()
                                { m_pEditBtn->Disable(); }


@@ -189,7 +189,7 @@ private:
    DECL_LINK(SelectHdl_Impl, ListBox&, void);

    bool                    IsPathDuplicate( const OUString& _rPath );
    inline void             EnableRemoveButton()
    void             EnableRemoveButton()
                                { m_pRemoveBtn->Enable(
                                    m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }

@@ -199,8 +199,8 @@ public:
    virtual ~SvxJavaClassPathDlg() override;
    virtual void            dispose() override;

    inline const OUString&  GetOldPath() const { return m_sOldPath; }
    inline void             SetFocus() { m_pPathList->GrabFocus(); }
    const OUString&  GetOldPath() const { return m_sOldPath; }
    void             SetFocus() { m_pPathList->GrabFocus(); }

    OUString                GetClassPath() const;
    void                    SetClassPath( const OUString& _rPath );
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 2361724..b7d6659 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -41,7 +41,7 @@ of the tab page.
class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const editeng::SvxBorderLine* >
{
public:
    inline explicit     LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {}
    explicit     LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {}

    virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const override
                            { return rItem.GetLine(); }
@@ -54,7 +54,7 @@ public:
class FrameSelectorWrapper : public sfx::SingleControlWrapper< FrameSelector, const editeng::SvxBorderLine* >
{
public:
    inline explicit     FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) :
    explicit     FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) :
                            SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {}

    virtual bool        IsControlDontKnow() const override;
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 385ef02..1aa91ee 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -332,16 +332,16 @@ namespace dbaccess
        struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } };

        // cancel the insertion, if necessary (means if we're on the insert row)
        inline  void        doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
        inline  bool    isModification( const GrantNotifierAccess& ) { return isModification(); }
        inline  bool    isModified( const GrantNotifierAccess& ) { return isModified(); }
        inline  bool    isNew( const GrantNotifierAccess& ) { return isNew(); }
        inline  bool    isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); }
        inline  void        fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld, const GrantNotifierAccess& )
        void        doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
        bool    isModification( const GrantNotifierAccess& ) { return isModification(); }
        bool    isModified( const GrantNotifierAccess& ) { return isModified(); }
        bool    isNew( const GrantNotifierAccess& ) { return isNew(); }
        bool    isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); }
        void        fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld, const GrantNotifierAccess& )
        {
            fireProperty( _nProperty, _bNew, _bOld );
        }
        inline  void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
        void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
        {
            firePropertyChange(_nPos,_rNewValue);
        }
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 2763fbf..0c8b038 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -43,8 +43,8 @@ namespace dbaccess
        {}

        const ORowSetRow& getRow() const { return m_aRow; }
        inline void clearRow() { m_aRow = nullptr; }
        inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
        void clearRow() { m_aRow = nullptr; }
        void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
    };

    typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 784d4e4..3f9d5df 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -61,16 +61,16 @@ namespace dbaccess
        OComponentDefinition_Impl();
        virtual ~OComponentDefinition_Impl() override;

        inline size_t size() const { return m_aColumns.size(); }
        size_t size() const { return m_aColumns.size(); }

        inline const_iterator begin() const   { return m_aColumns.begin(); }
        inline const_iterator end() const     { return m_aColumns.end(); }
        const_iterator begin() const   { return m_aColumns.begin(); }
        const_iterator end() const     { return m_aColumns.end(); }

        inline const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); }
        const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); }

        inline void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); }
        void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); }

        inline void insert( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxColumn )
        void insert( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxColumn )
        {
            OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" );
            m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) );
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index bd56e90..6257486 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -247,7 +247,7 @@ public:

    /** determines whether the database document has an embedded data storage
    */
    inline bool isEmbeddedDatabase() const { return ( m_sConnectURL.startsWith("sdbc:embedded:") ); }
    bool isEmbeddedDatabase() const { return ( m_sConnectURL.startsWith("sdbc:embedded:") ); }

    /** stores the embedded storage ("database")

@@ -330,8 +330,8 @@ public:
    void clearConnections();

            css::uno::Reference< css::embed::XStorage > getOrCreateRootStorage();
    inline  css::uno::Reference< css::embed::XStorage > getRootStorage() const { return m_xDocumentStorage.getTyped(); }
    inline  void resetRootStorage() { impl_switchToStorage_throw( nullptr ); }
    css::uno::Reference< css::embed::XStorage > getRootStorage() const { return m_xDocumentStorage.getTyped(); }
    void resetRootStorage() { impl_switchToStorage_throw( nullptr ); }

    /** returns the data source. If it doesn't exist it will be created
    */
@@ -367,7 +367,7 @@ public:
    css::uno::Reference< css::document::XDocumentSubStorageSupplier >
            getDocumentSubStorageSupplier();

    inline const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }
    const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }

    void SAL_CALL acquire();

@@ -506,7 +506,7 @@ protected:
    */
    virtual css::uno::Reference< css::uno::XInterface > getThis() const = 0;

    inline ::osl::Mutex& getMutex() const
    ::osl::Mutex& getMutex() const
    {
        return m_aMutex;
    }
@@ -520,24 +520,24 @@ public:
            if m_pImpl is <NULL/>. Usually, you will set this member in your derived
            component's <code>dispose</code> method to <NULL/>.
    */
    inline ::osl::Mutex& getMutex( GuardAccess ) const
    ::osl::Mutex& getMutex( GuardAccess ) const
    {
        return getMutex();
    }

    /// checks whether the component is already disposed, throws a DisposedException if so
    inline void checkDisposed() const
    void checkDisposed() const
    {
        if ( !m_pImpl.is() )
            throw css::lang::DisposedException( "Component is already disposed.", getThis() );
    }

    inline void lockModify()
    void lockModify()
    {
        m_pImpl->lockModify();
    }

    inline void unlockModify()
    void unlockModify()
    {
        m_pImpl->unlockModify();
    }
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 35985fb..dddeb3e 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -198,7 +198,7 @@ public:

protected:
    /// @throws css::lang::DisposedException
    inline  void checkDisposed()
    void checkDisposed()
    {
        if ( rBHelper.bDisposed || !m_xConnection.is() )
            throw css::lang::DisposedException();
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 52367d4..99e4668 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -104,11 +104,11 @@ namespace dbaccess
        public:
            explicit DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext);

            inline void append(const ODatabaseModelImpl& _rModelImpl )
            void append(const ODatabaseModelImpl& _rModelImpl )
            {
                m_aDatabaseDocuments.push_back(&_rModelImpl);
            }
            inline void remove(const ODatabaseModelImpl& _rModelImpl) { m_aDatabaseDocuments.remove(&_rModelImpl); }
            void remove(const ODatabaseModelImpl& _rModelImpl) { m_aDatabaseDocuments.remove(&_rModelImpl); }

        private:
            // XTerminateListener
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 66a87e7..2051c73 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -437,7 +437,7 @@ public:

    /** checks whether the component is already initialized, throws a NotInitializedException if not
    */
    inline void checkInitialized() const
    void checkInitialized() const
    {
        if ( !impl_isInitialized() )
            throw css::lang::NotInitializedException( OUString(), getThis() );
@@ -446,7 +446,7 @@ public:
    /** checks the document is currently in the initialization phase, or already initialized.
        Throws NotInitializedException if not so.
    */
    inline void checkNotUninitilized() const
    void checkNotUninitilized() const
    {
        if ( impl_isInitialized() || impl_isInitializing() )
            // fine
@@ -458,7 +458,7 @@ public:
    /** checks whether the document is currently being initialized, or already initialized,
        throws a DoubleInitializationException if so
    */
    inline void checkNotInitialized() const
    void checkNotInitialized() const
    {
        if ( impl_isInitializing() || impl_isInitialized() )
            throw css::frame::DoubleInitializationException( OUString(), getThis() );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 2a4372e..82a8869 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -243,7 +243,7 @@ namespace dbaccess
        virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) override
        {
        }
        inline void resetClient() { m_pClient = nullptr; }
        void resetClient() { m_pClient = nullptr; }
    };

    // LockModifiable
@@ -298,13 +298,13 @@ namespace dbaccess
        Reference< XInterface > m_xClient;

    public:
        inline static void couple( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
        static void couple( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
        {
            Reference< css::lang::XEventListener > xEnsureDelete( new LifetimeCoupler( _rxClient, _rxActor ) );
        }

    private:
        inline LifetimeCoupler( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
        LifetimeCoupler( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
            :m_xClient( _rxClient )
        {
            OSL_ENSURE( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" );
@@ -646,7 +646,7 @@ namespace
            }
        }

        inline ~PreserveVisualAreaSize()
        ~PreserveVisualAreaSize()
        {
            if ( m_xVisObject.is() && m_aOriginalSize.Width && m_aOriginalSize.Height )
            {
@@ -690,7 +690,7 @@ namespace
            }
        }

        inline ~LayoutManagerLock()
        ~LayoutManagerLock()
        {
            try
            {
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 8b81255..dcf2cfb 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -143,7 +143,7 @@ public:
    void saveAs();
    void closeObject();
    bool isModified();
    inline bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; }
    bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; }

    static void fillReportData(
                    const css::uno::Reference< css::uno::XComponentContext > & _rxContext,
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 0ffd47d..14c6800 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -174,7 +174,7 @@ namespace dbaccess
        // XRename
        virtual void SAL_CALL rename( const OUString& newName ) override;

        inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; }
        const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; }
        css::uno::Reference< css::sdbc::XRow >
            getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties );

diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index 132f12f..5ba7565 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -53,8 +53,8 @@ namespace dbaccess
        */
        virtual OUString getTableTypeRestriction() const = 0;

        inline virtual void addMasterContainerListener(){}
        inline virtual void removeMasterContainerListener(){}
        virtual void addMasterContainerListener(){}
        virtual void removeMasterContainerListener(){}

        // ::connectivity::sdbcx::OCollection
        virtual void impl_refresh() override;
@@ -108,7 +108,7 @@ namespace dbaccess
                            oslInterlockedCount& _nInAppend
                        );

        inline void dispose() { disposing(); }
        void dispose() { disposing(); }

        /** late ctor. The container will fill itself with the data got by the connection meta data, considering the
            filters given (the connection is the parent object you passed in the ctor).
@@ -127,7 +127,7 @@ namespace dbaccess
            const css::uno::Sequence< OUString >& _rTableTypeFilter
            );

        inline bool isInitialized() const { return m_bConstructed; }
        bool isInitialized() const { return m_bConstructed; }
    };
} // namespace

diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index 68c4be4..5caa9be 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -61,7 +61,7 @@ namespace dbaccess
        // css::lang::XEventListener
        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;

        inline void setName( const OUString& _sName ) { m_sName = _sName; }
        void setName( const OUString& _sName ) { m_sName = _sName; }
        void setDefinition( const css::uno::Reference< css::beans::XPropertySet >& _xDest);
        const css::uno::Reference< css::beans::XPropertySet >& getDefinition() const { return m_xDest; }
    };
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 661f76e..a10d84b 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -66,7 +66,7 @@ namespace dbaccess

            SQLPartCount
        };
        static inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); }
        static void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); }
        enum EColumnType
        {
            SelectColumns       = 0,
@@ -149,8 +149,8 @@ namespace dbaccess
                    setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols );

        //helper methods for mem_fun_t
        inline bool implSetFilter(const OUString& _sFilter) { setFilter(_sFilter); return true;}
        inline bool implSetHavingClause(const OUString& _sFilter) { setHavingClause(_sFilter); return true;}
        bool implSetFilter(const OUString& _sFilter) { setFilter(_sFilter); return true;}
        bool implSetHavingClause(const OUString& _sFilter) { setHavingClause(_sFilter); return true;}

        /** returns the part of the select statement
            @param  _ePart
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 8530574..b9be7f0 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -172,9 +172,9 @@ namespace dbaccess
        }
        /** flag which determines whether the container is filled or not
        */
        inline bool isInitialized() const { return m_bInitialized; }
        inline void     setInitialized() {m_bInitialized = true;}
        inline void     setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }
        bool isInitialized() const { return m_bInitialized; }
        void     setInitialized() {m_bInitialized = true;}
        void     setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }

    public:
        /** constructs an empty container without configuration location.
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 472bc2f..c50df7b 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -58,18 +58,18 @@ private:
    NamedDefinitions    m_aDefinitions;

public:
    inline size_t size() const { return m_aDefinitions.size(); }
    size_t size() const { return m_aDefinitions.size(); }

    inline const_iterator begin() const   { return m_aDefinitions.begin(); }
    inline const_iterator end() const     { return m_aDefinitions.end(); }
    const_iterator begin() const   { return m_aDefinitions.begin(); }
    const_iterator end() const     { return m_aDefinitions.end(); }

    inline const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); }
    const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); }
           const_iterator find( const TContentPtr& _pDefinition ) const;

    inline void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); }
    void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); }
    void erase( const TContentPtr& _pDefinition );

    inline void insert( const OUString& _rName, TContentPtr _pDefinition )
    void insert( const OUString& _rName, TContentPtr _pDefinition )
    {
        m_aDefinitions.insert( NamedDefinitions::value_type( _rName, _pDefinition ) );
    }
@@ -142,12 +142,12 @@ protected:
protected:
    virtual ~ODefinitionContainer() override;

    inline const ODefinitionContainer_Impl& getDefinitions() const
    const ODefinitionContainer_Impl& getDefinitions() const
    {
        return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl.get() );
    }

    inline       ODefinitionContainer_Impl&  getDefinitions()
    ODefinitionContainer_Impl&  getDefinitions()
    {
        return dynamic_cast<       ODefinitionContainer_Impl& >( *m_pImpl.get() );
    }
@@ -292,7 +292,7 @@ protected:
            ListenerType _eType
        );

    inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
    SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
    {
        return const_cast< XContainer* >( static_cast< const XContainer* >( this ) );
    }
@@ -318,7 +318,7 @@ private:
            const css::uno::Reference< css::ucb::XContent >& _rxObject
        ) const;

    inline bool impl_haveAnyListeners_nothrow() const
    bool impl_haveAnyListeners_nothrow() const
    {
        return ( m_aContainerListeners.getLength() > 0 ) || ( m_aApproveListeners.getLength() > 0 );
    }
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index ab16c65..def0bf7 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -548,7 +548,7 @@ namespace dbmm
        /** determines whether the instance is valid, i.e. refers to a valid root storage
            for reading/storing scripts
        */
        inline bool isValid() const { return m_xScriptsStorage.is(); }
        bool isValid() const { return m_xScriptsStorage.is(); }

        /** binds the instance to a new document. Only to be called when the instance is not yet
            bound (i.e. isValid returns <FALSE/>).
@@ -780,8 +780,8 @@ namespace dbmm
            MigrationLog& _rLogger
        );

        inline  size_t      getFormCount() const    { return m_nFormCount; }
        inline  size_t      getReportCount()const   { return m_nReportCount; }
        size_t      getFormCount() const    { return m_nFormCount; }
        size_t      getReportCount()const   { return m_nReportCount; }
        bool    migrateAll();

    private:
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index da60e35..3360131 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
@@ -48,7 +48,7 @@ namespace dbaxml
            @param  _sTableFilterPattern
                The new filter pattern.
        */
        inline void pushTableFilterPattern(const OUString& _sTableFilterPattern)
        void pushTableFilterPattern(const OUString& _sTableFilterPattern)
        {
            m_aPatterns.push_back(_sTableFilterPattern);
        }
@@ -57,7 +57,7 @@ namespace dbaxml
            @param  _sTypeFilter
                The new type filter.
        */
        inline void pushTableTypeFilter(const OUString& _sTypeFilter)
        void pushTableTypeFilter(const OUString& _sTypeFilter)
        {
            m_aTypes.push_back(_sTypeFilter);
        }
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index ca92b75..d2372d8 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -125,7 +125,7 @@ public:

    const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; }

    inline const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;}
    const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;}

    const SvXMLTokenMap& GetDocElemTokenMap() const;
    const SvXMLTokenMap& GetDatabaseElemTokenMap() const;
@@ -145,15 +145,15 @@ public:
    /** add a Info to the sequence which will be appended to the data source
        @param  _rInfo The property to append.
    */
    inline void addInfo(const css::beans::PropertyValue& _rInfo)
    void addInfo(const css::beans::PropertyValue& _rInfo)
    {
        m_aInfoSequence.push_back(_rInfo);
    }

    void setPropertyInfo();

    inline bool isNewFormat() const { return m_bNewFormat; }
    inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
    bool isNewFormat() const { return m_bNewFormat; }
    void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
};

} // namespace dbaxml
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index e8f30cd..f8ff269 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -51,7 +51,7 @@ public:
    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
    virtual void SAL_CALL release() throw() override;

    inline operator css::uno::Reference< css::uno::XInterface > () const
    operator css::uno::Reference< css::uno::XInterface > () const
        { return static_cast<css::uno::XWeak *>(const_cast<OSubComponent *>(this)); }

};
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index 845a52c..37fb95b 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -88,12 +88,12 @@ namespace sdbtools

        ::osl::Mutex&   getMutex( GuardAccess ) const { return m_aMutex; }

        inline bool acquireConnection( GuardAccess )
        bool acquireConnection( GuardAccess )
        {
            m_xConnection.set(m_aConnection);
            return m_xConnection.is();
        }
        inline void releaseConnection( GuardAccess )
        void releaseConnection( GuardAccess )
        {
            m_xConnection.clear();
        }
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index d423cfc..7787f8e 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -163,7 +163,7 @@ namespace sdbtools
        {
        }

        static inline ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName )
        static ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName )
        {
            if  (   ( _rName.indexOf( (sal_Unicode)34  ) >= 0 )  // "
                ||  ( _rName.indexOf( (sal_Unicode)39  ) >= 0 )  // '
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index b94c4c7..09091df 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -159,7 +159,7 @@ namespace dbaui
        // click a TB slot
        DECL_LINK(OnDropdownClickHdl, ToolBox*, void);

        inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
        OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
        void ImplInitSettings();

    public:
@@ -187,7 +187,7 @@ namespace dbaui

        /** returns the current visible tree list box
        */
        inline DBTreeListBox* getCurrentView() const
        DBTreeListBox* getCurrentView() const
        {
            ElementType eType = getElementType();
            return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : nullptr;
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 03cb811..31ab9c7 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -66,7 +66,7 @@ namespace dbaui
        virtual void GetFocus() override;
        virtual void LoseFocus() override;

        inline void resetLastActive() { m_pLastActiveEntry = nullptr;}
        void resetLastActive() { m_pLastActiveEntry = nullptr;}

        void    updateHelpText();

@@ -134,7 +134,7 @@ namespace dbaui
        /// fills the Creation listbox with the necessary strings and images
        void fillTaskEntryList( const TaskEntryList& _rList );

        inline bool HandleKeyInput( const KeyEvent& _rKEvt )
        bool HandleKeyInput( const KeyEvent& _rKEvt )
        {
            return m_aCreation->HandleKeyInput( _rKEvt );
        }
@@ -188,8 +188,8 @@ namespace dbaui
        */
        bool    interceptKeyInput( const KeyEvent& _rEvent );

        inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
        inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); }
        OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
        OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); }

        bool isCutAllowed() override ;
        bool isCopyAllowed() override    ;
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index a902bda..ac2b9f1 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -55,9 +55,9 @@ namespace dbaui
        void cut() override   { }
        void paste() override { }

        inline sal_Int32                GetEntryCount() const { return m_aIconControl->GetEntryCount(); }
        inline SvxIconChoiceCtrlEntry*  GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); }
        inline Rectangle                GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); }
        sal_Int32                GetEntryCount() const { return m_aIconControl->GetEntryCount(); }
        SvxIconChoiceCtrlEntry*  GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); }
        Rectangle                GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); }

        /** automatically creates mnemonics for the icon/texts in our left hand side panel
        */
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 305b56f..491ebfd 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -55,7 +55,7 @@ namespace dbaui
            @return
                The child window.
        */
        inline vcl::Window* getChildWindow() const { return m_pChild; }
        vcl::Window* getChildWindow() const { return m_pChild; }

        /** sets the title text out of the resource
            @param  _nTitleId
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 136c255..289f8c5 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -117,7 +117,7 @@ namespace dbaui
        virtual bool PreNotify( NotifyEvent& rNEvt ) override;
        virtual void GetFocus() override;

        inline OApplicationController&                  getAppController() const { return m_rAppController; }
        OApplicationController&                  getAppController() const { return m_rAppController; }

        // IClipboardTest
        virtual bool isCutAllowed() override;
@@ -128,9 +128,9 @@ namespace dbaui
        virtual void paste() override;

        /// get the left panel
        inline OApplicationSwapWindow*  getPanel()      const { return m_pWin->getPanel(); }
        OApplicationSwapWindow*  getPanel()      const { return m_pWin->getPanel(); }
        /// get the detail page
        inline OApplicationDetailView*  getDetailView() const { return m_pWin->getDetailView(); }
        OApplicationDetailView*  getDetailView() const { return m_pWin->getDetailView(); }

        /** return the qualified name.
            @param  _pEntry
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 900f684..851c67c 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -117,7 +117,7 @@ namespace dbaui
                }
            }

            inline bool is() const { return xFrame.is(); }
            bool is() const { return xFrame.is(); }

        private:
            bool impl_constructFrom( const Reference< XComponent >& _rxComponent )
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index e639e80..41832fc 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1224,7 +1224,7 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
/// unary_function Functor object for class ZZ returntype is void
    struct SbaGridControlPrec : std::unary_function<DataFlavorExVector::value_type,bool>
    {
        inline bool operator()(const DataFlavorExVector::value_type& _aType)
        bool operator()(const DataFlavorExVector::value_type& _aType)
        {
            switch (_aType.mnSotId)
            {
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index fd2e66c..b276bbe 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -88,7 +88,7 @@ namespace dbaui
            @param  _pItemSetHelper
                the itemset helper
        */
        inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper)
        void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper)
        {
            OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!");
            m_pAdminDialog = _pDialog;
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index a06a1ae..02badb3 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -158,7 +158,7 @@ namespace dbaui

        void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);

        inline void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
        void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }

        virtual void release() = 0;

diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 84c821e8..495a1e6 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -138,12 +138,12 @@ namespace dbaui
        void                InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler);

    protected:
        inline  void    setRightAligned()       { m_bRightAligned = true; }
        inline  bool    isRightAligned() const  { return m_bRightAligned; }
        void    setRightAligned()       { m_bRightAligned = true; }
        bool    isRightAligned() const  { return m_bRightAligned; }

        inline  void                saveCurrentFieldDescData() { SaveData( pActFieldDescr ); }
        inline  OFieldDescription*  getCurrentFieldDescData() { return pActFieldDescr; }
        inline  void                setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; }
        void                saveCurrentFieldDescData() { SaveData( pActFieldDescr ); }
        OFieldDescription*  getCurrentFieldDescData() { return pActFieldDescr; }
        void                setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; }

        sal_uInt16          CountActiveAggregates() const;
        sal_Int32           GetMaxControlHeight() const;
@@ -204,7 +204,7 @@ namespace dbaui

        OUString            getControlDefault( const OFieldDescription* _pFieldDescr, bool _bCheck = true) const;

        inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; }
        void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; }
    };
}
#endif
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 8718d88..ffe027d 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -82,9 +82,9 @@ namespace dbaui
        OJoinController(const css::uno::Reference< css::uno::XComponentContext >& _rM);

        // attribute access
        inline TTableWindowData&        getTableWindowData()     { return m_vTableData; }
        inline TTableConnectionData&    getTableConnectionData() { return m_vTableConnectionData;}
        inline OAddTableDlg*            getAddTableDialog()const { return m_pAddTableDialog; }
        TTableWindowData&        getTableWindowData()     { return m_vTableData; }
        TTableConnectionData&    getTableConnectionData() { return m_vTableConnectionData;}
        OAddTableDlg*            getAddTableDialog()const { return m_pAddTableDialog; }

        // OSingleDocumentController overridables
        virtual void        reconnect( bool _bUI ) override;
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index c90e987..51b8bed 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -68,12 +68,12 @@ namespace dbaui
        virtual bool Update() override;

        void        SetCardinality();
        inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; }
        inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; }
        void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; }
        void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; }

        inline sal_Int32    GetUpdateRules() const { return m_nUpdateRules; }
        inline sal_Int32    GetDeleteRules() const { return m_nDeleteRules; }
        inline Cardinality  GetCardinality() const { return m_nCardinality; }
        sal_Int32    GetUpdateRules() const { return m_nUpdateRules; }
        sal_Int32    GetDeleteRules() const { return m_nDeleteRules; }
        Cardinality  GetCardinality() const { return m_nCardinality; }

        bool        IsConnectionPossible();
        void        ChangeOrientation();
diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx
index 1ded72a..602f39d 100644
--- a/dbaccess/source/ui/inc/ScrollHelper.hxx
+++ b/dbaccess/source/ui/inc/ScrollHelper.hxx
@@ -40,7 +40,7 @@ namespace dbaui
            @param  _rUpScroll
                the method to set
        */
        inline void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll )
        void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll )
        {
            m_aUpScroll = _rUpScroll;
        }
@@ -49,7 +49,7 @@ namespace dbaui
            @param  _rDownScroll
                the method to set
        */
        inline void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll )
        void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll )
        {
            m_aDownScroll = _rDownScroll;
        }
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index e7cb022..e5de1f3 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -90,7 +90,7 @@ namespace dbaui

        const TTableConnectionData::value_type& GetData() const { return m_pData; }
        const std::vector<OConnectionLine*>&  GetConnLineList() const { return m_vConnLine; }
        inline OJoinTableView*                  GetParent() const { return m_pParent; }
        OJoinTableView*                  GetParent() const { return m_pParent; }
        virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
        using Window::Draw;
        virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index af5e4ab..9a4484c2 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -88,8 +88,8 @@ namespace dbaui
        const TTableWindowData::value_type& getReferencingTable() const { return m_pReferencingTable; }
        const TTableWindowData::value_type& getReferencedTable()  const { return m_pReferencedTable;  }

        inline void setReferencingTable(const TTableWindowData::value_type& _pTable) { m_pReferencingTable = _pTable; }
        inline void setReferencedTable(const TTableWindowData::value_type& _pTable)  { m_pReferencedTable  = _pTable; }
        void setReferencingTable(const TTableWindowData::value_type& _pTable) { m_pReferencingTable = _pTable; }
        void setReferencedTable(const TTableWindowData::value_type& _pTable)  { m_pReferencedTable  = _pTable; }

        /** Update create a new connection

diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index a6a4b60..4629155 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -94,19 +94,19 @@ namespace dbaui
        bool     isAlterAllowed()   const;
        bool     isAutoIncrementPrimaryKey() const;

        inline bool             isAutoIncrementValueEnabled()   const { return m_bAllowAutoIncrementValue; }
        inline const OUString&   getAutoIncrementValue()         const { return m_sAutoIncrementValue; }
        bool             isAutoIncrementValueEnabled()   const { return m_bAllowAutoIncrementValue; }
        const OUString&   getAutoIncrementValue()         const { return m_sAutoIncrementValue; }

        virtual void impl_onModifyChanged() override;

        inline std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }
        std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; }

        /// returns the position of the first empty row
        sal_Int32                           getFirstEmptyRowPosition();

        inline const OTypeInfoMap&          getTypeInfo() const { return m_aTypeInfo; }
        const OTypeInfoMap&          getTypeInfo() const { return m_aTypeInfo; }

        inline TOTypeInfoSP                 getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; }
        TOTypeInfoSP                 getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; }
        TOTypeInfoSP                        getTypeInfoByType(sal_Int32 _nDataType) const;

        const TOTypeInfoSP&                 getTypeInfoFallBack() const { return m_pTypeInfo; }
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 970a086..187f2fc 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -41,7 +41,7 @@ namespace dbaui
        {
        }

        inline bool operator()(const DataFlavorExVector::value_type& _aType)
        bool operator()(const DataFlavorExVector::value_type& _aType)
        {
            switch (_aType.mnSotId)
            {
@@ -154,9 +154,9 @@ namespace dbaui
        /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>.
        static bool isTableFormat(const TransferableDataHelper& _rClipboard);

        inline void                     SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; }
        inline void                     ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); }
        inline const OUString&   GetTableNameForAppend() const { return m_sTableNameForAppend ;}
        void                     SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; }
        void                     ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); }
        const OUString&   GetTableNameForAppend() const { return m_sTableNameForAppend ;}

    private:
        /** pastes a table into the data source
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index dc5700c..6c40ab1 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -109,12 +109,12 @@ namespace dbaui
        sal_Int32 GetFunctionType() const { return m_eFunctionType; }
        sal_uInt16 GetColumnId() const { return m_nColumnId;}

        inline bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; }
        inline bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; }
        inline bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; }
        inline bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; }
        inline bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION;  }
        inline bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }
        bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; }
        bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; }
        bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; }
        bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; }
        bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION;  }
        bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }

        bool HasCriteria() const
        {
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index a59c978..c7bf3a7 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -42,8 +42,8 @@ namespace dbaui
        OTableRow( const OTableRow& rRow, long nPosition = -1 );
        ~OTableRow();

        inline OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; }
        inline bool isValid() const { return GetActFieldDescr() != nullptr; }
        OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; }
        bool isValid() const { return GetActFieldDescr() != nullptr; }

        void SetFieldType( const TOTypeInfoSP& _pType, bool _bForce = false );

@@ -54,20 +54,20 @@ namespace dbaui
            @return
                the current position in the table
        */
        inline sal_Int32 GetPos() const { return m_nPos; }
        inline void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; }
        sal_Int32 GetPos() const { return m_nPos; }
        void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; }

        /** set the row readonly
            @param  _bRead
                if <TRUE/> then the row is readonly, otherwise not
        */
        inline void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; }
        void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; }

        /** returns if the row is readonly
            @return
                <TRUE/> if readonly, otherwise <FALSE/>
        */
        inline bool IsReadOnly() const { return m_bReadOnly; }
        bool IsReadOnly() const { return m_bReadOnly; }

        friend SvStream& WriteOTableRow( SvStream& rStr,const OTableRow& _rRow );
        friend SvStream& ReadOTableRow( SvStream& rStr, OTableRow& _rRow );
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 9ac6318..205c5f2 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -161,8 +161,8 @@ namespace dbaui
        */
        virtual OUString     GetName() const = 0;

        inline css::uno::Reference< css::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); }
        inline css::uno::Reference< css::beans::XPropertySet >    GetTable() const { return m_pData->getTable(); }
        css::uno::Reference< css::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); }
        css::uno::Reference< css::beans::XPropertySet >    GetTable() const { return m_pData->getTable(); }

        /** set the sizing flag to the direction
            @param  _rPos
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index 968c465..7d9caa3 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.hxx
@@ -71,20 +71,20 @@ namespace dbaui
        const OUString& GetWinName()         const { return m_aWinName; }
        const Point& GetPosition()                  const { return m_aPosition; }
        const Size& GetSize()                       const { return m_aSize; }
        inline bool IsShowAll()                     const { return m_bShowAll; }
        inline bool isQuery()                       const { return m_bIsQuery; }
        inline bool isValid()                       const { return m_bIsValid; } // it is either a table or query but it is known
        bool IsShowAll()                     const { return m_bShowAll; }
        bool isQuery()                       const { return m_bIsQuery; }
        bool isValid()                       const { return m_bIsValid; } // it is either a table or query but it is known
        bool HasPosition()  const;
        bool HasSize()      const;

        inline void SetWinName( const OUString& rWinName )       { m_aWinName = rWinName; }
        inline void SetPosition( const Point& rPos )                    { m_aPosition=rPos; }
        inline void SetSize( const Size& rSize )                        { m_aSize = rSize; }
        inline void ShowAll( bool bAll )                                { m_bShowAll = bAll; }
        void SetWinName( const OUString& rWinName )       { m_aWinName = rWinName; }
        void SetPosition( const Point& rPos )                    { m_aPosition=rPos; }
        void SetSize( const Size& rSize )                        { m_aSize = rSize; }
        void ShowAll( bool bAll )                                { m_bShowAll = bAll; }

        inline css::uno::Reference< css::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xTable; }
        inline css::uno::Reference< css::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xKeys; }
        inline css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xColumns; }
        css::uno::Reference< css::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xTable; }
        css::uno::Reference< css::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xKeys; }
        css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xColumns; }

        // OEventListenerAdapter
        virtual void _disposing( const css::lang::EventObject& _rSource ) override;
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 5d029fd..0ae8d9e 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -62,7 +62,7 @@ class ODbDataSourceAdministrationHelper;
        void        clearPassword();
        OUString    getConnectionURL() const;
        css::uno::Reference< css::beans::XPropertySet >   getCurrentDataSource();
        inline void endExecution() { m_bStopExecution = true; }
        void endExecution() { m_bStopExecution = true; }

        virtual const SfxItemSet* getOutputSet() const override;
        virtual SfxItemSet* getWriteOutputSet() override;
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index c2ee55a..dd1f0d4 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -74,11 +74,11 @@ namespace dbaui
        OUString GetKeyName() const { return m_pEdKeyName->GetText(); }

        void setCreateStyleAction();
        inline void disallowViews()
        void disallowViews()
        {
            m_pRB_View->Disable();
        }
        inline void disallowUseHeaderLine()
        void disallowUseHeaderLine()
        {
            m_bUseHeaderAllowed = false;
            m_pCB_UseHeaderLine->Disable();
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index bdfca8e..f9f9c61 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -122,8 +122,8 @@ namespace dbaui
        virtual ~OWizTypeSelect() override;
        virtual void dispose() override;

        inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; }
        inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; }
        void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; }
        void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; }
    };

    typedef VclPtr<OWizTypeSelect> (*TypeSelectionPageFactory)( vcl::Window*, SvStream& );
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index cb7353f..900e6d5 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -62,9 +62,9 @@ public:
    /// set a new text, leave the current prefix unchanged
    void     SetTextNoPrefix(const OUString& _rText);

    inline void      SaveValueNoPrefix()             { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
    void      SaveValueNoPrefix()             { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
    const OUString&  GetSavedValueNoPrefix() const   { return m_sSaveValueNoPrefix; }
    inline void      SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; }
    void      SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; }
};

}   // namespace dbaui
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 9f88e0f..bbf4908c 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -77,16 +77,16 @@ namespace dbaui
        typedef std::set< ItemID >::const_iterator    const_iterator;

    public:
        inline FeatureSet() { }
        FeatureSet() { }

        inline void put( const ItemID _id )         { m_aContent.insert( _id ); }
        inline bool has( const ItemID _id ) const   { return m_aContent.find( _id ) != m_aContent.end(); }
        void put( const ItemID _id )         { m_aContent.insert( _id ); }
        bool has( const ItemID _id ) const   { return m_aContent.find( _id ) != m_aContent.end(); }

        inline  bool    supportsAnySpecialSetting() const;
        inline  bool    supportsGeneratedValues() const;

        inline  const_iterator begin() const    { return m_aContent.begin(); }
        inline  const_iterator end() const      { return m_aContent.end(); }
        const_iterator begin() const    { return m_aContent.begin(); }
        const_iterator end() const      { return m_aContent.end(); }

    private:
        std::set< ItemID >    m_aContent;
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index b95418e..1890fcd 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -61,7 +61,7 @@ namespace dbaui

        void SelectNoHandlerCall( SvTreeListEntry* pEntry );

        inline void setConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection)
        void setConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection)
        {
             m_xConnection = _rxConnection;
        }
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index b935ca7..d1dd97d 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -64,7 +64,7 @@ namespace dbaui
        );
        ~OLinkedDocumentsAccess();

        inline bool isConnected() const { return m_xConnection.is(); }
        bool isConnected() const { return m_xConnection.is(); }

        css::uno::Reference< css::lang::XComponent>
                open(
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index b150b4b..e0c6b45 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -94,9 +94,9 @@ namespace dbaui
        css::uno::Reference< css::container::XNameAccess >
            getObjectContainer() const;

        inline  bool    editingView() const    { return m_nCommandType == css::sdb::CommandType::TABLE; }
        inline  bool    editingQuery() const   { return m_nCommandType == css::sdb::CommandType::QUERY; }
        inline  bool    editingCommand() const { return m_nCommandType == css::sdb::CommandType::COMMAND; }
        bool    editingView() const    { return m_nCommandType == css::sdb::CommandType::TABLE; }
        bool    editingQuery() const   { return m_nCommandType == css::sdb::CommandType::QUERY; }
        bool    editingCommand() const { return m_nCommandType == css::sdb::CommandType::COMMAND; }

        bool askForNewName( const css::uno::Reference< css::container::XNameAccess>& _xElements,
                            bool _bSaveAs);
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx
index 33f492f..ddf15b1 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx
@@ -36,10 +36,10 @@ namespace dbaui
        OQueryTableConnection& operator=(const OQueryTableConnection& rConn);
        bool operator==(const OQueryTableConnection& rCompare);

        inline OUString  GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); }
        OUString  GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); }

        inline bool     IsVisited() const               { return m_bVisited; }
        inline void     SetVisited(bool bVisited)   { m_bVisited = bVisited; }
        bool     IsVisited() const               { return m_bVisited; }
        void     SetVisited(bool bVisited)   { m_bVisited = bVisited; }

    };
}
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 8f46c54..6d590cf 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -69,8 +69,8 @@ namespace dbaui
        EJoinType       GetJoinType() const { return m_eJoinType; };
        void            SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; };

        inline void setNatural(bool _bNatural) { m_bNatural = _bNatural; }
        inline bool isNatural() const { return m_bNatural; }
        void setNatural(bool _bNatural) { m_bNatural = _bNatural; }
        bool isNatural() const { return m_bNatural; }
    };

}
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index b5de851..cfcbb79 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -40,7 +40,7 @@ namespace dbaui
        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID);
        virtual ~OQueryDesignFieldUndoAct() override;

        inline void SetColumnPosition(sal_uInt16 _nColumnPosition)
        void SetColumnPosition(sal_uInt16 _nColumnPosition)
        {
            m_nColumnPosition = _nColumnPosition;
            OSL_ENSURE(m_nColumnPosition != BROWSER_INVALIDID,"Column position was not set add the undo action!");
@@ -78,7 +78,7 @@ namespace dbaui
    public:
        explicit OTabFieldSizedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_SIZE_COLUMN), m_nNextWidth(0) { }

        inline void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; }
        void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; }

        virtual void Undo() override;
        virtual void Redo() override { Undo(); }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 6c66c83..8fa74e9 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -139,10 +139,10 @@ namespace dbaui

        /** Disables the generation of undo actions
        */
        inline void                 EnterUndoMode() { m_bInUndoMode = true; }
        void                 EnterUndoMode() { m_bInUndoMode = true; }
        /** Enables the generation of undo actions
        */
        inline void                 LeaveUndoMode() { m_bInUndoMode = false; }
        void                 LeaveUndoMode() { m_bInUndoMode = false; }

        /** GetCellText returns the text at the given position
            @param  _nRow
diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
index 9c4e2421..25dc9123 100644
--- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
+++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
@@ -34,10 +34,10 @@ namespace dbaui
        OTableFieldInfo();
        ~OTableFieldInfo();

        inline ETableFieldType  GetKeyType() const { return m_eFieldType; }
        inline void             SetKey(ETableFieldType bKey) { m_eFieldType = bKey; }
        inline sal_Int32        GetDataType() const { return m_eDataType; }
        inline void             SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; }
        ETableFieldType  GetKeyType() const { return m_eFieldType; }
        void             SetKey(ETableFieldType bKey) { m_eFieldType = bKey; }
        sal_Int32        GetDataType() const { return m_eDataType; }
        void             SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; }
    };
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 41c5183..c026b34 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -66,7 +66,7 @@ namespace dbaui
        virtual void cut() override;
        virtual void paste() override;

        inline OTableFieldControl*  getFieldControl() const { return m_pFieldControl; }
        OTableFieldControl*  getFieldControl() const { return m_pFieldControl; }
    };
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 2d2b0da..c2878e9 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -86,7 +86,7 @@ namespace dbaui
        virtual void cut() override;
        virtual void paste() override;

        inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; }
        OFieldDescGenWin* getGenPage() const { return m_pGenPage; }

    };
}
diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 4f29cda..365bff7 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -44,7 +44,7 @@ class MutexHolder
{
    mutable ::osl::Mutex m_mutex;
protected:
    inline ::osl::Mutex & getMutex() const { return m_mutex; }
    ::osl::Mutex & getMutex() const { return m_mutex; }
};


diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 155a2828..a7970b8 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -155,7 +155,7 @@ public:
    void stopProgress();
    void progressSection( const OUString &rText,
                          const uno::Reference< task::XAbortChannel > &xAbortChannel );
    inline void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; }
    void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; }

    // XCommandEnvironment
    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 2cabec5..5f5fb61 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -110,12 +110,12 @@ class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel :
    css::uno::Reference<css::task::XAbortChannel> m_xNext;

public:
    inline AbortChannel() : m_aborted( false ) {}
    inline static AbortChannel * get(
    AbortChannel() : m_aborted( false ) {}
    static AbortChannel * get(
        css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel )
        { return static_cast<AbortChannel *>(xAbortChannel.get()); }

    inline bool isAborted() const { return m_aborted; }
    bool isAborted() const { return m_aborted; }

    // XAbortChannel
    virtual void SAL_CALL sendAbort() override;
@@ -124,12 +124,12 @@ public:
    {
        const ::rtl::Reference<AbortChannel> m_abortChannel;
    public:
        inline Chain(
        Chain(
            ::rtl::Reference<AbortChannel> const & abortChannel,
            css::uno::Reference<css::task::XAbortChannel> const & xNext )
            : m_abortChannel( abortChannel )
            { if (m_abortChannel.is()) m_abortChannel->m_xNext = xNext; }
        inline ~Chain()
        ~Chain()
            { if (m_abortChannel.is()) m_abortChannel->m_xNext.clear(); }
    };
    friend class Chain;
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index dd12b59..c101224 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -120,7 +120,7 @@ protected:
    virtual void SAL_CALL disposing() override;

    virtual ~PackageManagerImpl() override;
    inline PackageManagerImpl(
    PackageManagerImpl(
        css::uno::Reference<css::uno::XComponentContext>
        const & xComponentContext, OUString const & context )
        : t_pm_helper( getMutex() ),
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index cfcc5ba4..0eda611 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -43,7 +43,7 @@ class InteractionContinuationImpl : public ::cppu::OWeakObject,
    bool * m_pselect;

public:
    inline InteractionContinuationImpl( Type const & type, bool * pselect )
    InteractionContinuationImpl( Type const & type, bool * pselect )
        : m_type( type ),
          m_pselect( pselect )
        { OSL_ASSERT(
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 1dd4742..20c7122 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -86,7 +86,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
            Reference<XCommandEnvironment> const & xCmdEnv ) override;

    public:
        inline PackageImpl(
        PackageImpl(
            ::rtl::Reference<PackageRegistryBackend> const & myBackend,
            OUString const & url, OUString const & name,
            Reference<deployment::XPackageTypeInfo> const & xPackageType,
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 4c256a3..2d180bb 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -63,7 +63,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
        bool isUrlTargetInExtension();

    public:
        inline ExecutablePackageImpl(
        ExecutablePackageImpl(
            ::rtl::Reference<PackageRegistryBackend> const & myBackend,
            OUString const & url, OUString const & name,
            Reference<deployment::XPackageTypeInfo> const & xPackageType,
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 5df23c8..a315c14 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -269,11 +269,11 @@ public:
    struct StrRevokingPackage : public ::dp_misc::StaticResourceString<
        StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {};

    inline css::uno::Reference<css::uno::XComponentContext> const &
    css::uno::Reference<css::uno::XComponentContext> const &
    getComponentContext() const { return m_xComponentContext; }

    inline OUString const & getCachePath() const { return m_cachePath; }
    inline bool transientMode() const { return m_cachePath.isEmpty(); }
    OUString const & getCachePath() const { return m_cachePath; }
    bool transientMode() const { return m_cachePath.isEmpty(); }

    const OUString& getContext() const {return m_context; }

diff --git a/dictionaries b/dictionaries
index 66a5dd1..d759f48 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
Subproject commit 66a5dd1c02f2f626fc28ba378b7ad7d5463c83b8
Subproject commit d759f48f50da7ecd05b045780079b54d339f36c6
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c047f51..5a6ba26 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -665,7 +665,7 @@ private:
    bool                IsForceAutoColor() const { return bForceAutoColor; }

    inline VirtualDevice*   GetVirtualDevice( const MapMode& rMapMode, DrawModeFlags nDrawMode );
    inline void             EraseVirtualDevice() { pVirtDev.disposeAndClear(); }
    void             EraseVirtualDevice() { pVirtDev.disposeAndClear(); }

    DECL_LINK( StatusTimerHdl, Timer *, void);
    DECL_LINK( IdleFormatHdl, Timer *, void);
@@ -987,7 +987,7 @@ public:

    sal_Int32           GetBigTextObjectStart() const                               { return nBigTextObjectStart; }

    inline EditEngine*  GetEditEnginePtr() const    { return pEditEngine; }
    EditEngine*  GetEditEnginePtr() const    { return pEditEngine; }

    void                StartOnlineSpellTimer()     { aOnlineSpellTimer.Start(); }
    void                StopOnlineSpellTimer()      { aOnlineSpellTimer.Stop(); }
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index e6deb82..53a45a4 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -131,13 +131,13 @@ namespace editeng
    public:
                void        DoDocumentConversion( );

        inline  bool        IsValid() const { return m_xConverter.is(); }
        bool        IsValid() const { return m_xConverter.is(); }

        inline LanguageType GetSourceLang() const   { return m_nSourceLang; }
        inline LanguageType GetTargetLang() const   { return m_nTargetLang; }
        inline const vcl::Font * GetTargetFont() const   { return m_pTargetFont; }
        inline sal_Int32    GetConvOptions() const  { return m_nConvOptions; }
        inline bool         IsInteractive() const   { return m_bIsInteractive; }
        LanguageType GetSourceLang() const   { return m_nSourceLang; }
        LanguageType GetTargetLang() const   { return m_nTargetLang; }
        const vcl::Font * GetTargetFont() const   { return m_pTargetFont; }
        sal_Int32    GetConvOptions() const  { return m_nConvOptions; }
        bool         IsInteractive() const   { return m_bIsInteractive; }

    protected:
        void    createDialog();
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 91b9669..10bcbe5 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -126,8 +126,8 @@ class SvxBoundArgs
        { if( nDiff ) NoteFarPoint_( nPx, nPyDiff, nDiff ); }
    long CalcMax( const Point& rPt1, const Point& rPt2, long nRange, long nFar );
    void CheckCut( const Point& rLst, const Point& rNxt );
    inline long A( const Point& rP ) const { return bRotate ? rP.Y() : rP.X(); }
    inline long B( const Point& rP ) const { return bRotate ? rP.X() : rP.Y(); }
    long A( const Point& rP ) const { return bRotate ? rP.Y() : rP.X(); }
    long B( const Point& rP ) const { return bRotate ? rP.X() : rP.Y(); }
public:
    SvxBoundArgs( TextRanger* pRanger, LongDqPtr pLong, const Range& rRange );
    void NotePoint( const long nA ) { NoteMargin( nA - nStart, nA + nEnd ); }
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 545a090..34903b9 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -87,30 +87,30 @@ namespace abp
        /// guesses a default for the table name, if no valid table is selected
        void implDefaultTableName();

        static inline bool needAdminInvokationPage( AddressSourceType _eType )
        static bool needAdminInvokationPage( AddressSourceType _eType )
        {
            return  ( AST_OTHER == _eType );
        }
        /// check if with the current settings, we would need to invoke he administration dialog for more details about the data source
        inline bool needAdminInvokationPage() const
        bool needAdminInvokationPage() const
        {
            return  needAdminInvokationPage( m_aSettings.eType );
        }

        static inline bool needManualFieldMapping( AddressSourceType _eType )
        static bool needManualFieldMapping( AddressSourceType _eType )
        {
            return  ( AST_OTHER == _eType ) || ( AST_KAB == _eType ) ||
                    ( AST_EVOLUTION == _eType ) || ( AST_EVOLUTION_GROUPWISE == _eType ) ||
                    ( AST_EVOLUTION_LDAP == _eType );
        }
        /// checks if we need a manual (user-guided) field mapping
        inline bool needManualFieldMapping() const
        bool needManualFieldMapping() const
        {
            return needManualFieldMapping( m_aSettings.eType );
        }

        /// determines whether the given address book type does provide one table only
        static inline bool needTableSelection( AddressSourceType _eType )
        static bool needTableSelection( AddressSourceType _eType )
        {
            return  ( AST_KAB != _eType );
        }
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 8b54c24..2187ffd 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -61,20 +61,20 @@ namespace logging
        bool    getEncoding(        OUString& _out_rEncoding ) const;
        bool    setEncoding( const  OUString& _rEncoding     );

        inline  rtl_TextEncoding
        rtl_TextEncoding
                getTextEncoding() const { return m_eEncoding; }

        const css::uno::Reference< css::logging::XLogFormatter >&
                getFormatter() const { return m_xFormatter; }
        inline  void
        void
                setFormatter( const css::uno::Reference< css::logging::XLogFormatter >& _rxFormatter )
                {
                    m_xFormatter = _rxFormatter;
                }

        inline  sal_Int32
        sal_Int32
                getLevel() const { return m_nLevel; }
        inline  void
        void
                setLevel( const sal_Int32 _nLevel )
                {
                    m_nLevel = _nLevel;
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 815ac667a..656d86b 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -75,7 +75,7 @@ namespace pcr
        {
            return m_xControl;
        }
        inline vcl::Window* getControlWindow() const
        vcl::Window* getControlWindow() const
        {
            return m_pControlWindow;
        }
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 0a79972..d4c4d820 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -68,7 +68,7 @@ namespace pcr
        public:
            explicit StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { }

            inline bool operator()( const OUString& _rCompare )
            bool operator()( const OUString& _rCompare )
            {
                return ( _rCompare == m_sReference );
            }
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index d4fdced..93faf7a 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -140,7 +140,7 @@ namespace pcr

    private:
        /// determines whether the instance is already disposed
        inline  bool impl_isDisposed() const { return m_pCollectedUIs.get() == nullptr; }
        bool impl_isDisposed() const { return m_pCollectedUIs.get() == nullptr; }

        /// throws an exception if the component is already disposed
                void impl_checkDisposed() const;
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 27b00b7..fb41f0e 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -162,7 +162,7 @@ namespace pcr
            @param  _out_rEvents
                Takes, the events currently associated with the introspectee
        */
        inline void impl_getComponentScriptEvents_nothrow(
        void impl_getComponentScriptEvents_nothrow(
                    std::vector< css::script::ScriptEventDescriptor >& _out_rEvents
                ) const
        {
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 381934a..5a1b0f7 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -75,7 +75,7 @@ namespace pcr
        virtual ~FieldLinkRow() override;
        virtual void dispose() override;

        inline void         SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
        void         SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; }

        enum LinkParticipant
        {
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 64b0e9f..5d4ad7c 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -218,7 +218,7 @@ namespace pcr
                the attributes of the property which should be reflected by a to-be-created
                <type scope="css::inspection">XPropertyControl</type>
        */
        inline static bool requiresReadOnlyControl( sal_Int16 _nPropertyAttributes )
        static bool requiresReadOnlyControl( sal_Int16 _nPropertyAttributes )
        {
            return ( _nPropertyAttributes & css::beans::PropertyAttribute::READONLY ) != 0;
        }
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 1d62e50..59415ab 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -72,10 +72,10 @@ namespace pcr
        using ::comphelper::OPropertyContainerHelper::getFastPropertyValue;

    public:
        inline  bool    hasHelpSection() const { return m_bHasHelpSection; }
        inline  bool    isReadOnly() const { return m_bIsReadOnly; }
        inline  sal_Int32   getMinHelpTextLines() const { return m_nMinHelpTextLines; }
        inline  sal_Int32   getMaxHelpTextLines() const { return m_nMaxHelpTextLines; }
        bool    hasHelpSection() const { return m_bHasHelpSection; }
        bool    isReadOnly() const { return m_bIsReadOnly; }
        sal_Int32   getMinHelpTextLines() const { return m_nMinHelpTextLines; }
        sal_Int32   getMaxHelpTextLines() const { return m_nMaxHelpTextLines; }

        css::uno::Reference< css::beans::XPropertySetInfo >
                            getPropertySetInfo();
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index f392508..05dada0 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -80,21 +80,21 @@ namespace pcr
        typedef css::uno::Sequence< ELEMENT >  UnoBase;

    public:
        inline StlSyntaxSequence() : UnoBase() { }
        explicit inline StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { }
        explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }
        StlSyntaxSequence() : UnoBase() { }
        explicit StlSyntaxSequence( const UnoBase& rSeq ) : UnoBase( rSeq ) { }
        explicit StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }

        typedef const ELEMENT* const_iterator;
        typedef       ELEMENT* iterator;

        inline const_iterator begin() const { return UnoBase::getConstArray(); }
        inline const_iterator end() const { return UnoBase::getConstArray() + UnoBase::getLength(); }
        const_iterator begin() const { return UnoBase::getConstArray(); }
        const_iterator end() const { return UnoBase::getConstArray() + UnoBase::getLength(); }

        inline iterator begin() { return UnoBase::getArray(); }
        inline iterator end() { return UnoBase::getArray() + UnoBase::getLength(); }
        iterator begin() { return UnoBase::getArray(); }
        iterator end() { return UnoBase::getArray() + UnoBase::getLength(); }

        inline sal_Int32 size() const { return UnoBase::getLength(); }
        inline bool empty() const { return UnoBase::getLength() == 0; }
        sal_Int32 size() const { return UnoBase::getLength(); }
        bool empty() const { return UnoBase::getLength() == 0; }
    };


diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index f80d19e..d74d3e9 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -268,7 +268,7 @@ namespace pcr
        /** determines whether the given property is an actuating property, that is, at least one
            handler expressed interest in changes to this property's value.
        */
        inline bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const
        bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const
        {
            return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() );
        }
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 0a39548..88c1cae 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -254,7 +254,7 @@ namespace pcr
            @see getSupportedProperties
            @see doDescribeSupportedProperties
        */
        inline bool impl_isSupportedProperty_nothrow( PropertyId _nPropId ) const
        bool impl_isSupportedProperty_nothrow( PropertyId _nPropId ) const
        {
            return impl_getPropertyFromId_nothrow( _nPropId ) != nullptr;
        }
@@ -277,7 +277,7 @@ namespace pcr
        /** returns the value of the ContextDocument property in the ComponentContext which was used to create
            this handler.
        */
        inline css::uno::Reference< css::frame::XModel >
        css::uno::Reference< css::frame::XModel >
                    impl_getContextDocument_nothrow() const
        {
            return css::uno::Reference< css::frame::XModel >(
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index 8bd2f51..cddedaa 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -50,7 +50,7 @@ namespace pcr
            const css::uno::Reference< css::uno::XInterface >& _rxTranslatedEventSource
        );

        inline const css::uno::Reference< css::beans::XPropertyChangeListener >&
        const css::uno::Reference< css::beans::XPropertyChangeListener >&
            getDelegator() const { return m_xDelegator; }

    protected:
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 02b9632..1d09030 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -82,11 +82,11 @@ namespace pcr
        /** determines whether the SQL Command designer is currently active, i.e.
            if there currently exists a frame which allows the user entering the SQL command
        */
        inline bool isActive() const { return m_xDesigner.is(); }
        bool isActive() const { return m_xDesigner.is(); }

        /** returns the property adapter used by the instance
        */
        inline const ::rtl::Reference< ISQLCommandAdapter >& getPropertyAdapter() const { return m_xObjectAdapter; }
        const ::rtl::Reference< ISQLCommandAdapter >& getPropertyAdapter() const { return m_xObjectAdapter; }

        /** raises the designer window to top
            @precond
diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx
index b5f15b6..d85a693 100644
--- a/extensions/source/propctrlr/unourl.hxx
+++ b/extensions/source/propctrlr/unourl.hxx
@@ -41,7 +41,7 @@ namespace pcr
            const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB
        );

        inline operator const css::util::URL& () const { return m_aURL; }
        operator const css::util::URL& () const { return m_aURL; }
    };


diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index f6bdffd..2dde63d 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -66,7 +66,7 @@ namespace pcr
        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
        virtual css::uno::Type SAL_CALL getValueType() override;

        inline void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier )
        void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier )
        {
            getTypedControlWindow()->SetFormatSupplier( _pSupplier );
        }
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index 76bd10f..d6470a1 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -54,7 +54,7 @@ namespace pcr
        );

        /// retrieves the underlying UNO component
        inline const css::uno::Reference< css::xsd::XDataType >&
        const css::uno::Reference< css::xsd::XDataType >&
                getUnoDataType() const { return m_xDataType; }

        /// classifies the data typ
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 0aa164e..0538f40 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -243,7 +243,7 @@ protected:
private:

    /* Used to avoid dialup login windows (on platforms we know how to double this) */
    static inline bool hasInternetConnection()
    static bool hasInternetConnection()
    {
#ifdef _WIN32
        return WNT_hasInternetConnection();
@@ -253,7 +253,7 @@ private:
    }

    /* Creates a new instance of UpdateInformationProvider and returns this instance */
    inline uno::Reference<deployment::XUpdateInformationProvider> createProvider()
    uno::Reference<deployment::XUpdateInformationProvider> createProvider()
    {
        osl::MutexGuard aGuard(m_aMutex);
        m_xProvider = deployment::UpdateInformationProvider::create(m_xContext);
@@ -261,11 +261,11 @@ private:
    };

    /* Returns the remembered instance of UpdateInformationProvider if any */
    inline uno::Reference<deployment::XUpdateInformationProvider> getProvider()
    uno::Reference<deployment::XUpdateInformationProvider> getProvider()
        { osl::MutexGuard aGuard(m_aMutex); return m_xProvider; };

    /* Releases the remembered instance of UpdateInformationProvider if any */
    inline void clearProvider()
    void clearProvider()
        { osl::MutexGuard aGuard(m_aMutex); m_xProvider.clear(); };

    osl::Mutex      m_aMutex;
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index e7e9c4f..af0bd07 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -61,7 +61,7 @@ class UpdateCheck :
    virtual ~UpdateCheck() override;

public:
    inline SAL_CALL operator rtl::Reference< UpdateCheckConfigListener > ()
    SAL_CALL operator rtl::Reference< UpdateCheckConfigListener > ()
        { return static_cast< UpdateCheckConfigListener * > (this); }

    void initialize(const css::uno::Sequence<css::beans::NamedValue>& rValues,
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index d8d500f..35258ff 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -179,7 +179,7 @@ public:
    bool                    showOverwriteWarning() const;

    // Allows runtime exceptions to be thrown by const methods
    inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
    SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
        { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); };

    // XActionListener
diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index f2b8b7a..6fa9066 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -250,10 +250,10 @@ struct CountryEntryPred_Country
{
    CountryId                   meCountry;

    inline explicit             CountryEntryPred_Country( CountryId eCountry ) :
    explicit             CountryEntryPred_Country( CountryId eCountry ) :
                                    meCountry( eCountry ) {}

    inline bool                 operator()( const CountryEntry& rCmp ) const
    bool                 operator()( const CountryEntry& rCmp ) const
                                    { return rCmp.meCountry == meCountry; }
};

@@ -265,7 +265,7 @@ struct CountryEntryPred_Language
{
    LanguageType                meLanguage;

    inline explicit             CountryEntryPred_Language( LanguageType eLanguage ) :
    explicit             CountryEntryPred_Language( LanguageType eLanguage ) :
                                    meLanguage( eLanguage ) {}

    inline bool                 operator()( const CountryEntry& rCmp ) const;
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index aea4379..35b2faa 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -103,8 +103,8 @@ public:

    bool operator==( const OGroupComp& rComp ) const;

    inline const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; }
    inline const css::uno::Reference< css::awt::XControlModel>&   GetControlModel() const { return m_xControlModel; }
    const css::uno::Reference< css::beans::XPropertySet>& GetComponent() const { return m_xComponent; }
    const css::uno::Reference< css::awt::XControlModel>&   GetControlModel() const { return m_xControlModel; }

    sal_Int32   GetPos() const { return m_nPos; }
    sal_Int16   GetTabIndex() const { return m_nTabIndex; }
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 724d004..e7e297f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -59,7 +59,7 @@ protected:
    // UNO Anbindung
    virtual css::uno::Sequence< css::uno::Type> _getTypes() override;

    inline ImageProducer* GetImageProducer() { return m_xImageProducer.get(); }
    ImageProducer* GetImageProducer() { return m_xImageProducer.get(); }

public:
    DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel );
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 539da5b..15446e9 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -78,7 +78,7 @@ namespace frm

        DECL_LINK( DownloadDoneLink, void*, void );

        inline ImageProducer* GetImageProducer() { return m_xProducer.get(); }
        ImageProducer* GetImageProducer() { return m_xProducer.get(); }

        void StartProduction();
        void SetURL(const OUString& rURL);
@@ -86,8 +86,8 @@ namespace frm
        void DownloadDone();

        css::uno::Sequence< css::uno::Type> _getTypes() override;
        inline bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
        inline void     setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
        bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
        void     setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }

    public:
        OClickableImageBaseModel(
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index 3ad407c..b8e3e65 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -65,15 +65,15 @@ namespace frm
        virtual ~OEntryListHelper( );

        /// returns the current string item list
        inline const std::vector< OUString >&
        const std::vector< OUString >&
                    getStringItemList() const { return m_aStringItems; }

        /// returns the current typed item list
        inline const css::uno::Sequence< css::uno::Any >&
        const css::uno::Sequence< css::uno::Any >&
                    getTypedItemList() const { return m_aTypedItems; }

        /// determines whether we actually have an external list source
        inline bool hasExternalListSource( ) const { return m_xListSource.is(); }
        bool hasExternalListSource( ) const { return m_xListSource.is(); }

        /** handling the XEventListener::disposing call for the case where
            our list source is being disposed
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 9009c30..9259abf 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -117,7 +117,7 @@ namespace frm
        inline void acquire();
        inline void release();

        inline OControlModel& getModel() const { return m_rModel; };
        OControlModel& getModel() const { return m_rModel; };

        /** adds a property change notification, which is to be fired when the last lock on the model
            (in the current thread) is released.
@@ -496,7 +496,7 @@ public:
                            LockAccess
                        );

    inline ::osl::Mutex&
    ::osl::Mutex&
                        getInstanceMutex() { return m_aMutex; }
};

@@ -630,10 +630,10 @@ protected:
                                        m_xColumn;

protected:
    inline sal_Int32            getValuePropertyAggHandle( ) const  { return m_nValuePropertyAggregateHandle; }
    inline const OUString&      getControlSource( ) const           { return m_aControlSource; }
    inline bool                 isRequired() const                  { return m_bRequired; }
    inline bool                 isLoaded() const                    { return m_bLoaded; }
    sal_Int32            getValuePropertyAggHandle( ) const  { return m_nValuePropertyAggregateHandle; }
    const OUString&      getControlSource( ) const           { return m_aControlSource; }
    bool                 isRequired() const                  { return m_bRequired; }
    bool                 isLoaded() const                    { return m_bLoaded; }

protected:

@@ -939,11 +939,11 @@ protected:
    void    impl_setField_noNotify(
                const css::uno::Reference< css::beans::XPropertySet>& _rxField
            );
    inline bool hasField() const
    bool hasField() const
    {
        return m_xField.is();
    }
    inline sal_Int32 getFieldType() const
    sal_Int32 getFieldType() const
    {
        return m_nFieldType;
    }
@@ -954,7 +954,7 @@ protected:
    ) const override;

public:
    inline const css::uno::Reference< css::beans::XPropertySet>& getField() const
    const css::uno::Reference< css::beans::XPropertySet>& getField() const
    {
        return m_xField;
    }
@@ -1046,10 +1046,10 @@ protected:
                _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override;

    /// checks whether we currently have an external value binding in place
    inline  bool    hasExternalValueBinding() const { return m_xExternalBinding.is(); }
    bool    hasExternalValueBinding() const { return m_xExternalBinding.is(); }

    // checks whether we currently have an external validator
    inline  bool    hasValidator() const { return m_xValidator.is(); }
    bool    hasValidator() const { return m_xValidator.is(); }

    /** transfers the very current value of the db column we're bound to the control
        @precond
@@ -1133,7 +1133,7 @@ private:
    */
    void        doFormListening( const bool _bStart );

    inline bool isFormListening() const { return m_bFormListening; }
    bool isFormListening() const { return m_bFormListening; }

    /** determines the new value of m_xAmbientForm
    */
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index e46443d..7e67fa0 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -39,20 +39,20 @@ namespace frm
        ::cppu::OWeakObject&    m_rInstigator;

    protected:
        inline EventListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
        EventListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
            :EventListeners_Base( _rMutex )
            ,m_rInstigator( _rInstigator )
        {
        }

    public:
        inline bool notify()
        bool notify()
        {
            css::lang::EventObject aEvent( m_rInstigator );
            return EventListeners_Base::notify( aEvent );
        }

        inline void disposing()
        void disposing()
        {
            css::lang::EventObject aEvent( m_rInstigator );
            EventListeners_Base::disposing( aEvent );
@@ -75,7 +75,7 @@ namespace frm
        NotificationType        m_eCurrentNotificationType;

    public:
        inline ResetListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
        ResetListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
            :ResetListeners_Base( _rInstigator, _rMutex )
            ,m_eCurrentNotificationType( eApproval )
        {
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index 423f88b..29ca815 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -48,10 +48,10 @@ namespace frm
        const EditView*   getEditView() const { return m_pEditView; }

    protected:
        inline const css::util::URL&       getFeatureURL() const { return m_aFeatureURL; }
        inline       ::comphelper::OInterfaceContainerHelper2& getStatusListeners() { return m_aStatusListeners; }
        inline       bool                               isDisposed() const { return m_bDisposed; }
        inline       void                               checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); }
        const css::util::URL&       getFeatureURL() const { return m_aFeatureURL; }
        ::comphelper::OInterfaceContainerHelper2& getStatusListeners() { return m_aStatusListeners; }
        bool                               isDisposed() const { return m_bDisposed; }
        void                               checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); }

    protected:
        ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL&  _rURL );
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index fe63d01..a6ce406 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -55,7 +55,7 @@ namespace frm
        void registerEngineStatusListener( IEngineStatusListener* _pListener );
        void revokeEngineStatusListener( IEngineStatusListener* _pListener );

        inline SfxItemPool* getPool() { return m_pEnginePool; }
        SfxItemPool* getPool() { return m_pEnginePool; }

    protected:
        /** constructs a new RichTextEngine. The instances takes the ownership of the given SfxItemPool
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 4f3a947..c61c473 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -65,9 +65,9 @@ namespace frm

    public:
        struct GrantAccess { friend class RichTextControl; private: GrantAccess() { } };
        inline EditView*        getView( const GrantAccess& ) const     { return m_pView; }
        inline RichTextEngine*  getEngine( const GrantAccess& ) const   { return m_pEngine; }
        inline vcl::Window*          getViewport( const GrantAccess& ) const { return m_pViewport; }
        EditView*        getView( const GrantAccess& ) const     { return m_pView; }
        RichTextEngine*  getEngine( const GrantAccess& ) const   { return m_pEngine; }
        vcl::Window*          getViewport( const GrantAccess& ) const { return m_pViewport; }

    public:
        RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine,
@@ -166,8 +166,8 @@ namespace frm
        /// ensures that our "automatic line break" setting matches the current WinBits of the window
        void    ensureLineBreakSetting();

        inline  bool    hasVScrollBar( ) const { return m_pVScroll != nullptr; }
        inline  bool    hasHScrollBar( ) const { return m_pHScroll != nullptr; }
        bool    hasVScrollBar( ) const { return m_pVScroll != nullptr; }
        bool    hasHScrollBar( ) const { return m_pHScroll != nullptr; }

        // IEngineStatusListener overridables
        virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) override;
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index ec488e6..4752092 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -37,7 +37,7 @@ namespace frm

        void    setView( EditView& _rView );

        inline void    setAttributeInvalidationHandler( const Link<LinkParamNone*,void>& _rHandler ) { m_aInvalidationHandler = _rHandler; }
        void    setAttributeInvalidationHandler( const Link<LinkParamNone*,void>& _rHandler ) { m_aInvalidationHandler = _rHandler; }

        void    SetHideInactiveSelection( bool _bHide );
        bool    GetHideInactiveSelection() const { return m_bHideInactiveSelection; }
@@ -52,7 +52,7 @@ namespace frm
        virtual void        MouseButtonUp( const MouseEvent& _rMEvt ) override;

    private:
        inline void implInvalidateAttributes() const
        void implInvalidateAttributes() const
        {
            m_aInvalidationHandler.Call( nullptr );
        }
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 29b2e04..0f09ba2 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -80,7 +80,7 @@ namespace frm

        struct MethodAccess { friend class MethodGuard; private: MethodAccess() { } };

        inline void enterMethod( MethodAccess ) const
        void enterMethod( MethodAccess ) const
        {
            m_aMutex.acquire();
            impl_checkDisposed_throw();
@@ -89,7 +89,7 @@ namespace frm
        #endif
        }

        inline void leaveMethod( MethodAccess ) const
        void leaveMethod( MethodAccess ) const
        {
            m_aMutex.release();
        #ifdef DBG_UTIL
@@ -228,7 +228,7 @@ namespace frm
                    impl_getCurrentControlModel_throw() const;

        /// determines if we have a valid cursor
        inline  bool    impl_hasCursor_nothrow() const { return m_xCursorProperties.is(); }
        bool    impl_hasCursor_nothrow() const { return m_xCursorProperties.is(); }

        /** determines the model position from a grid control column's view position

@@ -349,12 +349,12 @@ namespace frm
                m_rOwner.enterMethod( FormOperations::MethodAccess() );
            }

            inline ~MethodGuard()
            ~MethodGuard()
            {
                clear();
            }

            inline void clear()
            void clear()
            {
                if ( !m_bCleared )
                    m_rOwner.leaveMethod( FormOperations::MethodAccess() );
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 5adae53..b8fb4f6 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -95,7 +95,7 @@ namespace frm

        /** retrieves the current image size
        */
        inline ImageSize    GetImageSize( ) const { return m_eImageSize; }
        ImageSize    GetImageSize( ) const { return m_eImageSize; }

        /** sets the size of the images
        */
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index db20dfb..7c84694e 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -207,7 +207,7 @@ namespace xforms
    {
    protected:
        typedef     VALUE_TYPE  ValueType;
        inline const css::uno::Type&
        const css::uno::Type&
            getCppuType() const { return cppu::UnoType<ValueType>::get(); }

    protected:
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index a02a6a7..04dfa53 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -269,14 +269,14 @@ public:
            one previously registered via <member>registerProperty</member>.
        @see registerProperty
    */
    inline void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
    void getCurrentPropertyValueByHandle( sal_Int32 nHandle, css::uno::Any& /* [out] */ rValue, const NotifierAccess& ) const
    {
        getFastPropertyValue( rValue, nHandle );
    }

    /** notifies a change in a given property to all interested listeners
    */
    inline void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
    void notifyPropertyChange( sal_Int32 nHandle, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue, const NotifierAccess& ) const
    {
        const_cast< PropertySetBase* >( this )->firePropertyChange( nHandle, rNewValue, rOldValue );
    }
@@ -325,13 +325,13 @@ public:
            the handle of the property which is going to be changed. Must be a valid property
            handle for the given <arg>rPropertySet</arg>
    */
    inline PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
    PropertyChangeNotifier( const PropertySetBase& rPropertySet, sal_Int32 nHandle )
        :m_rPropertySet( rPropertySet )
        ,m_nHandle( nHandle )
    {
        m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, m_aOldValue, PropertySetBase::NotifierAccess() );
    }
    inline ~PropertyChangeNotifier()
    ~PropertyChangeNotifier()
    {
        css::uno::Any aNewValue;
        m_rPropertySet.getCurrentPropertyValueByHandle( m_nHandle, aNewValue, PropertySetBase::NotifierAccess() );
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index c564c18..cdf6369 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -88,33 +88,33 @@ public:

    // inline functions

    inline NSView* getUserPane() {
    NSView* getUserPane() {
        if (!m_bIsUserPaneLaidOut) {
            createUserPane();
        }
        return m_pUserPane;
    }

    inline bool    getVisibility(ToggleType tToggle) {
    bool    getVisibility(ToggleType tToggle) {
        return m_bToggleVisibility[tToggle];
    }

    inline void    setFilterControlNeeded(bool bNeeded) {
    void    setFilterControlNeeded(bool bNeeded) {
        m_bIsFilterControlNeeded = bNeeded;
        if (bNeeded) {
            m_bUserPaneNeeded = true;
        }
    }

    inline void    setFilterHelper(FilterHelper* pFilterHelper) {
    void    setFilterHelper(FilterHelper* pFilterHelper) {
        m_pFilterHelper = pFilterHelper;
    }

    inline void    setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) {
    void    setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) {
        m_pDelegate = pDelegate;
    }

    inline bool    isAutoExtensionEnabled() {
    bool    isAutoExtensionEnabled() {
        return ([((NSButton*) m_pToggles[AUTOEXTENSION]) state] == NSOnState);
    }

diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index a4ffa68..22d7a7d 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -129,11 +129,11 @@ public:
   void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
   void SAL_CALL dialogSizeChanged( );

   inline AquaFilePickerDelegate * getDelegate() {
   AquaFilePickerDelegate * getDelegate() {
       return m_pDelegate;
   }

   inline OUString const & getSaveFileName() {
   OUString const & getSaveFileName() {
       return m_sSaveFileName;
   }

diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index fa0c8b9..acfa2a8 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -47,9 +47,9 @@ public:
    int run();
    int runandwaitforresult();

    inline OUString const & getDisplayDirectory() { return m_sDisplayDirectory; }
    OUString const & getDisplayDirectory() { return m_sDisplayDirectory; }

    inline ControlHelper* getControlHelper() const {
    ControlHelper* getControlHelper() const {
        return m_pControlHelper;
    }

diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 5212080..81ecad0 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -77,10 +77,10 @@ namespace svt
        OUString     m_aDisplayDirectory;

    protected:
        inline  SvtFileDialog_Base*  getDialog() { return m_pDlg; }
        SvtFileDialog_Base*  getDialog() { return m_pDlg; }

        inline const    ::cppu::OBroadcastHelper&   GetBroadcastHelper() const  { return OCommonPicker_Base::rBHelper; }
        inline          ::cppu::OBroadcastHelper&   GetBroadcastHelper()        { return OCommonPicker_Base::rBHelper; }
        const    ::cppu::OBroadcastHelper&   GetBroadcastHelper() const  { return OCommonPicker_Base::rBHelper; }
        ::cppu::OBroadcastHelper&   GetBroadcastHelper()        { return OCommonPicker_Base::rBHelper; }

    public:
        OCommonPicker();
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index bdd2e43..0c37ac8 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -113,25 +113,25 @@ namespace svt

            @seealso State
        */
        inline  State       getState( ) const { return m_eState; }
        State       getState( ) const { return m_eState; }

        /** checks if the content is valid
            <p>Note that "not (is valid)" is not the same as "is invalid"</p>
        */
        inline  bool    isValid( ) const { return VALID == getState(); }
        bool    isValid( ) const { return VALID == getState(); }

        /** checks if the content is valid
            <p>Note that "not (is invalid)" is not the same as "is valid"</p>
        */
        inline  bool    isInvalid( ) const { return INVALID == getState(); }
        bool    isInvalid( ) const { return INVALID == getState(); }

        /** checks if the content is bound
        */
        inline  bool    isBound( ) const { return NOT_BOUND != getState(); }
        bool    isBound( ) const { return NOT_BOUND != getState(); }

        /** returns the URL of the content
        */
        inline OUString  getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }
        OUString  getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; }

        /** (re)creates the content for the given URL

@@ -175,19 +175,19 @@ namespace svt
            @postcond
                the content is not in the state UNKNOWN
        */
        inline  bool    isFolder( const OUString& _rURL )
        bool    isFolder( const OUString& _rURL )
        {
            return implIs( _rURL, Folder );
        }

        /** checks if the content is existent (it is if and only if it is a document or a folder)
        */
        inline  bool    is( const OUString& _rURL )
        bool    is( const OUString& _rURL )
        {
            return  implIs( _rURL, Folder ) || implIs( _rURL, Document );
        }

        inline  bool    isFolder( )     { return isFolder( getURL() ); }
        bool    isFolder( )     { return isFolder( getURL() ); }
    };


diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index fe49631..8639ea7 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -87,7 +87,7 @@ private:
    VclPtr<PopupMenu>          m_pMenu;

protected:
    inline        SvtFileDialog*  GetDialogParent()       { return m_pDlg; }
    SvtFileDialog*  GetDialogParent()       { return m_pDlg; }

    virtual void    FillURLMenu( PopupMenu* _pMenu ) = 0;

@@ -179,11 +179,11 @@ public:
                            ~SvtExpFileDlg_Impl();


    inline void             SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
    inline const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
    void             SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
    const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
    void                    SetStandardDir( const OUString& _rDir );
    inline const OUString&  GetStandardDir() const          { return _aStdDir; }
    inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( false ); }
    const OUString&  GetStandardDir() const          { return _aStdDir; }
    void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( false ); }


    // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 0c04660..b09ba72 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -47,7 +47,7 @@ class Gate
            @short      ctor
            @descr      These initialize the object right as an open gate.
        *//*-*****************************************************************************************************/
        inline Gate()
        Gate()
            :   m_bClosed   ( false )
        {
            open();
@@ -59,7 +59,7 @@ class Gate
                        blocked threads can running ... but I don't know
                        if it's right - we are destroyed yet!?
        *//*-*****************************************************************************************************/
        inline ~Gate()
        ~Gate()
        {
            open();
        }
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 033f61b..2c4366c 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -27,13 +27,13 @@ namespace framework{
class TransactionGuard
{
    public:
        inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
        TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
            : m_pManager( &rManager )
        {
            m_pManager->registerTransaction( eMode );
        }

        inline ~TransactionGuard()
        ~TransactionGuard()
        {
            m_pManager->unregisterTransaction();
        }
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 0cd54b7..a151573 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -175,7 +175,7 @@ private:
                                                        OUStringHash >
    {
        public:
            inline void free()
            void free()
            {
                UrlToDispatchMap().swap( *this );// get rid of reserved capacity
            }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index ac69abf..446f06b 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -150,7 +150,7 @@ class LiblangtagDataRef
public:
    LiblangtagDataRef();
    ~LiblangtagDataRef();
    inline void init()
    void init()
    {
        if (!mbInitialized)
            setup();
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 00e24be..31f7c95 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -93,12 +93,12 @@ protected:

public:
    LocaleNode (const OUString& name, const Reference< XAttributeList > & attr);
    inline void setValue(const OUString &oValue) { aValue += oValue; };
    inline const OUString& getName() const { return aName; };
    inline const OUString& getValue() const { return aValue; };
    inline const Attr& getAttr() const { return aAttribs; };
    inline sal_Int32 getNumberOfChildren () const { return nChildren; };
    inline  LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx] ; };
    void setValue(const OUString &oValue) { aValue += oValue; };
    const OUString& getName() const { return aName; };
    const OUString& getValue() const { return aValue; };
    const Attr& getAttr() const { return aAttribs; };
    sal_Int32 getNumberOfChildren () const { return nChildren; };
    LocaleNode * getChildAt (sal_Int32 idx) const { return children[idx] ; };
    const LocaleNode * findNode ( const sal_Char *name) const;
    void print () const;
    void printR () const;
@@ -130,7 +130,7 @@ public:

class LCInfoNode : public LocaleNode {
public:
    inline LCInfoNode (const OUString& name,
    LCInfoNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };
    virtual void generateCode (const OFileWriter &of) const override;
};
@@ -138,7 +138,7 @@ public:

class LCCTYPENode : public LocaleNode {
public:
    inline LCCTYPENode (const OUString& name,
    LCCTYPENode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -148,7 +148,7 @@ class LCFormatNode : public LocaleNode {
    static sal_Int16 mnSection;
    static sal_Int16 mnFormats;
public:
    inline LCFormatNode (const OUString& name,
    LCFormatNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -156,7 +156,7 @@ public:

class LCCollationNode : public LocaleNode {
public:
    inline LCCollationNode (const OUString& name,
    LCCollationNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -164,7 +164,7 @@ public:

class LCIndexNode : public LocaleNode {
public:
    inline LCIndexNode (const OUString& name,
    LCIndexNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -172,7 +172,7 @@ public:

class LCSearchNode : public LocaleNode {
public:
    inline LCSearchNode (const OUString& name,
    LCSearchNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -180,7 +180,7 @@ public:

class LCCalendarNode : public LocaleNode {
public:
    inline LCCalendarNode (const OUString& name,
    LCCalendarNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -188,7 +188,7 @@ public:

class LCCurrencyNode : public LocaleNode {
public:
    inline LCCurrencyNode (const OUString& name,
    LCCurrencyNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -196,7 +196,7 @@ public:

class LCTransliterationNode : public LocaleNode {
public:
    inline LCTransliterationNode (const OUString& name,
    LCTransliterationNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -204,7 +204,7 @@ public:

class LCMiscNode : public LocaleNode {
public:
    inline LCMiscNode (const OUString& name,
    LCMiscNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -212,7 +212,7 @@ public:

class LCNumberingLevelNode : public LocaleNode {
public:
    inline LCNumberingLevelNode (const OUString& name,
    LCNumberingLevelNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
@@ -220,7 +220,7 @@ public:

class LCOutlineNumberingLevelNode : public LocaleNode {
public:
    inline LCOutlineNumberingLevelNode (const OUString& name,
    LCOutlineNumberingLevelNode (const OUString& name,
                const Reference< XAttributeList > & attr) : LocaleNode (name, attr) { ; };

    virtual void generateCode (const OFileWriter &of) const override;
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index e469a6a..daf8778 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -181,7 +181,7 @@ public:
    void CalcLPQR( int nOtherX, int nShorterY, int nLongerZ,
                    bool bRelaxed );

    inline int GetLimit() const     { return nLimit; }
    int GetLimit() const     { return nLimit; }

    // Calculate current balance, keep this inline for performance reasons!
    // c == cpPattern[jj] == cString[ii]
diff --git a/idlc/inc/astscope.hxx b/idlc/inc/astscope.hxx
index 7a4e475..e241f49 100644
--- a/idlc/inc/astscope.hxx
+++ b/idlc/inc/astscope.hxx
@@ -57,7 +57,7 @@ public:
    AstDeclaration* lookupForAdd(AstDeclaration* pDecl);

protected:
    inline AstDeclaration const * getLast() const
    AstDeclaration const * getLast() const
    { return m_declarations.back(); }

private:
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 4855e09..90127f2 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 06f026f..8d9b608 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 6e3d53b..0a5f595 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 af2dc29..ba68c74 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 d22bc1e..15a792b 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 23c5527..041314e 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 c1203a3..d18ad49 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 504afb9..7163817 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 f512b42..69c5647 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 ac6acfa..75f43a9 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 e4df46d..4439dbf 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 ad040d1..22b98c6 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 cb850aa..9b19bf2 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 2123484..dcca91d 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 bf3c5d8..465d3e2 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 d31ae21..270601af 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 87e6717..d0fd28d 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 0fc4e58..273153c 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 93b7ec2..dfde6ca 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 4d9737c..140d632 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 7330a71..a7c3e73 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 cfce73d..3fc9ba1 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 d4ef414..f2a2ca1 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 b16f8ed..ead3b9b 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 4999ded..41df1c6 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 7a101df..49eebb9 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 a801a1f..4337a02 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 442d69d..4db670e 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 570a17e..3d930488 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 4670ab5..9e6970d 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 a9bcc27..4070812 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 cf10806..9158c8e 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 45ad3f0..ab55d4f 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 7d499c1..fabcf4d 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 ec55cf0..d914bc4 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 c43c570..e7f6c9c 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 4804151..3534f8a 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 6743420..34fb477 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 b5e0650..b3d1a26 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 1fe66f7..5e583aa 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 e8cf7ad..1ae3a95 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 3690c9c..ee4a9b4 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 0e8600c..89b3035 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 730e631..78cd2b9 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 864dd3a..28535e8 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 e6de21c..a8dca83 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 3daa656b..0049cb8 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 b1f2a50..31a91b4 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 e90ea3c..912f908 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 0bc22a4..cddd795 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 b633c44..03754f3 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 d57cd2b..1afdd86 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 6e56e67..df50c19 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 e2e389c..2a0514d 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 2af8a54..04a04ff 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 5704b35..06b47f6 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 4cdd649..fe034a0 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 a63d4a1..984bd389d 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 daa1faa..7f53bcb 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 c87aa57..6da13c4 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 2ab87f2..95e86c3 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 32761e4..3c05390 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 82dc4a6..7223c2b 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 d1a38a0..4977b11 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 d68282d..55bf50a 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 13f4083..c786596 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 6bf4d42..b09654d 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 0f59421..fe9d92a 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 427950d..1e8585a 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 552f780..ac021bc 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 2d7f2f4..47233b7 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 7cc444c..c1b6b36 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 a79de4b..00e1469 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 b68c288..ebb6ab4 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 b37c254..3a46267 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 e246bb5..1a384c2 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 a32657c..d5eca73 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 a3a1823..e2ae3e8 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 856f2d8..28a9e09 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 084fcb2..eea64a7 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; }
    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; }

    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;}
    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 75d600a..2c5c6ff 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 3c5109b..fe7a336 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 fda14d9..fb6a836 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 4e6f7d9..b5faa482 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 f0bb668..8998056 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 26926b34..19aac0e 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 674f5ba..a558fbd 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 a786e29..20cb729 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 788ed50..3dc6e74 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 82221b6b..2c8e21f 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 1dd0947..5d40fcb 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 23b85d4..17957ff 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 869c4ef..80dcf374 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 d3df41f..f0702c6 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 eaa1169..1dbd1e8 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 fbffc6c..1d5d9ea 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 d219556..2459c25 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 7a8ff29..6e7ca4a 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 531cced..5a2f1d3 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 5ea9950..f7c993d 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 002ee4d..57136bf 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 f9ab53a..3c65b94 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 b708244..9fce5d6 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 58371f1..753ef8e 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 2bd6585..5d7933d 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 9ba7728..e6e5bc45 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 65b12a9..39e326b 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 1db3616..c3b73c8 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 4b00255..df18b57 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 bc35ba7..c1bfff7 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 952e53a..042a1df 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 6c2392f..4708ec0 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 e058724..4c1ce0e 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, &macro.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( &macro.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 ef00302..14b8c8c 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 740c581..d1d8d9e 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 effe116..3e29451 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 5eeb857..e8f624a 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 8f5d044..3787698 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 a313307..32ce9ca 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 4c8e373..50f3be6 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 c153533..bb2f31b 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 46b00ac..e21797c 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 7b61a29..9cf827f 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 60c0b87..25c3155 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 1e4a2c8..d85b681 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 bea1e06..216fa6f 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 039a9e5..28159ec 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 0633bf2..a379a11 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 ceca0fd..339c803 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 9a42e24..cf1ca2a 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 c130257..8e0473d 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 012afd1..fc25856 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 767bd7f..e3b7d58 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 54571a6..78ed412 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 aa39e27..a7187df 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 1f6d555..0c3a867 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 dfdd8eb..a1e87a7 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 6784f80..b226137 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 91ec525..b129bdd 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 d11dcafb..4bf90f3 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 2f3c955..16df99b 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 2256a86..bd79fb2 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 b39e691..60be2013 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 e0fb1df..186a70b 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 b633563..e79e571 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 0954185..141363d 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 40c31d1..a7a7ac7 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 ff699e3f..67f77ee 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 71e3629..2e10dcf 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 8cf82f4..6237211 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 0021742..97e0ce9 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 0c40da3..08c6150 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 57378da..05feaab 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 eb1fd88..36ece5e 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 ab5e472..7520faf 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 8fec54c..18989a1 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 2a15330..cbe6f71 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 bbae235..0526b44 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 baf56b6..f3d16bc 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 7f9a374..ea32302 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 b4aa64a..bd00340 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 adda37c..15e476e 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; };
    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; };

    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; }
    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 6ac7f6b..8b17f62 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 89ff801..6d2c0bf 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 f5e10a5..9080d91 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 2ec345c..bb32d48 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 d1a9408..cdbede7 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 8ce75bd..8ec8141 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 d4d5608..8031f9b 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 c32d8b3..67e77ab 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 e8b99a6..31eca6f 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 352f375..f520b6f 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 cd4f635..c481150 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 15041eb..5c050cc 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 8d18092..defbabd 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 ccb549b..02ec915 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 bb94742..6068533 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 570a8d2..7741112 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 75c1f90..ef5f23cf 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 e8b79ad..973f124 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 dea9b3c..4a5dd3a 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 30997a9..2d392b5 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 b4ed9e9..a34c7c1 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 f88969c..95655b7 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 a02ef58..97fd903 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 e3e0e82..c8bd450 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 1813f86..af60e2d 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 748fb4e..a69e8ef 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 ee2692f..7015a61 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 2a6040b..b8f274c 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 330e92a..c53b9c1 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 1d8bc83..1f4630e 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 c25c456..364590b0 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 ba31f5c..e7bac7b 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 )
        {}

diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 17d1221..12eb3fd 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -51,7 +51,7 @@ public:
private:
    /// @throws css::io::BufferSizeExceededException
    void resizeBuffer(sal_Int32 nMinSize);
    inline void checkInvariants() {
    void checkInvariants() {
        assert( m_nBufferLen >= 0 );
        assert( m_nOccupiedBuffer >= 0 );
        assert( m_nOccupiedBuffer <= m_nBufferLen );
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 0f5e126..5694256 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -212,7 +212,7 @@ public:
    FileHandleGuard(const FileHandleGuard&) = delete;
    FileHandleGuard& operator=(const FileHandleGuard&) = delete;

    inline oslFileHandle & getHandle() { return m_rHandle; }
    oslFileHandle & getHandle() { return m_rHandle; }

private:
    oslFileHandle & m_rHandle;
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 96c6ee7..c124fce 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -50,7 +50,7 @@ struct LangSvcEntries
        aSvcImplNames[0] = rSvcImplName;
    }

    inline void Clear()
    void Clear()
    {
        aSvcImplNames.realloc(0);
        nLastTriedSvcIndex  = -1;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index c31f142..29fd54a 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -152,8 +152,8 @@ public:
    LwpColor* GetFillColor();
    XFBGImage* GetFillPattern();

    inline bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
    inline bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
    bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
    bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }

    friend class LwpBackgroundOverride;
private:
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index fe6b61a7..8c41bec 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -138,7 +138,7 @@ public:
     * @param   type of the object.
     * @descr   set the type to the draw object.
     */
    inline void SetObjectType(DrawObjectType eType) { m_eType = eType; }
    void SetObjectType(DrawObjectType eType) { m_eType = eType; }
};

/**
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 6928df3..b0297fb 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -116,8 +116,8 @@ public:
        {}
public:
    void Read(LwpObjectStream *pStrm);
    inline sal_uInt16 GetFaceID(){return m_nFaceName;}
    inline sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
    sal_uInt16 GetFaceID(){return m_nFaceName;}
    sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
    void Override(rtl::Reference<XFFont> const & pFont);
    inline bool IsFaceNameOverridden();
    inline bool IsAltFaceNameOverridden();
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index 2f2ac1d..2009e11 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -132,8 +132,8 @@ private:
    LwpObjectID m_OleHead;
    LwpObjectID m_OleTail;
public:
    inline LwpObjectID& GetContentList() { return m_ContentList; }
    inline LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
    LwpObjectID& GetContentList() { return m_ContentList; }
    LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
    LwpContent* EnumContents(LwpContent* pContent);

public:
@@ -249,14 +249,14 @@ private: //file members
private:
    void ReadStyles(LwpObjectStream *pStrm);
public:
    inline LwpContentManager& GetContentManager() { return m_ContentMgr; }
    inline LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
    inline LwpFontManager& GetFontManger() { return m_FontMgr;}
    inline LwpObjectID& GetTextStyleHead()  { return m_TextStyle;}
    inline LwpObjectID& GetLayout() {return m_Layout;}
    inline LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
    inline LwpDocument* GetDocument(){ return m_pDoc;}
    inline LwpNumberManager& GetNumberManager() { return m_NumMgr;}
    LwpContentManager& GetContentManager() { return m_ContentMgr; }
    LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
    LwpFontManager& GetFontManger() { return m_FontMgr;}
    LwpObjectID& GetTextStyleHead()  { return m_TextStyle;}
    LwpObjectID& GetLayout() {return m_Layout;}
    LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
    LwpDocument* GetDocument(){ return m_pDoc;}
    LwpNumberManager& GetNumberManager() { return m_NumMgr;}
    LwpObjectID * GetDefaultTextStyle() ;
private:
    std::unique_ptr<LwpStyleManager> m_xStyleMgr;
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index c780067..5940afa 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -97,7 +97,7 @@ class LwpVirtualLayout : public LwpDLNFPVList
{
public:
    LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
    inline virtual sal_uInt16 GetNumCols(){return 1;}
    virtual sal_uInt16 GetNumCols(){return 1;}
    virtual double GetColWidth(sal_uInt16 nIndex);
    virtual double GetColGap(sal_uInt16 nIndex);
    virtual bool IsAutoGrow(){ return false;}
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 0eb7f40..86b62a6 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -116,7 +116,7 @@ public:
    sal_Int32 GetScaleWidth(){return m_nScaleWidth;}
    sal_Int32 GetScaleHeight(){return m_nScaleHeight;}
    sal_uInt16 GetPlacement(){return m_nPlacement;}
    inline LwpPoint& GetOffset() {return m_Offset;}
    LwpPoint& GetOffset() {return m_Offset;}
protected:
    virtual void Read() override;
protected:
@@ -209,8 +209,8 @@ public:
    LwpColumnInfo();
    ~LwpColumnInfo();
    void Read(LwpObjectStream *pStrm);
    inline double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
    inline double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
    double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
    double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
private:
    sal_Int32 m_nWidth;
    sal_Int32 m_nGap;
@@ -221,7 +221,7 @@ class LwpLayoutColumns : public LwpVirtualPiece
public:
    LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
    virtual void Parse(IXFStream* pOutputStream) override;
    inline sal_uInt16 GetNumCols(){return m_nNumCols;}
    sal_uInt16 GetNumCols(){return m_nNumCols;}
    double GetColWidth(sal_uInt16 nIndex);
    double GetColGap(sal_uInt16 nIndex);
protected:
@@ -238,7 +238,7 @@ class LwpLayoutGutters : public LwpVirtualPiece
public:
    LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
    virtual void Parse(IXFStream* pOutputStream) override;
    inline LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
    LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
protected:
    virtual void Read() override;
protected:
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index e34ae81..08e79c7 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -80,7 +80,7 @@ public:
    virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;}
    sal_uInt16 GetRowID() { return crowid;}
    virtual void RegisterStyle() override;
    inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());}
    LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());}
    void SetRowMap();
protected:
    void Read() override;
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index f4c421b..9168b68 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -114,7 +114,7 @@ public:
    const OUString& GetSectionName() { return m_CurrSectionName; }
    LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr.get(); }

    inline bool IsPMModified() { return m_bPMModified; }
    bool IsPMModified() { return m_bPMModified; }
    inline void SetPMModified(bool bPMModified);
    inline void SetDropcapFlag(bool bFlag);
    inline void SetTabLayout(LwpLayout* pLayout);
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 1e8a6fb..5c2c2c8 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -147,10 +147,10 @@ public:
    LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
    void RegisterStyle() override;
    virtual void XFConvert(XFContentContainer* pCont) override;
    inline sal_uInt16 GetLevel(){return m_nLevel;}
    inline bool GetUseText(){   return (m_nFlags & USETEXT) != 0;}
    inline OUString GetSearchStyle(){return m_SearchName.str();}
    inline bool GetUseLeadingText(){    return (m_nFlags & USENUMBER) != 0;}
    sal_uInt16 GetLevel(){return m_nLevel;}
    bool GetUseText(){   return (m_nFlags & USETEXT) != 0;}
    OUString GetSearchStyle(){return m_SearchName.str();}
    bool GetUseLeadingText(){    return (m_nFlags & USENUMBER) != 0;}
private:
    virtual ~LwpTocLevelData() override;

diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 4caf0f9..baffe4b 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -37,7 +37,7 @@ struct ElementInfo
    sal_Int32           mnElement;          /// The element identifier.
    bool                mbTrimSpaces;       /// True = trims leading/trailing spaces from text data.

    inline explicit     ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
    explicit     ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
};

ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace ) :
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 38c25ba..9e20540 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -82,7 +82,7 @@ public:
                        DocumentOpenedGuard(const DocumentOpenedGuard&) = delete;
    DocumentOpenedGuard& operator=(const DocumentOpenedGuard&) = delete;

    inline bool         isValid() const { return mbValid; }
    bool         isValid() const { return mbValid; }

private:
    OUString            maUrl;
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 3165626..4459bfc 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -39,7 +39,7 @@ namespace prv {
class Locator : public ::cppu::WeakImplHelper< XLocator >
{
public:
    inline explicit         Locator( RecordParser* pParser ) : mpParser( pParser ) {}
    explicit         Locator( RecordParser* pParser ) : mpParser( pParser ) {}

    void                    dispose();
    /// @throws css::uno::RuntimeException
@@ -94,7 +94,7 @@ class ContextStack
public:
    explicit            ContextStack( FragmentHandlerRef const & xHandler );

    inline bool         empty() const { return maStack.empty(); }
    bool         empty() const { return maStack.empty(); }

    sal_Int32           getCurrentRecId() const;
    bool                hasCurrentEndRecId() const;
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index dba0a30..7645f44 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -58,7 +58,7 @@ namespace {

struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > >
{
    inline explicit     TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 )
    explicit     TitleKey( ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 )
                            { first = eObjType; second.first = nMainIdx; second.second = nSubIdx; }
};

@@ -73,7 +73,7 @@ struct TitleLayoutInfo
    ModelRef< LayoutModel > mxLayout;   /// The layout model, if existing.
    GetShapeFunc        mpGetShape;     /// Helper function to receive the title shape.

    inline explicit     TitleLayoutInfo() : mpGetShape( nullptr ) {}
    explicit     TitleLayoutInfo() : mpGetShape( nullptr ) {}

    void                convertTitlePos(
                            ConverterRoot& rRoot,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 43bdcc0..b9d4720 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -507,7 +507,7 @@ struct ObjectTypeFormatEntry
    const AutoFormatEntry* mpAutoFills;     /// Automatic fill formatting for all chart styles.
    const AutoTextEntry* mpAutoTexts;       /// Automatic text attributes for all chart styles.
    bool                mbIsFrame;          /// True = object is a frame, false = object is a line.
    inline ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
    ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
                                 const AutoFormatEntry* pAutoLines,
                                 const AutoFormatEntry* pAutoFills,
                                 const AutoTextEntry* pAutoTexts,
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index fd444c1..9488567 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -56,7 +56,7 @@ struct AxesSetModel
    TypeGroupVector     maTypeGroups;       /// All type groups containing data series.
    AxisMap             maAxes;             /// All axes mapped by API axis type.

    inline explicit     AxesSetModel() {}
    explicit     AxesSetModel() {}
};

/** Axes set converter. This is a helper class for the plot area converter. */
@@ -74,13 +74,13 @@ public:
                            bool bSupportsVaryColorsByPoint );

    /** Returns the automatic chart title if the axes set contains only one series. */
    inline const OUString& getAutomaticTitle() const { return maAutoTitle; }
    const OUString& getAutomaticTitle() const { return maAutoTitle; }
    /** Returns true, if the chart is three-dimensional. */
    inline bool         is3dChart() const { return mb3dChart; }
    bool         is3dChart() const { return mb3dChart; }
    /** Returns true, if chart type supports wall and floor format in 3D mode. */
    inline bool         isWall3dChart() const { return mbWall3dChart; }
    bool         isWall3dChart() const { return mbWall3dChart; }
    /** Returns true, if chart is a pie chart or doughnut chart. */
    inline bool         isPieChart() const { return mbPieChart; }
    bool         isPieChart() const { return mbPieChart; }

private:
    OUString     maAutoTitle;
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 220bf29..d35cc1c 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -163,7 +163,7 @@ struct PropInfo
    PropType            meType;
    sal_uInt16          mnId;
    sal_uInt32          mnSize;
    inline explicit     PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
    explicit     PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
                            maName( rName ), meType( eType ), mnId( nId ), mnSize( nSize ) {}
};

diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index eedf306..99a1423 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -39,7 +39,7 @@ namespace {

struct ValueRangeComp
{
    inline bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
    bool operator()( const ValueRange& rLHS, const ValueRange& rRHS ) const
    {
        return rLHS.mnLast < rRHS.mnFirst;
    }
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 805bb2d..eb7a54b 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -131,8 +131,8 @@ struct VbaControlNameInserter
{
public:
    VbaControlNamesSet& mrCtrlNames;
    inline explicit     VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
    inline void         operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
    explicit     VbaControlNameInserter( VbaControlNamesSet& rCtrlNames ) : mrCtrlNames( rCtrlNames ) {}
    void         operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
};

/** A dummy invisible form control (fixed label without text) that is used to
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 8e34088..8e902b3 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -39,7 +39,7 @@ public:
    ZipPackageBuffer();
    virtual ~ZipPackageBuffer() override;

    inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
    void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); }
    const css::uno::Sequence < sal_Int8>& getSequence () const { return m_aBuffer; }

    // XInputStream
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index d54a309..a87acfc 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -66,7 +66,7 @@ public:

    ~BlopObject();

    inline sal_uInt8 readBYTE(sal_uInt32 index) const
    sal_uInt8 readBYTE(sal_uInt32 index) const
    {
        if (index >= m_bufferLen) {
            throw BoundsError();
@@ -74,7 +74,7 @@ public:
        return m_pBuffer[index];
    }

    inline sal_Int16 readINT16(sal_uInt32 index) const
    sal_Int16 readINT16(sal_uInt32 index) const
    {
        if (m_bufferLen < 2 || index >= m_bufferLen - 1) {
            throw BoundsError();
@@ -82,7 +82,7 @@ public:
        return ((m_pBuffer[index] << 8) | (m_pBuffer[index+1] << 0));
    }

    inline sal_uInt16 readUINT16(sal_uInt32 index) const
    sal_uInt16 readUINT16(sal_uInt32 index) const
    {
        if (m_bufferLen < 2 || index >= m_bufferLen - 1) {
            throw BoundsError();
@@ -90,7 +90,7 @@ public:
        return ((m_pBuffer[index] << 8) | (m_pBuffer[index+1] << 0));
    }

    inline sal_Int32 readINT32(sal_uInt32 index) const
    sal_Int32 readINT32(sal_uInt32 index) const
    {
        if (m_bufferLen < 4 || index >= m_bufferLen - 3) {
            throw BoundsError();
@@ -103,7 +103,7 @@ public:
        );
    }

    inline sal_uInt32 readUINT32(sal_uInt32 index) const
    sal_uInt32 readUINT32(sal_uInt32 index) const
    {
        if (m_bufferLen < 4 || index >= m_bufferLen - 3) {
            throw BoundsError();
@@ -116,7 +116,7 @@ public:
        );
    }

    inline sal_Int64 readINT64(sal_uInt32 index) const
    sal_Int64 readINT64(sal_uInt32 index) const
    {
        if (m_bufferLen < 8 || index >= m_bufferLen - 7) {
            throw BoundsError();
@@ -133,7 +133,7 @@ public:
        );
    }

    inline sal_uInt64 readUINT64(sal_uInt32 index) const
    sal_uInt64 readUINT64(sal_uInt32 index) const
    {
        if (m_bufferLen < 8 || index >= m_bufferLen - 7) {
            throw BoundsError();
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index 55b58ba..d88375a 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -67,8 +67,8 @@ namespace rptui
    class REPORTDESIGN_DLLPUBLIC OModuleClient
    {
    public:
        inline OModuleClient()      { OModule::registerClient(); }
        inline ~OModuleClient() { OModule::revokeClient(); }
        OModuleClient()      { OModule::registerClient(); }
        ~OModuleClient() { OModule::revokeClient(); }
    };


@@ -79,7 +79,7 @@ namespace rptui
    class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
    {
    public:
        inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
    };

}   // namespace rptui
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index d20ce8a..6085e71 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -66,8 +66,8 @@ public:
    OXUndoEnvironment&  GetUndoEnv() { return *m_xUndoEnv.get();}
    void                SetModified(bool _bModified);

    inline dbaui::DBSubComponentController* getController() const { return m_pController; }
    inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
    dbaui::DBSubComponentController* getController() const { return m_pController; }
    void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
    void detachController();

    OReportPage* createNewPage(const css::uno::Reference< css::report::XSection >& _xSection);
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 53e5db5..c37f0c0 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -55,7 +55,7 @@ typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap;
        DlgEdHint( DlgEdHintKind eHint );
        virtual ~DlgEdHint() override;

        inline DlgEdHintKind    GetKind() const { return eHintKind; }
        DlgEdHintKind    GetKind() const { return eHintKind; }
    };


@@ -80,7 +80,7 @@ protected:

    virtual ~OObjectBase();

    inline bool isListening() const { return m_bIsListening; }
    bool isListening() const { return m_bIsListening; }

    void SetPropsFromRect(const Rectangle& _rRect);

diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 5038bf0..dc24b55 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -68,12 +68,12 @@ namespace rptui
            :m_xGroup(_xGroup)
        {
        }
        inline css::uno::Reference< css::report::XSection >   getHeader() { return m_xGroup->getHeader(); }
        inline css::uno::Reference< css::report::XSection >   getFooter() { return m_xGroup->getFooter(); }
        css::uno::Reference< css::report::XSection >   getHeader() { return m_xGroup->getHeader(); }
        css::uno::Reference< css::report::XSection >   getFooter() { return m_xGroup->getFooter(); }
        const css::uno::Reference< css::report::XGroup >&     getGroup() { return m_xGroup; }

        inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
        inline bool getFooterOn() { return m_xGroup->getFooterOn(); }
        bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
        bool getFooterOn() { return m_xGroup->getFooterOn(); }

        static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection);

@@ -89,16 +89,16 @@ namespace rptui
            :m_xReport(_xReport)
        {
        }
        inline css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); }
        inline css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); }
        inline css::uno::Reference< css::report::XSection > getPageHeader()   { return m_xReport->getPageHeader(); }
        inline css::uno::Reference< css::report::XSection > getPageFooter()   { return m_xReport->getPageFooter(); }
        inline css::uno::Reference< css::report::XSection > getDetail()       { return m_xReport->getDetail(); }
        css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); }
        css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); }
        css::uno::Reference< css::report::XSection > getPageHeader()   { return m_xReport->getPageHeader(); }
        css::uno::Reference< css::report::XSection > getPageFooter()   { return m_xReport->getPageFooter(); }
        css::uno::Reference< css::report::XSection > getDetail()       { return m_xReport->getDetail(); }

        inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
        inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
        inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
        inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
        bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
        bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
        bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
        bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }

        static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection);
    };
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 4e41ae2..972f8db 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -60,7 +60,7 @@ namespace rptui
        bool        isValid() const;

        /// returns the type of the binding represented by the formula
        inline BindType    getType() const { return m_eType; }
        BindType    getType() const { return m_eType; }

        /// returns the complete formula represented by the object
        const OUString&
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index 82e2106..4a24c51 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -68,14 +68,14 @@ namespace rptxml

        virtual void EndElement() override;

        inline void addHeight(sal_Int32 _nHeight)   { m_aHeight.push_back( _nHeight ); }
        inline void addWidth(sal_Int32 _nWidth)     { m_aWidth.push_back( _nWidth ); }
        void addHeight(sal_Int32 _nHeight)   { m_aHeight.push_back( _nHeight ); }
        void addWidth(sal_Int32 _nWidth)     { m_aWidth.push_back( _nWidth ); }

        inline void setColumnSpanned(sal_Int32 _nColSpan)     { m_nColSpan = _nColSpan; }
        inline void setRowSpanned(   sal_Int32 _nRowSpan)     { m_nRowSpan = _nRowSpan; }
        void setColumnSpanned(sal_Int32 _nColSpan)     { m_nColSpan = _nColSpan; }
        void setRowSpanned(   sal_Int32 _nRowSpan)     { m_nRowSpan = _nRowSpan; }

        void incrementRowIndex();
        inline void incrementColumnIndex()  { ++m_nColumnIndex; }
        void incrementColumnIndex()  { ++m_nColumnIndex; }

        void addCell(const css::uno::Reference< css::report::XReportComponent>& _xElement);

diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index b0ae876..14d7db5 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -161,7 +161,7 @@ public:
    */
    void insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction);
    void removeFunction(const OUString& _sFunctionName);
    inline const TGroupFunctionMap& getFunctions() const {
    const TGroupFunctionMap& getFunctions() const {
        return m_aFunctions;
    }

diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 6a6d64e..8fdfa0a 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -164,7 +164,7 @@ namespace rptui
        */
        void    ApplyCommand(sal_uInt16 _nCommandId, const ::Color& _aColor );

        inline ::rptui::OReportController& getController() const { return m_rController; }
        ::rptui::OReportController& getController() const { return m_rController; }

        sal_uInt16 mapToolbarItemToSlotId(sal_uInt16 nItemId) const;

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 1922e67..25e9749 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -130,9 +130,9 @@ public:
    void        copy();
    void        paste();

    inline sal_Int32   getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); }
    sal_Int32   getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); }

    inline ::svt::ComboBoxControl*  getExpressionControl() const { return m_pComboCell; }
    ::svt::ComboBoxControl*  getExpressionControl() const { return m_pComboCell; }

    /** returns the sequence with the selected groups
    */
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 30c511b..e3dbfd4 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -124,7 +124,7 @@ class NavigatorTree :   public ::cppu::BaseMutex
        virtual ~UserData() override;

        const uno::Reference< uno::XInterface >& getContent() const { return m_xContent; }
        inline void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; }
        void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; }

    protected:
        // OPropertyChangeListener
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 4975d8d..e111f48 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -86,10 +86,10 @@ public:
    virtual void GetFocus() override;
    virtual bool PreNotify( NotifyEvent& _rNEvt ) override;

    inline const OUString&       GetCommand()            const { return m_aCommandName; }
    inline sal_Int32                    GetCommandType()        const { return m_nCommandType; }
    inline bool                     GetEscapeProcessing()   const { return m_bEscapeProcessing; }
    inline void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; }
    const OUString&       GetCommand()            const { return m_aCommandName; }
    sal_Int32                    GetCommandType()        const { return m_nCommandType; }
    bool                     GetEscapeProcessing()   const { return m_bEscapeProcessing; }
    void SetCreateHdl(const Link<OAddFieldWindow&,void>& _aCreateLink) { m_aCreateLink = _aCreateLink; }

    css::uno::Reference< css::sdbc::XConnection>              getConnection() const;

diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 1dfddaf..6b6aea5 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -60,10 +60,10 @@ namespace rptui

        /** returns if the section is marked
        */
        inline bool isMarked() const { return m_bMarked; }
        bool isMarked() const { return m_bMarked; }

        inline void     setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; }
        inline bool isCollapsed() const { return m_bCollapsed; }
        void     setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; }
        bool isCollapsed() const { return m_bCollapsed; }

        /** collapse or expand
         *
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 1098fae..41434ae 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -103,7 +103,7 @@ namespace rptui

        virtual void initialize() override;

        inline OReportController&   getController() const { return m_rReportController; }
        OReportController&   getController() const { return m_rReportController; }

        void            SetMode( DlgEdMode m_eMode );
        void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index a750f4e..fbe24c6 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -412,8 +412,8 @@ namespace rptui
        *
        * \return
        */
        inline sal_Int32    getSplitPos() const { return m_nSplitPos;}
        inline void         setSplitPos(sal_Int32 _nSplitPos)       { m_nSplitPos = _nSplitPos;}
        sal_Int32    getSplitPos() const { return m_nSplitPos;}
        void         setSplitPos(sal_Int32 _nSplitPos)       { m_nSplitPos = _nSplitPos;}

        /** creates a new report from the report definition.
         *
@@ -439,8 +439,8 @@ namespace rptui
        const std::shared_ptr<rptui::OReportModel>& getSdrModel() const { return m_aReportModel;}

        const css::uno::Reference< css::uno::XComponentContext >&  getContext() const { return m_xContext; }
        inline sal_Int16   getZoomValue() const     { return m_nZoomValue; }
        inline void         resetZoomType()         { m_eZoomType = SvxZoomType::PERCENT; }
        sal_Int16   getZoomValue() const     { return m_nZoomValue; }
        void         resetZoomType()         { m_eZoomType = SvxZoomType::PERCENT; }

        // css::beans::XPropertySet
        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index b6dc960..5781a12 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -112,9 +112,9 @@ namespace rptui
        */
        void SetGridVisible(bool _bVisible);

        inline OSectionWindow*      getSectionWindow() const { return m_pParent; }
        inline OSectionView&        getSectionView() const { return *m_pView; }
        inline OReportPage*         getPage() const { return m_pPage; }
        OSectionWindow*      getSectionWindow() const { return m_pParent; }
        OSectionView&        getSectionView() const { return *m_pView; }
        OReportPage*         getPage() const { return m_pPage; }
        const css::uno::Reference< css::report::XSection >& getSection() const { return m_xSection; }

        DlgEdMode       GetMode() const { return m_eMode; }
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index e57f6b0..fe1bc16 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -71,8 +71,8 @@ namespace rptui
        // Window overrides
        virtual void Resize() override;

        inline ODesignView*         getReportView() const { return m_pView; }
        inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; }
        ODesignView*         getReportView() const { return m_pView; }
        OScrollWindowHelper* getScrollWindow() const { return m_pParent; }

        void            SetMode( DlgEdMode m_eMode );
        void            SetInsertObj( sal_uInt16 eObj, const OUString& _sShapeType);
@@ -136,7 +136,7 @@ namespace rptui
        */
        void            showRuler(bool _bShow);

        inline sal_Int32 getRulerHeight() const { return m_aHRuler->GetSizePixel().Height(); }
        sal_Int32 getRulerHeight() const { return m_aHRuler->GetSizePixel().Height(); }

        /** returns the total width of the first section
        */
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 12871c6..d8b2c56 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -79,11 +79,11 @@ namespace rptui
        */
        void                    initialize();

        inline Point            getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; }
        Point            getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; }
        void                    setTotalSize(sal_Int32 _nWidth, sal_Int32 _nHeight);
        const Size&             getTotalSize() const { return m_aTotalPixelSize; }
        inline ScrollBar&       GetHScroll() { return *m_aHScroll.get(); }
        inline ScrollBar&       GetVScroll() { return *m_aVScroll.get(); }
        ScrollBar&       GetHScroll() { return *m_aHScroll.get(); }
        ScrollBar&       GetVScroll() { return *m_aVScroll.get(); }

        // forwards
        void                    SetMode( DlgEdMode _eMode );
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index 9c8d460..13d3365 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -49,7 +49,7 @@ public:
    virtual void MarkListHasChanged() override;
    virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override;

    inline OReportSection*  getReportSection() const { return m_pSectionWindow; }
    OReportSection*  getReportSection() const { return m_pSectionWindow; }

    // switch the marked objects to the given layer.
    void SetMarkedToLayer( SdrLayerID nLayerNo );
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index fda4807..fefc2d7 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -98,10 +98,10 @@ namespace rptui
        virtual ~OSectionWindow() override;
        virtual void dispose() override;

        inline OStartMarker&    getStartMarker()    { return *m_aStartMarker.get();     }
        inline OReportSection&  getReportSection()  { return *m_aReportSection.get();   }
        inline OEndMarker&      getEndMarker()      { return *m_aEndMarker.get();       }
        inline OViewsWindow*    getViewsWindow()    { return m_pParent;          }
        OStartMarker&    getStartMarker()    { return *m_aStartMarker.get();     }
        OReportSection&  getReportSection()  { return *m_aReportSection.get();   }
        OEndMarker&      getEndMarker()      { return *m_aEndMarker.get();       }
        OViewsWindow*    getViewsWindow()    { return m_pParent;          }

        void    setCollapsed(bool _bCollapsed);

diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 519a149..6e8be8d 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -115,7 +115,7 @@ namespace rptui

        void resize(const OSectionWindow& _rSectionWindow);

        inline OReportWindow*       getView()           const { return m_pParent; }
        OReportWindow*       getView()           const { return m_pParent; }

        /** removes the section at the given position.
        *
@@ -151,7 +151,7 @@ namespace rptui
        */
        sal_Int32       getTotalHeight() const;

        inline bool     empty() const { return m_aSections.empty(); }
        bool     empty() const { return m_aSections.empty(); }
        void            SetMode( DlgEdMode m_eMode );
        void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
        const OUString& GetInsertObjString() const { return m_sShapeType;}
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index ab21899..ae29365 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -108,7 +108,7 @@ public:
    */
    void    deactivateOle(bool _bSelect = false);

    inline bool isUiActive() const { return m_bUiActive; }
    bool isUiActive() const { return m_bUiActive; }
protected:
    void colorizeOverlappedObject(SdrObject* _pOverlappedObj);
    void unColorizeOverlappedObj();
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 265c73b..177d87d 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -66,7 +66,7 @@ public:
    virtual ~OTaskWindow() override { disposeOnce(); }
    virtual void dispose() override { m_pPropWin.clear(); vcl::Window::dispose(); }

    inline void setPropertyBrowser(PropBrw* _pPropWin)
    void setPropertyBrowser(PropBrw* _pPropWin)
    {
        m_pPropWin = _pPropWin;
    }
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 1ef86e6..d39da67 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -80,7 +80,7 @@ class RscTypCont
    void        Init();         // initializes classes and tables
    void        SETCONST( RscConst *, const char *, sal_uInt32 );
    void        SETCONST( RscConst *, Atom, sal_uInt32 );
    inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
    void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
    RscEnum *   InitFieldUnitsType();
    RscTupel *  InitStringLongTupel();
    static RscCont  *  InitStringLongTupelList( RscTupel * pStringLongTupel );
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 2a99e0a..6455c35 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -119,9 +119,9 @@ struct rtl_bootstrap_NameValue
    OUString sName;
    OUString sValue;

    inline rtl_bootstrap_NameValue()
    rtl_bootstrap_NameValue()
        {}
    inline rtl_bootstrap_NameValue(
    rtl_bootstrap_NameValue(
        OUString const & name, OUString const & value )
        : sName( name ),
          sValue( value )
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 4d0ecb1..72558a9 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -81,19 +81,19 @@ struct StringTraits

    typedef rtl_String String;

    static inline void createString(rtl_String ** pString,
    static void createString(rtl_String ** pString,
                                    sal_Char const * pChars, sal_Int32 nLen)
    {
        rtl_string_newFromStr_WithLength(pString, pChars, nLen);
    }

    static inline void createBuffer(rtl_String ** pBuffer,
    static void createBuffer(rtl_String ** pBuffer,
                                    sal_Int32 * pCapacity)
    {
        rtl_string_new_WithLength(pBuffer, *pCapacity);
    }

    static inline void appendChars(rtl_String ** pBuffer, sal_Int32 * pCapacity,
    static void appendChars(rtl_String ** pBuffer, sal_Int32 * pCapacity,
                                   sal_Int32 * pOffset, sal_Char const * pChars,
                                   sal_Int32 nLen)
    {
@@ -102,7 +102,7 @@ struct StringTraits
        *pOffset += nLen;
    }

    static inline void appendAscii(rtl_String ** pBuffer, sal_Int32 * pCapacity,
    static void appendAscii(rtl_String ** pBuffer, sal_Int32 * pCapacity,
                                   sal_Int32 * pOffset, sal_Char const * pStr,
                                   sal_Int32 nLen)
    {
@@ -118,19 +118,19 @@ struct UStringTraits

    typedef rtl_uString String;

    static inline void createString(rtl_uString ** pString,
    static void createString(rtl_uString ** pString,
                                    sal_Unicode const * pChars, sal_Int32 nLen)
    {
        rtl_uString_newFromStr_WithLength(pString, pChars, nLen);
    }

    static inline void createBuffer(rtl_uString ** pBuffer,
    static void createBuffer(rtl_uString ** pBuffer,
                                    sal_Int32 * pCapacity)
    {
        rtl_uString_new_WithLength(pBuffer, *pCapacity);
    }

    static inline void appendChars(rtl_uString ** pBuffer,
    static void appendChars(rtl_uString ** pBuffer,
                                   sal_Int32 * pCapacity, sal_Int32 * pOffset,
                                   sal_Unicode const * pChars, sal_Int32 nLen)
    {
@@ -139,7 +139,7 @@ struct UStringTraits
        *pOffset += nLen;
    }

    static inline void appendAscii(rtl_uString ** pBuffer,
    static void appendAscii(rtl_uString ** pBuffer,
                                   sal_Int32 * pCapacity, sal_Int32 * pOffset,
                                   sal_Char const * pStr, sal_Int32 nLen)
    {
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 7edeb30..b00dfb9 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -318,9 +318,9 @@ struct Component
    sal_Unicode const * pBegin;
    sal_Unicode const * pEnd;

    inline Component(): pBegin(nullptr), pEnd(nullptr) {}
    Component(): pBegin(nullptr), pEnd(nullptr) {}

    inline bool isPresent() const { return pBegin != nullptr; }
    bool isPresent() const { return pBegin != nullptr; }

    inline sal_Int32 getLength() const;
};
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c3f5888..5f39498 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -207,13 +207,13 @@ public:
        SCROW       nRow;
        SCCOL       nCol;

        inline Details( formula::FormulaGrammar::AddressConvention eConvP, SCROW nRowP, SCCOL nColP ) :
        Details( formula::FormulaGrammar::AddressConvention eConvP, SCROW nRowP, SCCOL nColP ) :
            eConv(eConvP), nRow(nRowP), nCol(nColP)
        {}
        inline Details( formula::FormulaGrammar::AddressConvention eConvP, ScAddress const & rAddr ) :
        Details( formula::FormulaGrammar::AddressConvention eConvP, ScAddress const & rAddr ) :
            eConv(eConvP), nRow(rAddr.Row()),  nCol(rAddr.Col())
        {}
        inline Details( formula::FormulaGrammar::AddressConvention eConvP) :
        Details( formula::FormulaGrammar::AddressConvention eConvP) :
            eConv(eConvP), nRow(0), nCol(0)
        {}
        /* Use the formula::FormulaGrammar::AddressConvention associated with rAddr::Tab() */
@@ -227,82 +227,82 @@ public:
        sal_uInt16  mnFileId;
        bool        mbExternal;

        inline ExternalInfo() :
        ExternalInfo() :
            mnFileId(0), mbExternal(false)
        {}
    };

    inline ScAddress() :
    ScAddress() :
        nRow(0), nCol(0), nTab(0)
    {}
    inline ScAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) :
    ScAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) :
        nRow(nRowP), nCol(nColP), nTab(nTabP)
    {}
    /** Yes, it is what it seems to be: Uninitialized. May be used for
        performance reasons if it is initialized by other means. */
    inline ScAddress( Uninitialized )
    ScAddress( Uninitialized )
    {}
    inline ScAddress( InitializeInvalid ) :
    ScAddress( InitializeInvalid ) :
        nRow(-1), nCol(-1), nTab(-1)
    {}
    inline ScAddress( const ScAddress& rAddress ) :
    ScAddress( const ScAddress& rAddress ) :
        nRow(rAddress.nRow), nCol(rAddress.nCol), nTab(rAddress.nTab)
    {}
    inline ScAddress& operator=( const ScAddress& rAddress );

    inline void Set( SCCOL nCol, SCROW nRow, SCTAB nTab );

    inline SCROW Row() const
    SCROW Row() const
    {
        return nRow;
    }

    inline SCCOL Col() const
    SCCOL Col() const
    {
        return nCol;
    }
    inline SCTAB Tab() const
    SCTAB Tab() const
    {
        return nTab;
    }
    inline void SetRow( SCROW nRowP )
    void SetRow( SCROW nRowP )
    {
        nRow = nRowP;
    }
    inline void SetCol( SCCOL nColP )
    void SetCol( SCCOL nColP )
    {
        nCol = nColP;
    }
    inline void SetTab( SCTAB nTabP )
    void SetTab( SCTAB nTabP )
    {
        nTab = nTabP;
    }
    inline void SetInvalid()
    void SetInvalid()
    {
        nRow = -1;
        nCol = -1;
        nTab = -1;
    }
    inline bool IsValid() const
    bool IsValid() const
    {
        return (nRow >= 0) && (nCol >= 0) && (nTab >= 0);
    }

    inline void PutInOrder( ScAddress& rAddress );

    inline void IncRow( SCsROW nDelta = 1 )
    void IncRow( SCsROW nDelta = 1 )
    {
        nRow = sal::static_int_cast<SCROW>(nRow + nDelta);
    }
    inline void IncCol( SCsCOL nDelta = 1 )
    void IncCol( SCsCOL nDelta = 1 )
    {
        nCol = sal::static_int_cast<SCCOL>(nCol + nDelta);
    }
    inline void IncTab( SCsTAB nDelta = 1 )
    void IncTab( SCsTAB nDelta = 1 )
    {
        nTab = sal::static_int_cast<SCTAB>(nTab + nDelta);
    }
    inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
    void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
    {
        nColP = nCol;
        nRowP = nRow;
@@ -474,51 +474,51 @@ public:
    ScAddress aStart;
    ScAddress aEnd;

    inline ScRange() :
    ScRange() :
        aStart(), aEnd()
    {}

    inline ScRange( ScAddress::Uninitialized eUninitialized ) :
    ScRange( ScAddress::Uninitialized eUninitialized ) :
        aStart( eUninitialized ), aEnd( eUninitialized )
    {}
    inline ScRange( ScAddress::InitializeInvalid eInvalid ) :
    ScRange( ScAddress::InitializeInvalid eInvalid ) :
        aStart( eInvalid ), aEnd( eInvalid )
    {}
    inline ScRange( const ScAddress& aInputStart, const ScAddress& aInputEnd ) :
    ScRange( const ScAddress& aInputStart, const ScAddress& aInputEnd ) :
        aStart( aInputStart ), aEnd( aInputEnd )
    {
        aStart.PutInOrder( aEnd );
    }
    inline ScRange( const ScRange& rRange ) :
    ScRange( const ScRange& rRange ) :
        aStart( rRange.aStart ), aEnd( rRange.aEnd )
    {}
    inline ScRange( const ScAddress& rRange ) :
    ScRange( const ScAddress& rRange ) :
        aStart( rRange ), aEnd( rRange )
    {}
    inline ScRange( SCCOL nCol, SCROW nRow, SCTAB nTab ) :
    ScRange( SCCOL nCol, SCROW nRow, SCTAB nTab ) :
        aStart( nCol, nRow, nTab ), aEnd( aStart )
    {}
    inline ScRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) :
    ScRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) :
        aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 )
    {}

    inline ScRange& operator=( const ScRange& rRange )
    ScRange& operator=( const ScRange& rRange )
    {
        aStart = rRange.aStart;
        aEnd = rRange.aEnd;
        return *this;
    }
    inline ScRange& operator=( const ScAddress& rPos )
    ScRange& operator=( const ScAddress& rPos )
    {
        aStart = aEnd = rPos;
        return *this;
    }
    inline void SetInvalid()
    void SetInvalid()
    {
        aStart.SetInvalid();
        aEnd.SetInvalid();
    }
    inline bool IsValid() const
    bool IsValid() const
    {
        return aStart.IsValid() && aEnd.IsValid();
    }
@@ -773,43 +773,43 @@ private:
    bool                bRelRow;
    bool                bRelTab;
public:
    inline ScRefAddress() :
    ScRefAddress() :
        bRelCol(false), bRelRow(false), bRelTab(false)
    {}
    inline ScRefAddress( SCCOL nCol, SCROW nRow, SCTAB nTab,
    ScRefAddress( SCCOL nCol, SCROW nRow, SCTAB nTab,
                         bool bRelColP, bool bRelRowP, bool bRelTabP ) :
        aAdr(nCol, nRow, nTab),
        bRelCol(bRelColP), bRelRow(bRelRowP), bRelTab(bRelTabP)
    {}
    inline ScRefAddress( const ScRefAddress& rRef ) :
    ScRefAddress( const ScRefAddress& rRef ) :
        aAdr(rRef.aAdr), bRelCol(rRef.bRelCol), bRelRow(rRef.bRelRow),
        bRelTab(rRef.bRelTab)
    {}

    inline ScRefAddress& operator=( const ScRefAddress& );

    inline bool IsRelCol() const
    bool IsRelCol() const
    {
        return bRelCol;
    }
    inline bool IsRelRow() const
    bool IsRelRow() const
    {
        return bRelRow;
    }
    inline bool IsRelTab() const
    bool IsRelTab() const
    {
        return bRelTab;
    }

    inline void SetRelCol(bool bNewRelCol)
    void SetRelCol(bool bNewRelCol)
    {
        bRelCol = bNewRelCol;
    }
    inline void SetRelRow(bool bNewRelRow)
    void SetRelRow(bool bNewRelRow)
    {
        bRelRow = bNewRelRow;
    }
    inline void SetRelTab(bool bNewRelTab)
    void SetRelTab(bool bNewRelTab)
    {
        bRelTab = bNewRelTab;
    }
@@ -819,20 +819,20 @@ public:
    inline void Set( SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                     bool bNewRelCol, bool bNewRelRow, bool bNewRelTab );

    inline const ScAddress& GetAddress() const
    const ScAddress& GetAddress() const
    {
        return aAdr;
    }

    inline SCCOL Col() const
    SCCOL Col() const
    {
        return aAdr.Col();
    }
    inline SCROW Row() const
    SCROW Row() const
    {
        return aAdr.Row();
    }
    inline SCTAB Tab() const
    SCTAB Tab() const
    {
        return aAdr.Tab();
    }
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 23e97ca..dc9b288 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -71,7 +71,7 @@ public:

            bool            IsMerged() const { return nColMerge>1 || nRowMerge>1; }

    inline  ScMergeAttr& operator=(const ScMergeAttr& rMerge)
    ScMergeAttr& operator=(const ScMergeAttr& rMerge)
            {
                nColMerge = rMerge.nColMerge;
                nRowMerge = rMerge.nRowMerge;
@@ -141,7 +141,7 @@ public:
            void            SetHideCell( bool bHCell);
            bool            GetHidePrint() const { return bHidePrint; }
            void            SetHidePrint( bool bHPrint);
    inline  ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
    ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
            {
                bProtection = rProtection.bProtection;
                bHideFormula = rProtection.bHideFormula;
@@ -310,13 +310,13 @@ public:

    virtual bool                operator==( const SfxPoolItem& rCmp ) const override;

    inline sal_uInt16           GetWidth() const { return mnWidth; }
    inline sal_uInt16           GetHeight() const { return mnHeight; }
    inline bool                 IsValid() const { return mnWidth || mnHeight; }
    sal_uInt16           GetWidth() const { return mnWidth; }
    sal_uInt16           GetHeight() const { return mnHeight; }
    bool                 IsValid() const { return mnWidth || mnHeight; }

    inline void                 SetWidth( sal_uInt16 nWidth ) { mnWidth = nWidth; }
    inline void                 SetHeight( sal_uInt16 nHeight ) { mnHeight = nHeight; }
    inline void                 Set( sal_uInt16 nWidth, sal_uInt16 nHeight )
    void                 SetWidth( sal_uInt16 nWidth ) { mnWidth = nWidth; }
    void                 SetHeight( sal_uInt16 nHeight ) { mnHeight = nHeight; }
    void                 Set( sal_uInt16 nWidth, sal_uInt16 nHeight )
                                    { mnWidth = nWidth; mnHeight = nHeight; }

    virtual bool GetPresentation( SfxItemPresentation ePresentation,
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 049b744..5c8fbb5 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -131,7 +131,7 @@ public:

    bool    IsValid( const ScDocument* pDoc ) const
                { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
    inline ScRange  MakeRange() const
    ScRange  MakeRange() const
                    { return ScRange( aStart.MakeAddress(),
                        aEnd.MakeAddress() ); }

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 468d0c3..0aa34f5 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -463,7 +463,7 @@ private:
    virtual bool IsForceArrayParameter( const formula::FormulaToken* pToken, sal_uInt16 nParam ) const override;

    /// Access the CharTable flags
    inline ScCharFlags GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
    ScCharFlags GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
        { return c < 128 ? pConv->getCharTableFlags(c, cLast) : ScCharFlags::NONE; }
};

diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index b995386..894755d 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -303,10 +303,10 @@ struct ScFieldIdentifier
    sal_Int32           mnFieldIdx;     /// Field index (if several fields with same name exist).
    bool                mbDataLayout;   /// True = data layout field collecting all data fields as items.

    inline explicit     ScFieldIdentifier() :
    explicit     ScFieldIdentifier() :
                            mnFieldIdx( 0 ), mbDataLayout( false ) {}

    inline explicit     ScFieldIdentifier( const OUString& rFieldName, bool bDataLayout ) :
    explicit     ScFieldIdentifier( const OUString& rFieldName, bool bDataLayout ) :
                            maFieldName( rFieldName ), mnFieldIdx( 0 ), mbDataLayout( bDataLayout ) {}
};

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4b05b6a..e220602 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2232,7 +2232,7 @@ public:
    void SC_DLLPUBLIC GetSortParam( ScSortParam& rParam, SCTAB nTab );
    void SC_DLLPUBLIC SetSortParam( ScSortParam& rParam, SCTAB nTab );

    inline void     SetVbaEventProcessor( const css::uno::Reference< css::script::vba::XVBAEventProcessor >& rxVbaEvents )
    void     SetVbaEventProcessor( const css::uno::Reference< css::script::vba::XVBAEventProcessor >& rxVbaEvents )
                        { mxVbaEvents = rxVbaEvents; }
    const css::uno::Reference< css::script::vba::XVBAEventProcessor >&
                    GetVbaEventProcessor() const { return mxVbaEvents; }
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index ed3acc4..766dfed 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -266,8 +266,8 @@ public:
    void SetInitChild( bool b ) { mbInitChild = b; }
    void SetInitAllChildren( bool b ) { mbAllChildren = b; }

    inline ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
    inline ScDPLevel*         GetLevel( size_t nPos ) const { return mppLev[nPos];}
    ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
    ScDPLevel*         GetLevel( size_t nPos ) const { return mppLev[nPos];}

    bool GetInitChild() const {return mbInitChild; }
    bool GetInitAllChild() const { return mbAllChildren; }
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dd3fadf..00f87ca 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -603,7 +603,7 @@ public:
    /// strchr() functionality on unicode, as long as we need it for FormulaToken etc.
    static const sal_Unicode* UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c );

    static inline sal_Unicode ToUpperAlpha( sal_Unicode c )
    static sal_Unicode ToUpperAlpha( sal_Unicode c )
        { return ( c >= 'a' && c <= 'z' ) ? ( c-'a'+'A' ) : c; }

    /** Adds the string rToken to rTokenList, using a list separator character.
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 5f3b6cf..905df00 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -128,7 +128,7 @@ public:
                                    const ScAddress & rQueryAddress,
                                    const bool bAvailable );

    inline  const ScRange&  getRange() const { return maRange; }
    const ScRange&  getRange() const { return maRange; }

    struct Hash
    {
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index f7c10da..2904d82 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -48,10 +48,10 @@ public:
    ~ScCaptionPtr();

    ScCaptionPtr& operator=( const ScCaptionPtr& r );
    inline explicit operator bool() const    { return mpCaption != nullptr; }
    inline SdrCaptionObj* get() const        { return mpCaption; }
    inline SdrCaptionObj* operator->() const { return mpCaption; }
    inline SdrCaptionObj& operator*() const  { return *mpCaption; }
    explicit operator bool() const    { return mpCaption != nullptr; }
    SdrCaptionObj* get() const        { return mpCaption; }
    SdrCaptionObj* operator->() const { return mpCaption; }
    SdrCaptionObj& operator*() const  { return *mpCaption; }

    // Does not default to nullptr to make it visually obvious where such is used.
    void reset( SdrCaptionObj* p );
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 5f3e762..2770569 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -51,7 +51,7 @@ private:

public:
    /// No default ctor, because used in ScRawToken union, set InitFlags!
    inline  void InitFlags() { mnFlagValue = 0; }    ///< all FALSE
    void InitFlags() { mnFlagValue = 0; }    ///< all FALSE
    /// InitAddress: InitFlags and set address
    void InitAddress( const ScAddress& rAdr );
    void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
@@ -121,19 +121,19 @@ struct ScComplexRefData
    ScSingleRefData Ref1;
    ScSingleRefData Ref2;

    inline void InitFlags()
    void InitFlags()
        { Ref1.InitFlags(); Ref2.InitFlags(); }
    inline void InitRange( const ScRange& rRange )
    void InitRange( const ScRange& rRange )
        {
            Ref1.InitAddress( rRange.aStart );
            Ref2.InitAddress( rRange.aEnd );
        }
    inline void InitRangeRel( const ScRange& rRange, const ScAddress& rPos )
    void InitRangeRel( const ScRange& rRange, const ScAddress& rPos )
        {
            Ref1.InitAddressRel( rRange.aStart, rPos );
            Ref2.InitAddressRel( rRange.aEnd, rPos );
        }
    inline void InitRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
    void InitRange( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                            SCCOL nCol2, SCROW nRow2, SCTAB nTab2 )
        {
            Ref1.InitAddress( nCol1, nRow1, nTab1 );
@@ -150,14 +150,14 @@ struct ScComplexRefData
    bool ValidExternal() const;

    /** Whether this references entire columns, A:A */
    inline bool IsEntireCol() const
    bool IsEntireCol() const
    {
        // Both row anchors must be absolute.
        return Ref1.Row() == 0 && Ref2.Row() == MAXROW && !Ref1.IsRowRel() && !Ref2.IsRowRel();
    }

    /** Whether this references entire rows, 1:1 */
    inline bool IsEntireRow() const
    bool IsEntireRow() const
    {
        // Both column anchors must be absolute.
        return Ref1.Col() == 0 && Ref2.Col() == MAXCOL && !Ref1.IsColRel() && !Ref2.IsColRel();
@@ -172,7 +172,7 @@ struct ScComplexRefData
    /** Adjust ordering (front-top-left/rear-bottom-right) to a new position. */
    void PutInOrder( const ScAddress& rPos );

    inline bool operator==( const ScComplexRefData& r ) const
    bool operator==( const ScComplexRefData& r ) const
        { return Ref1 == r.Ref1 && Ref2 == r.Ref2; }
    /** Enlarge range if reference passed is not within existing range.
        ScAddress position is used to calculate absolute references from
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 632205a..886bbd8 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -153,7 +153,7 @@ public:
    };

    /// The maximum number of elements a matrix may have at runtime.
    inline static size_t GetElementsMax()
    static size_t GetElementsMax()
    {
        // TODO: Fix me.
        return 0x08000000;
@@ -174,19 +174,19 @@ public:
    bool static IsSizeAllocatable( SCSIZE nC, SCSIZE nR );

    /// Value or boolean.
    inline static bool IsValueType( ScMatValType nType )
    static bool IsValueType( ScMatValType nType )
    {
        return nType <= ScMatValType::Boolean;
    }

    /// Boolean.
    inline static bool IsBooleanType( ScMatValType nType )
    static bool IsBooleanType( ScMatValType nType )
    {
        return nType == ScMatValType::Boolean;
    }

    /// String, empty or empty path, but not value nor boolean.
    inline static bool IsNonValueType( ScMatValType nType )
    static bool IsNonValueType( ScMatValType nType )
    {
        return bool(nType & ScMatValType::NonvalueMask);
    }
@@ -194,19 +194,19 @@ public:
    /** String, but not empty or empty path or any other type.
        Not named IsStringType to prevent confusion because previously
        IsNonValueType was named IsStringType. */
    inline static bool IsRealStringType( ScMatValType nType )
    static bool IsRealStringType( ScMatValType nType )
    {
        return (nType & ScMatValType::NonvalueMask) == ScMatValType::String;
    }

    /// Empty, but not empty path or any other type.
    inline static bool IsEmptyType( ScMatValType nType )
    static bool IsEmptyType( ScMatValType nType )
    {
        return (nType & ScMatValType::NonvalueMask) == ScMatValType::Empty;
    }

    /// Empty path, but not empty or any other type.
    inline static bool IsEmptyPathType( ScMatValType nType )
    static bool IsEmptyPathType( ScMatValType nType )
    {
        return (nType & ScMatValType::NonvalueMask) == ScMatValType::EmptyPath;
    }
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 3351249..d0cd020 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -75,7 +75,7 @@ struct SC_DLLPUBLIC ScSortParam
    void            Clear       ();
    void            MoveToDest();

    inline sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); }
    sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); }
};

namespace sc {
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 5f8711c..0358a76 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -280,15 +280,15 @@ public:
    bool        IsStreamValid() const                        { return bStreamValid; }
    void        SetStreamValid( bool bSet, bool bIgnoreLock = false );

    SAL_WARN_UNUSED_RESULT inline bool IsColValid( SCCOL nScCol ) const
    SAL_WARN_UNUSED_RESULT bool IsColValid( SCCOL nScCol ) const
    {
        return nScCol >= static_cast< SCCOL >( 0 ) && nScCol < aCol.size();
    }
    SAL_WARN_UNUSED_RESULT inline bool IsColRowValid( SCCOL nScCol, SCROW nScRow ) const
    SAL_WARN_UNUSED_RESULT bool IsColRowValid( SCCOL nScCol, SCROW nScRow ) const
    {
        return IsColValid( nScCol ) && ValidRow( nScRow );
    }
    SAL_WARN_UNUSED_RESULT inline bool IsColRowTabValid( SCCOL nScCol, SCROW nScRow, SCTAB nScTab ) const
    SAL_WARN_UNUSED_RESULT bool IsColRowTabValid( SCCOL nScCol, SCROW nScRow, SCTAB nScTab ) const
    {
        return IsColValid( nScCol ) && ValidRow( nScRow ) && ValidTab( nScTab );
    }
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 5892a3b..147bba4 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -442,7 +442,7 @@ public:
                        if ( pS )
                            *pS = (*pD).Ref1;
                    }
    inline  ScComplexRefData& Ref() { return *pD; }
    ScComplexRefData& Ref() { return *pD; }
};

class SingleDoubleRefProvider
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 6a4124f..6aeb958 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -113,8 +113,8 @@ public:

    ScValidationMode GetDataMode() const    { return eDataMode; }

    inline sal_Int16 GetListType() const                { return mnListType; }
    inline void     SetListType( sal_Int16 nListType )  { mnListType = nListType; }
    sal_Int16 GetListType() const                { return mnListType; }
    void     SetListType( sal_Int16 nListType )  { mnListType = nListType; }

    /** Returns true, if the validation cell will show a selection list.
        @descr  Use this instead of GetListType() which returns the raw property
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 4e9be26..634d464 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -39,20 +39,20 @@ public:
    void Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const;   // saving of the numberformats
    void PutFormatIndex(sal_uInt32 nFormat, SvNumberFormatter& rFormatter);
    sal_uInt32 GetFormatIndex( SvNumberFormatter& rFormatter);
    inline bool operator==(const ScNumFormatAbbrev& rNumFormat) const
    bool operator==(const ScNumFormatAbbrev& rNumFormat) const
    {
        return ((sFormatstring == rNumFormat.sFormatstring)
            && (eLanguage == rNumFormat.eLanguage)
            && (eSysLanguage == rNumFormat.eSysLanguage));
    }
    inline ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
    ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
    {
        sFormatstring = rNumFormat.sFormatstring;
        eLanguage = rNumFormat.eLanguage;
        eSysLanguage = rNumFormat.eSysLanguage;
        return *this;
    }
    inline LanguageType GetLanguage() const { return eLanguage; }
    LanguageType GetLanguage() const { return eLanguage; }
};

#endif
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 4d24871..1a67cb5 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -570,15 +570,15 @@ namespace {
struct ScDPSaveGroupDimNameFunc
{
    OUString       maDimName;
    inline explicit     ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {}
    inline bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; }
    explicit     ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {}
    bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; }
};

struct ScDPSaveGroupSourceNameFunc
{
    OUString       maSrcDimName;
    inline explicit     ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {}
    inline bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; }
    explicit     ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {}
    bool         operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; }
};

} // namespace
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 965d843..2bc0e99 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -166,7 +166,7 @@ public:
    /** Returns the drawing layer page of the sheet contained in maPos. */
    SdrPage*            GetDrawPage();
    /** Returns the caption drawing object. */
    inline ScCaptionPtr GetCaption() { return mxCaption; }
    ScCaptionPtr GetCaption() { return mxCaption; }

    /** Moves the caption inside the passed rectangle. Uses page area if 0 is passed. */
    void                FitCaptionToRect( const Rectangle* pVisRect = nullptr );
@@ -188,7 +188,7 @@ private:
    /** Initializes all members. */
    void                Initialize();
    /** Returns the passed rectangle if existing, page rectangle otherwise. */
    inline const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; }
    const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; }

private:
    ScDocument&         mrDoc;
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 08d2d6b..f7d921b 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -555,7 +555,7 @@ namespace {
class ScStringTokenIterator
{
public:
    inline explicit             ScStringTokenIterator( ScTokenArray& rTokArr ) :
    explicit             ScStringTokenIterator( ScTokenArray& rTokArr ) :
                                    mrTokArr( rTokArr ), mbSkipEmpty( true ), mbOk( true ) {}

    /** Returns the string of the first string token or NULL on error or empty token array. */
@@ -564,7 +564,7 @@ public:
    rtl_uString* Next();

    /** Returns false, if a wrong token has been found. Does NOT return false on end of token array. */
    inline bool                 Ok() const { return mbOk; }
    bool                 Ok() const { return mbOk; }

private:
    svl::SharedString maCurString; /// Current string.
diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx
index d94bf7424..13f69d9 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -94,7 +94,7 @@ public:
    }

private:
    inline double executeSSE2(size_t& i, const double* pCurrent) const
    double executeSSE2(size_t& i, const double* pCurrent) const
    {
#if defined(LO_SSE2_AVAILABLE)
        double fSum = 0.0;
@@ -144,7 +144,7 @@ private:
#endif
    }

    inline double executeUnrolled(size_t& i, const double* pCurrent) const
    double executeUnrolled(size_t& i, const double* pCurrent) const
    {
        size_t nRealSize = mnSize - i;
        size_t nUnrolledSize = nRealSize - (nRealSize % 4);
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 654edc0..b55c478 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -66,20 +66,20 @@ public:

    ScBroadcastArea( const ScRange& rRange );

    inline SvtBroadcaster&       GetBroadcaster()       { return aBroadcaster; }
    inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
    inline void         UpdateRange( const ScRange& rNewRange )
    SvtBroadcaster&       GetBroadcaster()       { return aBroadcaster; }
    const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
    void         UpdateRange( const ScRange& rNewRange )
                            { aRange = rNewRange; }
    inline const ScRange&   GetRange() const { return aRange; }
    inline void         IncRef() { ++nRefCount; }
    inline sal_uLong        DecRef() { return nRefCount ? --nRefCount : 0; }
    inline sal_uLong        GetRef() { return nRefCount; }
    inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
    inline void         SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
    inline bool         IsInUpdateChain() const { return mbInUpdateChain; }
    inline void         SetInUpdateChain( bool b ) { mbInUpdateChain = b; }
    const ScRange&   GetRange() const { return aRange; }
    void         IncRef() { ++nRefCount; }
    sal_uLong        DecRef() { return nRefCount ? --nRefCount : 0; }
    sal_uLong        GetRef() { return nRefCount; }
    ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
    void         SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
    bool         IsInUpdateChain() const { return mbInUpdateChain; }
    void         SetInUpdateChain( bool b ) { mbInUpdateChain = b; }

    inline bool IsGroupListening() const { return mbGroupListening; }
    bool IsGroupListening() const { return mbGroupListening; }
    void SetGroupListening( bool b ) { mbGroupListening = b; }

    /** Equalness of this or range. */
@@ -265,14 +265,14 @@ private:
    public:
                                        TableSlots();
                                        ~TableSlots();
        inline ScBroadcastAreaSlot**    getSlots() { return ppSlots; }
        ScBroadcastAreaSlot**    getSlots() { return ppSlots; }

        /**
            Obtain slot pointer, no check on validity! It is assumed that
            all calls are made with the results of ComputeSlotOffset(),
            ComputeAreaPoints() and ComputeNextSlot()
          */
        inline ScBroadcastAreaSlot*     getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); }
        ScBroadcastAreaSlot*     getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); }

    private:
        ScBroadcastAreaSlot**   ppSlots;
@@ -327,10 +327,10 @@ public:

    /// @return: how many removed
    size_t              RemoveBulkArea( const ScBroadcastArea* p );
    inline void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; }
    inline ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; }
    inline void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; }
    inline bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; }
    void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; }
    ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; }
    void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; }
    bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; }

    // only for ScBroadcastAreaSlot
    void                PushAreaToBeErased( ScBroadcastAreaSlot* pSlot,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bbd18dd..ae47fc4 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -289,7 +289,7 @@ void PushTempTokenWithoutError( const formula::FormulaToken* );
    If nGlobalError is not set do nothing.
    Used in PushTempToken() and alike to simplify handling.
    @return: <TRUE/> if nGlobalError. */
inline bool IfErrorPushError()
bool IfErrorPushError()
{
    if (nGlobalError != FormulaError::NONE)
    {
@@ -441,7 +441,7 @@ void ScTableOp();                                       // repeated operations

// common helper functions

inline void CurFmtToFuncFmt()
void CurFmtToFuncFmt()
    { nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }

/** Check if a double is suitable as string position or length argument.
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 4df70f0..004c82c 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -86,7 +86,7 @@ public:

                                /** Whether OpCode has a parameter of type
                                    ForceArray or ReferenceOrForceArray. */
    static  inline  bool        HasForceArray( OpCode eOp)
    static  bool        HasForceArray( OpCode eOp)
                                    {
                                        return 0 <= (short)eOp &&
                                            eOp <= SC_OPCODE_LAST_OPCODE_ID &&
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index efd1029..5742734 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -48,7 +48,7 @@ namespace {

struct MatrixAdd : public ::std::binary_function<double,double,double>
{
    inline double operator() (const double& lhs, const double& rhs) const
    double operator() (const double& lhs, const double& rhs) const
    {
        return ::rtl::math::approxAdd( lhs,rhs);
    }
@@ -56,7 +56,7 @@ struct MatrixAdd : public ::std::binary_function<double,double,double>

struct MatrixSub : public ::std::binary_function<double,double,double>
{
    inline double operator() (const double& lhs, const double& rhs) const
    double operator() (const double& lhs, const double& rhs) const
    {
        return ::rtl::math::approxSub( lhs,rhs);
    }
@@ -64,7 +64,7 @@ struct MatrixSub : public ::std::binary_function<double,double,double>

struct MatrixMul : public ::std::binary_function<double,double,double>
{
    inline double operator() (const double& lhs, const double& rhs) const
    double operator() (const double& lhs, const double& rhs) const
    {
        return lhs * rhs;
    }
@@ -72,7 +72,7 @@ struct MatrixMul : public ::std::binary_function<double,double,double>

struct MatrixDiv : public ::std::binary_function<double,double,double>
{
    inline double operator() (const double& lhs, const double& rhs) const
    double operator() (const double& lhs, const double& rhs) const
    {
        return ScInterpreter::div( lhs,rhs);
    }
@@ -80,7 +80,7 @@ struct MatrixDiv : public ::std::binary_function<double,double,double>

struct MatrixPow : public ::std::binary_function<double,double,double>
{
    inline double operator() (const double& lhs, const double& rhs) const
    double operator() (const double& lhs, const double& rhs) const
    {
        return ::pow( lhs,rhs);
    }
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 181eb60..c7db4c0 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -238,7 +238,7 @@ struct XclExpChRootData : public XclChRootData
    XclChFrBlockVector  maWrittenFrBlocks;      /// Stack of future record levels already written out.
    XclChFrBlockVector  maUnwrittenFrBlocks;    /// Stack of future record levels not yet written out.

    inline explicit     XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {}
    explicit     XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {}

    /** Registers a new future record level. */
    void                RegisterFutureRecBlock( const XclChFrBlock& rFrBlock );
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index dae805f..126e139 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -62,14 +62,14 @@ struct XclExpHashEntry
{
    const XclExpString* mpString;       /// Pointer to the string (no ownership).
    sal_uInt32          mnSstIndex;     /// The SST index of this string.
    inline explicit     XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) :
    explicit     XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) :
                            mpString( pString ), mnSstIndex( nSstIndex ) {}
};

/** Function object for strict weak ordering. */
struct XclExpHashEntrySWO
{
    inline bool         operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const
    bool         operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const
                            { return *rLeft.mpString < *rRight.mpString; }
};

diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 9326121..79dce1e 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -57,10 +57,10 @@ struct XclExpScToken
    const FormulaToken* mpScToken;          /// Currently processed Calc token.
    sal_uInt8           mnSpaces;           /// Number of spaces before the Calc token.

    inline explicit     XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {}
    inline bool         Is() const { return mpScToken != nullptr; }
    inline StackVar     GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
    inline OpCode       GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
    explicit     XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {}
    bool         Is() const { return mpScToken != nullptr; }
    StackVar     GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); }
    OpCode       GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
};

/** Effective token class conversion types. */
@@ -83,7 +83,7 @@ struct XclExpTokenConvInfo
    or for all parameters of a function. */
struct XclExpOperandList : public std::vector< XclExpTokenConvInfo >
{
    inline explicit     XclExpOperandList() { reserve( 2 ); }
    explicit     XclExpOperandList() { reserve( 2 ); }
    void                AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eConv, bool bValType );
};

@@ -106,7 +106,7 @@ struct XclExpExtFuncData
    bool                mbVBasic;           /// True = Visual Basic macro call.
    bool                mbHidden;           /// True = Create hidden defined name.

    inline explicit     XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {}
    explicit     XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {}
    void                Set( const OUString& rFuncName, bool bVBasic, bool bHidden );
};

@@ -126,30 +126,30 @@ public:
                            const XclFunctionInfo& rFuncInfo,
                            const XclExpExtFuncData& rExtFuncData );

    inline const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; }
    inline OpCode       GetOpCode() const { return mrFuncInfo.meOpCode; }
    inline sal_uInt16   GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; }
    inline bool         IsVolatile() const { return mrFuncInfo.IsVolatile(); }
    inline bool         IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); }
    inline bool         IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); }
    inline bool         IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); }
    inline sal_uInt8    GetSpaces() const { return mrTokData.mnSpaces; }
    inline const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; }
    inline sal_uInt8    GetReturnClass() const { return mrFuncInfo.mnRetClass; }
    const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; }
    OpCode       GetOpCode() const { return mrFuncInfo.meOpCode; }
    sal_uInt16   GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; }
    bool         IsVolatile() const { return mrFuncInfo.IsVolatile(); }
    bool         IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); }
    bool         IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); }
    bool         IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); }
    sal_uInt8    GetSpaces() const { return mrTokData.mnSpaces; }
    const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; }
    sal_uInt8    GetReturnClass() const { return mrFuncInfo.mnRetClass; }

    const XclFuncParamInfo& GetParamInfo() const;
    bool                IsCalcOnlyParam() const;
    bool                IsExcelOnlyParam() const;
    void                IncParamInfoIdx();

    inline sal_uInt8    GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; }
    inline sal_uInt8    GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; }
    inline sal_uInt8    GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); }
    sal_uInt8    GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; }
    sal_uInt8    GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; }
    sal_uInt8    GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); }
    void                FinishParam( sal_uInt16 nTokPos );
    const XclExpOperandListRef& GetOperandList() const { return mxOperands; }

    inline ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; }
    inline void         AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); }
    ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; }
    void         AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); }

private:
    ScfUInt16Vec        maAttrPosVec;       /// Token array positions of tAttr tokens.
@@ -315,7 +315,7 @@ public:

private:
    const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const;
    inline sal_uInt16   GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); }
    sal_uInt16   GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); }

    void                Init( XclFormulaType eType );
    void                Init( XclFormulaType eType, const ScTokenArray& rScTokArr,
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 8ecd717..46a7e77 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -54,7 +54,7 @@ public:
                            const OUString& rName, sal_uInt16 nFlags = 0 );

    /** Returns the name string of the external name. */
    inline const OUString& GetName() const { return maName; }
    const OUString& GetName() const { return maName; }

private:
    /** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */
@@ -197,7 +197,7 @@ public:
                            ScExternalRefCache::TableTypeRef const & xCacheTable );

    /** Returns the external sheet name. */
    inline const XclExpString& GetTabName() const { return maTabName; }
    const XclExpString& GetTabName() const { return maTabName; }

    /** Stores all cells in the given range in the CRN list. */
    void                StoreCellRange( const ScRange& rRange );
@@ -373,12 +373,12 @@ struct XclExpXti
    sal_uInt16          mnFirstSBTab;   /// Index to the first sheet of the range in the SUPBOOK.
    sal_uInt16          mnLastSBTab;    /// Index to the last sheet of the range in the SUPBOOK.

    inline explicit     XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {}
    inline explicit     XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) :
    explicit     XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {}
    explicit     XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) :
                            mnSupbook( nSupbook ), mnFirstSBTab( nFirstSBTab ), mnLastSBTab( nLastSBTab ) {}

    /** Writes this XTI structure (inside of the EXTERNSHEET record). */
    inline void         Save( XclExpStream& rStrm ) const
    void         Save( XclExpStream& rStrm ) const
                            { rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; }
};

@@ -444,7 +444,7 @@ public:
    {
        sal_uInt16          mnSupbook;          /// SUPBOOK index for an Excel sheet.
        sal_uInt16          mnSBTab;            /// Sheet name index in SUPBOOK for an Excel sheet.
        inline void         Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab )
        void         Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab )
                                { mnSupbook = nSupbook; mnSBTab = nSBTab; }
    };
    typedef ::std::vector< XclExpSBIndex > XclExpSBIndexVec;
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index bfd76c6..fbedae4 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -61,18 +61,18 @@ public:
    void                SetSymbol( const OUString& rValue );

    /** Returns the original name (title) of this defined name. */
    inline const OUString& GetOrigName() const { return maOrigName; }
    const OUString& GetOrigName() const { return maOrigName; }
    /** Returns the Excel built-in name index of this defined name.
        @return  The built-in name index or EXC_BUILTIN_UNKNOWN for user-defined names. */
    inline sal_Unicode  GetBuiltInName() const { return mcBuiltIn; }
    sal_Unicode  GetBuiltInName() const { return mcBuiltIn; }

    /** Returns the token array for this defined name. */
    const XclTokenArrayRef& GetTokenArray() const { return mxTokArr; }

    /** Returns true, if this is a document-global defined name. */
    inline bool         IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; }
    bool         IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; }
    /** Returns the Calc sheet of a local defined name. */
    inline SCTAB        GetScTab() const { return mnScTab; }
    SCTAB        GetScTab() const { return mnScTab; }

    /** Returns true, if this defined name is volatile. */
    bool                IsVolatile() const;
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 7a388d8..4423955 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -63,12 +63,12 @@ struct XclHasher : public ::std::unary_function< Type, sal_uInt32 > {};
template< typename Type >
struct XclDirectHasher : public XclHasher< Type >
{
    inline sal_uInt32   operator()( Type nVal ) const { return nVal; }
    sal_uInt32   operator()( Type nVal ) const { return nVal; }
};

struct XclFormatRunHasher : public XclHasher< const XclFormatRun& >
{
    inline sal_uInt32   operator()( const XclFormatRun& rRun ) const
    sal_uInt32   operator()( const XclFormatRun& rRun ) const
                            { return (rRun.mnChar << 8) ^ rRun.mnFontIdx; }
};

diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index ab7dd9df..529b086 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -139,16 +139,16 @@ public:
    explicit            XclListColor( const Color& rColor, sal_uInt32 nColorId );

    /** Returns the RGB color value of the color. */
    inline const Color& GetColor() const { return maColor; }
    const Color& GetColor() const { return maColor; }
    /** Returns the unique ID of the color. */
    inline sal_uInt32   GetColorId() const { return mnColorId; }
    sal_uInt32   GetColorId() const { return mnColorId; }
    /** Returns the current weighting of the color. */
    inline sal_uInt32   GetWeighting() const { return mnWeight; }
    sal_uInt32   GetWeighting() const { return mnWeight; }
    /** Returns true, if this color is a base color, i.e. it will not be removed or merged. */
    inline bool         IsBaseColor() const { return mbBaseColor; }
    bool         IsBaseColor() const { return mbBaseColor; }

    /** Adds the passed weighting to this color. */
    inline void         AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; }
    void         AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; }
    /** Merges this color with rColor, regarding weighting settings. */
    void                Merge( const XclListColor& rColor );
};
@@ -185,7 +185,7 @@ struct XclColorIdData
    Color               maColor;        /// The original inserted color.
    sal_uInt32          mnIndex;        /// Maps current color ID to color list or export color vector.
    /** Sets the contents of this struct. */
    inline void         Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
    void         Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; }
};

/** A color that will be written to the Excel file. */
@@ -194,8 +194,8 @@ struct XclPaletteColor
    Color               maColor;        /// Resulting color to export.
    bool                mbUsed;         /// true = Entry is used in the document.

    inline explicit     XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {}
    inline void         SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; }
    explicit     XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {}
    void         SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; }
};

/** Maps a color list index to a palette index.
@@ -205,8 +205,8 @@ struct XclRemap
    sal_uInt32          mnPalIndex;     /// Index to palette.
    bool                mbProcessed;    /// true = List color already processed.

    inline explicit     XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {}
    inline void         SetIndex( sal_uInt32 nPalIndex )
    explicit     XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {}
    void         SetIndex( sal_uInt32 nPalIndex )
                            { mnPalIndex = nPalIndex; mbProcessed = true; }
};

@@ -216,7 +216,7 @@ struct XclNearest
    sal_uInt32          mnPalIndex;     /// Index to nearest palette color.
    sal_Int32           mnDist;         /// Distance to palette color.

    inline explicit     XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {}
    explicit     XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {}
};

} // namespace
@@ -259,7 +259,7 @@ public:

private:
    /** Returns the Excel index of a 0-based color index. */
    static inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex )
    static sal_uInt16 GetXclIndex( sal_uInt32 nIndex )
                            { return static_cast< sal_uInt16 >( nIndex + EXC_COLOR_USEROFFSET ); }

    /** Returns the original inserted color represented by the color ID nColorId. */
@@ -1331,8 +1331,8 @@ size_t XclExpFontBuffer::Find( const XclFontData& rFontData )
struct XclExpNumFmtPred
{
    sal_uLong               mnScNumFmt;
    inline explicit     XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
    inline bool         operator()( const XclExpNumFmt& rFormat ) const
    explicit     XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
    bool         operator()( const XclExpNumFmt& rFormat ) const
                            { return rFormat.mnScNumFmt == mnScNumFmt; }
};

@@ -2379,7 +2379,7 @@ struct XclExpBorderPred
{
    const XclExpCellBorder&
                        mrBorder;
    inline explicit     XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {}
    explicit     XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {}
    bool                operator()( const XclExpCellBorder& rBorder ) const;
};

@@ -2409,7 +2409,7 @@ struct XclExpFillPred
{
    const XclExpCellArea&
                        mrFill;
    inline explicit     XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {}
    explicit     XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {}
    bool                operator()( const XclExpCellArea& rFill ) const;
};

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 1dcde34..d7fb26f 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -206,7 +206,7 @@ struct XclImpChRootData : public XclChRootData
{
    XclImpChChart&      mrChartData;            /// The chart data object.

    inline explicit     XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {}
    explicit     XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {}
};

XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) :
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 25c2ece..1784a56 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -65,7 +65,7 @@ public:
        The sheet index is set while creating the Calc sheet with CreateTable(). */
    explicit            XclImpSupbookTab( const OUString& rTabName );

    inline const OUString& GetTabName() const { return maTabName; }
    const OUString& GetTabName() const { return maTabName; }

    /** Reads a CRN record (external referenced cell) at the specified address. */
    void                ReadCrn( XclImpStream& rStrm, const XclAddress& rXclPos );
@@ -99,10 +99,10 @@ public:
    void                ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv );

    /** Returns the SUPBOOK record type. */
    inline XclSupbookType GetType() const { return meType; }
    XclSupbookType GetType() const { return meType; }

    /** Returns the URL of the external document. */
    inline const OUString& GetXclUrl() const { return maXclUrl; }
    const OUString& GetXclUrl() const { return maXclUrl; }

    /** Returns the external name specified by an index from the Excel document (one-based). */
    const XclImpExtName* GetExternName( sal_uInt16 nXclIndex ) const;
@@ -143,7 +143,7 @@ struct XclImpXti
    sal_uInt16          mnSupbook;      /// Index to SUPBOOK record.
    sal_uInt16          mnSBTabFirst;   /// Index to the first sheet of the range in the SUPBOOK.
    sal_uInt16          mnSBTabLast;    /// Index to the last sheet of the range in the SUPBOOK.
    inline explicit     XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
    explicit     XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {}
};

inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index b7111bc..d7e6c5a 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1588,7 +1588,7 @@ namespace {
/** Functor for case-insensitive string comparison, usable in maps etc. */
struct IgnoreCaseCompare
{
    inline bool operator()( const OUString& rName1, const OUString& rName2 ) const
    bool operator()( const OUString& rName1, const OUString& rName2 ) const
        { return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; }
};

diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 2c0ea0f..374fc625 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -387,15 +387,15 @@ const XclCodePageEntry* const pCodePageTableEnd = std::end(pCodePageTable);

struct XclCodePageEntry_CPPred
{
    inline explicit     XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {}
    inline bool         operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; }
    explicit     XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {}
    bool         operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; }
    sal_uInt16          mnCodePage;
};

struct XclCodePageEntry_TEPred
{
    inline explicit     XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {}
    inline bool         operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; }
    explicit     XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {}
    bool         operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; }
    rtl_TextEncoding    meTextEnc;
};

diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index aa28b5b..5e31859 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1783,8 +1783,8 @@ private:
public:
    explicit            ScHTMLTableMap( ScHTMLTable& rParentTable );

    inline const_iterator begin() const { return maTables.begin(); }
    inline const_iterator end() const { return maTables.end(); }
    const_iterator begin() const { return maTables.begin(); }
    const_iterator end() const { return maTables.end(); }

    /** Returns the specified table.
        @param nTableId  Unique identifier of the table.
@@ -1797,7 +1797,7 @@ public:

private:
    /** Sets a working table with its index for search optimization. */
    inline void         SetCurrTable( ScHTMLTable* pTable ) const
    void         SetCurrTable( ScHTMLTable* pTable ) const
                            { if( pTable ) mpCurrTable = pTable; }
};

@@ -1849,9 +1849,9 @@ public:
        @param pTableMap  Pointer to the table map (is allowed to be NULL). */
    explicit            ScHTMLTableIterator( const ScHTMLTableMap* pTableMap );

    inline bool         is() const { return mpTableMap && maIter != maEnd; }
    inline ScHTMLTable* operator->() { return maIter->second.get(); }
    inline ScHTMLTableIterator& operator++() { ++maIter; return *this; }
    bool         is() const { return mpTableMap && maIter != maEnd; }
    ScHTMLTable* operator->() { return maIter->second.get(); }
    ScHTMLTableIterator& operator++() { ++maIter; return *this; }

private:
    ScHTMLTableMap::const_iterator maIter;
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 65d8dd4..cdf4729 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -50,7 +50,7 @@ private:
public:
                                XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID );

    inline const sal_uInt8*     GetGUID() const { return aGUID; }
    const sal_uInt8*     GetGUID() const { return aGUID; }

    virtual sal_uInt16              GetNum() const override;
    virtual std::size_t         GetLen() const override;
@@ -70,8 +70,8 @@ public:
                                XclExpUserBViewList( const ScChangeTrack& rChangeTrack );
    virtual                     ~XclExpUserBViewList() override;

    inline const_iterator cbegin () { return aViews.cbegin(); }
    inline const_iterator cend () { return aViews.cend(); }
    const_iterator cbegin () { return aViews.cbegin(); }
    const_iterator cend () { return aViews.cend(); }

    virtual void                Save( XclExpStream& rStrm ) override;
};
@@ -160,7 +160,7 @@ private:
    sal_uInt16                      nRecNum;

public:
    inline                      XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {}
    XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {}
    virtual                     ~XclExpChTrEmpty() override;

    virtual sal_uInt16              GetNum() const override;
@@ -216,11 +216,11 @@ private:
    virtual void                SaveCont( XclExpStream& rStrm ) override;

public:
    inline                      XclExpChTrHeader() : nCount( 0 ) {}
    XclExpChTrHeader() : nCount( 0 ) {}
    virtual                     ~XclExpChTrHeader() override;

    inline void                 SetGUID( const sal_uInt8* pGUID )   { memcpy( aGUID, pGUID, 16 ); }
    inline void                 SetCount( sal_uInt32 nNew )         { nCount = nNew; }
    void                 SetGUID( const sal_uInt8* pGUID )   { memcpy( aGUID, pGUID, 16 ); }
    void                 SetCount( sal_uInt32 nNew )         { nCount = nNew; }

    virtual sal_uInt16              GetNum() const override;
    virtual std::size_t         GetLen() const override;
@@ -305,9 +305,9 @@ public:
    sal_uInt16                  GetId( sal_uInt16 nIndex ) const;
    void                        Remove();

    inline sal_uInt16           GetBufferCount() const
    sal_uInt16           GetBufferCount() const
                                    { return static_cast< sal_uInt16 >( (pLast - pBuffer.get()) + 1 ); }
    inline void                 GetBufferCopy( sal_uInt16* pDest ) const
    void                 GetBufferCopy( sal_uInt16* pDest ) const
                                    { memcpy( pDest, pBuffer.get(), sizeof(sal_uInt16) * GetBufferCount() ); }
};

@@ -319,12 +319,12 @@ private:
    sal_uInt16*                 pBuffer;
    sal_uInt16                  nTabCount;

    inline void                 Clear() { delete[] pBuffer; pBuffer = nullptr; }
    void                 Clear() { delete[] pBuffer; pBuffer = nullptr; }

    virtual void                SaveCont( XclExpStream& rStrm ) override;

public:
    inline                      XclExpChTrTabId( sal_uInt16 nCount ) :
    XclExpChTrTabId( sal_uInt16 nCount ) :
                                    pBuffer( nullptr ), nTabCount( nCount ) {}
                                XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer );
    virtual                     ~XclExpChTrTabId() override;
@@ -369,7 +369,7 @@ protected:

                                // save header data, call SaveActionData()
    virtual void                SaveCont( XclExpStream& rStrm ) override;
    static inline std::size_t   GetHeaderByteCount() { return 12; }
    static std::size_t   GetHeaderByteCount() { return 12; }

                                // override to save action data without header, called by SaveCont()
    virtual void                SaveActionData( XclExpStream& rStrm ) const = 0;
@@ -381,7 +381,7 @@ protected:
                                // do something after writing the record
    virtual void                CompleteSaveAction( XclExpStream& rStrm ) const;

    inline bool                 GetAccepted() const { return bAccepted; }
    bool                 GetAccepted() const { return bAccepted; }

public:
                                XclExpChTrAction(
@@ -391,10 +391,10 @@ public:
                                    sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN );
    virtual                     ~XclExpChTrAction() override;

    inline const OUString&      GetUsername() const             { return sUsername; }
    inline const DateTime&      GetDateTime() const             { return aDateTime; }
    inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const  { return rIdBuffer; }
    inline bool                 ForceInfoRecord() const         { return bForceInfo; }
    const OUString&      GetUsername() const             { return sUsername; }
    const DateTime&      GetDateTime() const             { return aDateTime; }
    const XclExpChTrTabIdBuffer& GetTabIdBuffer() const  { return rIdBuffer; }
    bool                 ForceInfoRecord() const         { return bForceInfo; }

                                // set own index & return new index
                                // could override to use more indexes per action
@@ -403,8 +403,8 @@ public:
    virtual void                Save( XclExpStream& rStrm ) override;
    virtual std::size_t         GetLen() const override;

    inline XclExpChTrAction*    GetAddAction() { return pAddAction.get(); }
    inline sal_uInt32           GetActionNumber() const { return nIndex; }
    XclExpChTrAction*    GetAddAction() { return pAddAction.get(); }
    sal_uInt32           GetActionNumber() const { return nIndex; }
};

inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress )
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index f38e53e..82e1f2b 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -63,7 +63,7 @@ private:
    enum { nmBase, nmFound, nmNested }
                                eNestedMode;    // action with nested content actions

    inline bool                 FoundNestedMode() { return eNestedMode == nmFound; }
    bool                 FoundNestedMode() { return eNestedMode == nmFound; }

    void                        DoAcceptRejectAction( ScChangeAction* pAction );
    void                        DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast );
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index a72e661..713476b 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -34,9 +34,9 @@ struct BinAddress
    sal_Int32           mnCol;
    sal_Int32           mnRow;

    inline explicit     BinAddress() : mnCol( 0 ), mnRow( 0 ) {}
    inline explicit     BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
    inline explicit     BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}
    explicit     BinAddress() : mnCol( 0 ), mnRow( 0 ) {}
    explicit     BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
    explicit     BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}

    void                read( SequenceInputStream& rStrm );
};
@@ -71,7 +71,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& or
class BinRangeList
{
public:
    inline explicit     BinRangeList() : mvRanges() {}
    explicit     BinRangeList() : mvRanges() {}

    ::std::vector< BinRange >::const_iterator begin() const { return mvRanges.begin(); }
    ::std::vector< BinRange >::const_iterator end() const { return mvRanges.end(); }
@@ -147,17 +147,17 @@ public:
                            sal_Int32 nStart = 0 );

    /** Returns the biggest valid cell address in the own Calc document. */
    inline const ScAddress&
    const ScAddress&
                        getMaxApiAddress() const { return maMaxApiPos; }

    /** Returns the biggest valid cell address in the imported/exported
        Excel document. */
    inline const ScAddress&
    const ScAddress&
                        getMaxXlsAddress() const { return maMaxXlsPos; }

    /** Returns the biggest valid cell address in both Calc and the
        imported/exported Excel document. */
    inline const ScAddress&
    const ScAddress&
                        getMaxAddress() const { return maMaxPos; }

    /** Checks if the passed column index is valid.
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index f2aface..0f1cd52 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -166,7 +166,7 @@ public:

    /** Creates and returns the specified filter settings object. */
    template< typename FilterSettingsType >
    inline FilterSettingsBase& createFilterSettings()
    FilterSettingsBase& createFilterSettings()
        { mxSettings.reset( new FilterSettingsType( *this ) ); return *mxSettings; }

    /** Returns converted UNO API filter settings representing all filter
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index 5807ae6..4548ff6 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -42,7 +42,7 @@ public:
    virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override;

    /** Returns true, if the decoder has been initialized correctly. */
    inline bool         isValid() const { return mbValid; }
    bool         isValid() const { return mbValid; }

private:
    /** Derived classes implement password verification and initialization of
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index a0c7aec..cb7bbf4 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -164,7 +164,7 @@ public:
    void                finalizeImport();

    /** Returns the priority of this rule. */
    inline sal_Int32    getPriority() const { return maModel.mnPriority; }
    sal_Int32    getPriority() const { return maModel.mnPriority; }

    ColorScaleRule*     getColorScale();
    DataBarRule*        getDataBar();
@@ -210,7 +210,7 @@ public:
    void                finalizeImport();

    /** Returns the cell ranges this conditional formatting belongs to. */
    inline const ScRangeList& getRanges() const { return maModel.maRanges; }
    const ScRangeList& getRanges() const { return maModel.maRanges; }

    void                setReadyForFinalize() { mbReadyForFinalize = true; }
private:
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index fefdef0..3c29cc3 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -114,9 +114,9 @@ public:
    void                importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId );

    /** Returns the unique connection identifier. */
    inline sal_Int32    getConnectionId() const { return maModel.mnId; }
    sal_Int32    getConnectionId() const { return maModel.mnId; }
    /** Returns the source data type of the connection. */
    inline sal_Int32    getConnectionType() const { return maModel.mnType; }
    sal_Int32    getConnectionType() const { return maModel.mnType; }
    /** Returns read-only access to the connection model data. */
    const ConnectionModel& getModel() const { return maModel; }

diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index fed44d8..b0d2473 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -68,9 +68,9 @@ public:
    explicit            DefinedNameBase( const WorkbookHelper& rHelper );

    /** Returns the original name as imported from or exported to the file. */
    inline const OUString& getModelName() const { return maModel.maName; }
    const OUString& getModelName() const { return maModel.maName; }
    /** Returns the name as used in the Calc document. */
    inline const OUString& getCalcName() const { return maCalcName; }
    const OUString& getCalcName() const { return maCalcName; }

    /** Returns the original name as imported from or exported to the file. */
    const OUString& getUpcaseModelName() const;
@@ -102,20 +102,20 @@ public:
    void                convertFormula( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks );
    std::unique_ptr<ScTokenArray> getScTokens( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks );
    /** Returns true, if this defined name is global in the document. */
    inline bool         isGlobalName() const { return mnCalcSheet < 0; }
    bool         isGlobalName() const { return mnCalcSheet < 0; }
    /** Returns true, if this defined name is a special builtin name. */
    inline bool         isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; }
    bool         isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; }
    /** Returns true, if this defined name is a macro function call. */
    inline bool         isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; }
    bool         isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; }
    /** Returns true, if this defined name is a reference to a VBA macro. */
    inline bool         isVBName() const { return maModel.mbMacro && maModel.mbVBName; }
    bool         isVBName() const { return maModel.mbMacro && maModel.mbVBName; }

    /** Returns the 0-based sheet index for local names, or -1 for global names. */
    inline sal_Int16    getLocalCalcSheet() const { return mnCalcSheet; }
    sal_Int16    getLocalCalcSheet() const { return mnCalcSheet; }
    /** Returns the built-in identifier of the defined name. */
    inline sal_Unicode  getBuiltinId() const { return mcBuiltinId; }
    sal_Unicode  getBuiltinId() const { return mcBuiltinId; }
    /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
    inline sal_Int32    getTokenIndex() const { return mnTokenIndex; }
    sal_Int32    getTokenIndex() const { return mnTokenIndex; }
    /** Tries to resolve the defined name to an absolute cell range. */
    bool                getAbsoluteRange( ScRange& orRange ) const;

diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index ff2ca06..ae1662b 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -30,15 +30,15 @@ namespace xls {
/** Absolute position in a spreadsheet (in EMUs) independent from cells. */
struct AnchorPointModel : public ::oox::drawingml::EmuPoint
{
    inline explicit     AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
    inline bool         isValid() const { return (X >= 0) && (Y >= 0); }
    explicit     AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {}
    bool         isValid() const { return (X >= 0) && (Y >= 0); }
};

/** Absolute size in a spreadsheet (in EMUs). */
struct AnchorSizeModel : public ::oox::drawingml::EmuSize
{
    inline explicit     AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
    inline bool         isValid() const { return (Width >= 0) && (Height >= 0); }
    explicit     AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {}
    bool         isValid() const { return (Width >= 0) && (Height >= 0); }
};

/** Position in spreadsheet (cell position and offset inside cell). */
@@ -50,7 +50,7 @@ struct CellAnchorModel
    sal_Int64           mnRowOffset;        /// Y offset inside the row.

    explicit            CellAnchorModel();
    inline bool         isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
    bool         isValid() const { return (mnCol >= 0) && (mnRow >= 0); }
};

/** Application-specific client data of a shape. */
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index cbf746d..88105a1 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -124,7 +124,7 @@ public:
    void                    GetDimensions( SCCOL& nCols, SCROW& nRows ) const
                                { nCols = nColMax; nRows = nRowMax; }

    inline size_t           ListSize() const{ return maList.size(); }
    size_t           ListSize() const{ return maList.size(); }
    ScEEParseEntry*         ListEntry( size_t index ) { return maList[ index ]; }
    const ScEEParseEntry*   ListEntry( size_t index ) const { return maList[ index ]; }
};
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 8d53918..fa02e01 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -35,7 +35,7 @@ class WorkbookContextBase : public ::oox::core::ContextHandler2, public Workbook
{
public:
    template< typename ParentType >
    inline explicit     WorkbookContextBase( ParentType& rParent ) :
    explicit     WorkbookContextBase( ParentType& rParent ) :
                            ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {}
};

@@ -47,7 +47,7 @@ class WorksheetContextBase : public ::oox::core::ContextHandler2, public Workshe
{
public:
    template< typename ParentType >
    inline explicit     WorksheetContextBase( ParentType& rParent ) :
    explicit     WorksheetContextBase( ParentType& rParent ) :
                            ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {}
};

diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 02fc8c4..1c8cef4 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -87,20 +87,20 @@ public:
                                    RootData* pRoot,
                                    const ScRange& rRange);

    inline bool                 IsActive() const    { return bActive; }
    inline bool                 IsFiltered() const  { return bAutoOrAdvanced; }
    inline SCTAB                Tab() const         { return aParam.nTab; }
    inline SCCOL                StartCol() const    { return aParam.nCol1; }
    inline SCROW                StartRow() const    { return aParam.nRow1; }
    inline SCCOL                EndCol() const      { return aParam.nCol2; }
    inline SCROW                EndRow() const      { return aParam.nRow2; }
    bool                 IsActive() const    { return bActive; }
    bool                 IsFiltered() const  { return bAutoOrAdvanced; }
    SCTAB                Tab() const         { return aParam.nTab; }
    SCCOL                StartCol() const    { return aParam.nCol1; }
    SCROW                StartRow() const    { return aParam.nRow1; }
    SCCOL                EndCol() const      { return aParam.nCol2; }
    SCROW                EndRow() const      { return aParam.nRow2; }

    void ReadAutoFilter( XclImpStream& rStrm, svl::SharedStringPool& rPool );

    inline void                 Activate()          { bActive = true; }
    void                 Activate()          { bActive = true; }
    void                        SetAdvancedRange( const ScRange* pRange );
    void                        SetExtractPos( const ScAddress& rAddr );
    inline void                 SetAutoOrAdvanced()  { bAutoOrAdvanced = true; }
    void                 SetAutoOrAdvanced()  { bAutoOrAdvanced = true; }
    void                        Apply();
    void                        EnableRemoveFilter();
};
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index a299709..289444b 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -97,7 +97,7 @@ private:
protected:
    bool                    bVal;

    inline                  ExcBoolRecord() : bVal( false ) {}
    ExcBoolRecord() : bVal( false ) {}

public:
    virtual std::size_t     GetLen() const override;
@@ -256,7 +256,7 @@ protected:
public:
                            ExcBundlesheetBase( RootData& rRootData, SCTAB nTab );

    inline void             SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; }
    void             SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; }
    void                    UpdateStreamPos( XclExpStream& rStrm );

    virtual sal_uInt16          GetNum() const override;
@@ -338,8 +338,8 @@ class XclExpAutofilterinfo : public XclExpUInt16Record
public:
    explicit            XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol );

    inline const ScAddress& GetStartPos() const { return maStartPos; }
    inline SCCOL        GetColCount() const { return static_cast< SCCOL >( GetValue() ); }
    const ScAddress& GetStartPos() const { return maStartPos; }
    SCCOL        GetColCount() const { return static_cast< SCCOL >( GetValue() ); }

private:
    ScAddress           maStartPos;
@@ -359,7 +359,7 @@ public:
                            ExcFilterCondition();
                            ~ExcFilterCondition();

    inline bool             IsEmpty() const     { return (nType == EXC_AFTYPE_NOTUSED); }
    bool             IsEmpty() const     { return (nType == EXC_AFTYPE_NOTUSED); }
    std::size_t             GetTextBytes() const;

    void                    SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, OUString* pT );
@@ -388,8 +388,8 @@ private:
public:
                            XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC );

    inline sal_uInt16       GetCol() const          { return nCol; }
    inline bool             HasTop10() const        { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
    sal_uInt16       GetCol() const          { return nCol; }
    bool             HasTop10() const        { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }

    bool                    HasCondition() const;
    bool                    AddEntry( const ScQueryEntry& rEntry );
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 38d436c..a33a37d 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -38,9 +38,9 @@ public:

    ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR );

    inline void SetValue( const OUString& rVal ) { aValue = rVal; }
    void SetValue( const OUString& rVal ) { aValue = rVal; }

    inline const OUString& GetValue() const { return aValue; }
    const OUString& GetValue() const { return aValue; }
};

class ExcScenario
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index db47ce2..7114daa 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -58,7 +58,7 @@ public:

    /** Appends the passed value to the result set. */
    template< typename Type >
    inline void         appendResultValue( const Type& rValue )
    void         appendResultValue( const Type& rValue )
                            { if( maCurrIt != maResults.end() ) (*maCurrIt++) <<= rValue; }

    /** Imports the definedName element. */
@@ -117,7 +117,7 @@ typedef std::shared_ptr< ExternalName > ExternalNameRef;
class LinkSheetRange
{
public:
    inline explicit     LinkSheetRange() { setDeleted(); }
    explicit     LinkSheetRange() { setDeleted(); }

    /** Sets this struct to deleted state. */
    void                setDeleted();
@@ -129,17 +129,17 @@ public:
    void                setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal_Int32 nLast );

    /** Returns true, if the sheet indexes are valid and different. */
    inline bool         isDeleted() const { return mnFirst < 0; }
    bool         isDeleted() const { return mnFirst < 0; }
    /** Returns true, if the sheet range points to an external document. */
    inline bool         isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); }
    bool         isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); }
    /** Returns true, if the sheet indexes are valid and different. */
    inline bool         isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; }
    bool         isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; }
    /** Returns true, if the sheet indexes are valid and different. */
    inline bool         is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); }
    bool         is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); }

    inline sal_Int32    getDocLinkIndex() const { return mnDocLink; }
    inline sal_Int32    getFirstSheet() const { return mnFirst; }
    inline sal_Int32    getLastSheet() const { return mnLast; }
    sal_Int32    getDocLinkIndex() const { return mnDocLink; }
    sal_Int32    getFirstSheet() const { return mnFirst; }
    sal_Int32    getLastSheet() const { return mnLast; }

private:
    enum LinkSheetRangeType
@@ -204,17 +204,17 @@ public:
    void                importExternalAddin( SequenceInputStream& rStrm );

    /** Sets the link type to 'self reference'. */
    inline void         setSelfLinkType() { meLinkType = ExternalLinkType::Self; }
    void         setSelfLinkType() { meLinkType = ExternalLinkType::Self; }

    /** Returns the type of this external link. */
    inline ExternalLinkType getLinkType() const { return meLinkType; }
    ExternalLinkType getLinkType() const { return meLinkType; }

    /** Returns the relation identifier for the external link fragment. */
    inline const OUString& getRelId() const { return maRelId; }
    const OUString& getRelId() const { return maRelId; }
    /** Returns the class name of this external link. */
    inline const OUString& getClassName() const { return maClassName; }
    const OUString& getClassName() const { return maClassName; }
    /** Returns the target URL of this external link. */
    inline const OUString& getTargetUrl() const { return maTargetUrl; }
    const OUString& getTargetUrl() const { return maTargetUrl; }
    /** Returns the link info needed by the XML formula parser. */
    css::sheet::ExternalLinkInfo getLinkInfo() const;

diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 649c8ac..acd8944 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -48,10 +48,10 @@ class ScfApiHelper
{
public:
    /** Converts a tools color to a UNO color value. */
    inline static sal_Int32 ConvertToApiColor( const Color& rColor )
    static sal_Int32 ConvertToApiColor( const Color& rColor )
                            { return static_cast< sal_Int32 >( rColor.GetColor() ); }
    /** Converts a UNO color value to a tools color. */
    inline static Color ConvertFromApiColor( sal_Int32 nApiColor )
    static Color ConvertFromApiColor( sal_Int32 nApiColor )
                            { return Color( static_cast< ColorData >( nApiColor ) ); }

    /** Converts a non-empty vector into a UNO sequence containing elements of the same type. */
@@ -112,12 +112,12 @@ css::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< 
class ScfPropertySet
{
public:
    inline explicit     ScfPropertySet() {}
    explicit     ScfPropertySet() {}
    /** Constructs a property set wrapper with the passed UNO property set. */
    inline explicit     ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); }
    explicit     ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); }
    /** Constructs a property set wrapper after querying the XPropertySet interface. */
    template< typename InterfaceType >
    inline explicit     ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); }
    explicit     ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); }

                        ~ScfPropertySet();

@@ -125,11 +125,11 @@ public:
    void                Set( css::uno::Reference< css::beans::XPropertySet > const & xPropSet );
    /** Queries the passed interface for an XPropertySet and releases the old UNO property set. */
    template< typename InterfaceType >
    inline void         Set( css::uno::Reference< InterfaceType > xInterface )
    void         Set( css::uno::Reference< InterfaceType > xInterface )
                            { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, css::uno::UNO_QUERY ) ); }

    /** Returns true, if the contained XPropertySet interface is valid. */
    inline bool         Is() const { return mxPropSet.is(); }
    bool         Is() const { return mxPropSet.is(); }

    /** Returns the contained XPropertySet interface. */
    const css::uno::Reference< css::beans::XPropertySet >& GetApiPropertySet() const { return mxPropSet; }
@@ -149,7 +149,7 @@ public:
    /** Gets the specified property from the property set.
        @return  true, if the passed variable could be filled with the property value. */
    template< typename Type >
    inline bool         GetProperty( Type& rValue, const OUString& rPropName ) const
    bool         GetProperty( Type& rValue, const OUString& rPropName ) const
                            { css::uno::Any aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); }

    /** Gets the specified Boolean property from the property set.
@@ -175,19 +175,19 @@ public:

    /** Puts the passed value into the property set. */
    template< typename Type >
    inline void         SetProperty( const OUString& rPropName, const Type& rValue )
    void         SetProperty( const OUString& rPropName, const Type& rValue )
                            { SetAnyProperty( rPropName, css::uno::makeAny( rValue ) ); }

    /** Puts the passed Boolean value into the property set. */
    inline void         SetBoolProperty( const OUString& rPropName, bool bValue )
    void         SetBoolProperty( const OUString& rPropName, bool bValue )
                            { SetAnyProperty( rPropName, css::uno::Any( bValue ) ); }

    /** Puts the passed string into the property set. */
    inline void         SetStringProperty( const OUString& rPropName, const OUString& rValue )
    void         SetStringProperty( const OUString& rPropName, const OUString& rValue )
                            { SetProperty( rPropName, rValue ); }

    /** Puts the passed color into the property set. */
    inline void         SetColorProperty( const OUString& rPropName, const Color& rColor )
    void         SetColorProperty( const OUString& rPropName, const Color& rColor )
                            { SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); }

    /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface.
@@ -246,7 +246,7 @@ public:
    /** Writes an Any to the value sequence. */
    void                WriteValue( const css::uno::Any& rAny );
    /** Writes a color value to the value sequence. */
    inline void         WriteValue( const Color& rColor )
    void         WriteValue( const Color& rColor )
                            { WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); }
    /** Writes a C++ boolean value to the value sequence. */
    void                WriteValue( bool rbValue );
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 2171661..ba5440c 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -282,7 +282,7 @@ public:

    /** Appends a new token with the passed op-code and data. */
    template< typename Type >
    inline void         append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; }
    void         append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; }

    /** Converts to a sequence. */
    ApiTokenSequence toSequence() const;
@@ -298,8 +298,8 @@ class ApiTokenIterator
{
public:
    explicit            ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 nSpacesOpCode, bool bSkipSpaces );
    inline bool         is() const { return mpToken != mpTokenEnd; }
    inline const ApiToken* operator->() const { return mpToken; }
    bool         is() const { return mpToken != mpTokenEnd; }
    const ApiToken* operator->() const { return mpToken; }

    ApiTokenIterator&   operator++();

@@ -601,7 +601,7 @@ public:
                            const OpCodeProvider& rOpCodeProv );

    /** Returns read/write access to the formula parser property set. */
    inline PropertySet& getParserProperties() { return maParserProps; }
    PropertySet& getParserProperties() { return maParserProps; }

    /** Calls the XFormulaParser::parseFormula() function of the API parser. */
    ApiTokenSequence    parseFormula(
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 862a820..6919831 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -125,7 +125,7 @@ public:
    /** Starts the progress bar or activates another segment. */
    void                ActivateSegment( sal_Int32 nSegment );
    /** Starts the progress bar (with first segment). */
    inline void         Activate() { ActivateSegment( 0 ); }
    void         Activate() { ActivateSegment( 0 ); }
    /** Set current segment to the specified absolute position. */
    void                ProgressAbs( std::size_t nPos );
    /** Increase current segment by the passed value. */
@@ -191,7 +191,7 @@ public:
    explicit            ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId );

    /** Set progress bar to the specified position. */
    inline void         ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); }
    void         ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); }

private:
    /** Initializes and starts the progress bar. */
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 10c323d..1114b0a 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -216,7 +216,7 @@ public:
    /** Reads and returns a zero terminated byte string and decreases a stream counter. */
    static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft);
    /** Reads and returns a zero terminated byte string and decreases a stream counter. */
    inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc)
    static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc)
    {
        return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc);
    }
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 2d4c2dc..d36c70c 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -236,18 +236,18 @@ struct ScHTMLPos
    SCCOL               mnCol;
    SCROW               mnRow;

    inline explicit     ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {}
    inline explicit     ScHTMLPos( SCCOL nCol, SCROW nRow ) :
    explicit     ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {}
    explicit     ScHTMLPos( SCCOL nCol, SCROW nRow ) :
                            mnCol( nCol ), mnRow( nRow ) {}
    inline explicit     ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); }
    explicit     ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); }

    inline SCCOLROW     Get( ScHTMLOrient eOrient ) const
    SCCOLROW     Get( ScHTMLOrient eOrient ) const
                            { return (eOrient == tdCol) ? mnCol : mnRow; }
    inline void         Set( SCCOL nCol, SCROW nRow )
    void         Set( SCCOL nCol, SCROW nRow )
                            { mnCol = nCol; mnRow = nRow; }
    inline void         Set( const ScAddress& rAddr )
    void         Set( const ScAddress& rAddr )
                            { Set( rAddr.Col(), rAddr.Row() ); }
    inline ScAddress    MakeAddr() const
    ScAddress    MakeAddr() const
                            { return ScAddress( mnCol, mnRow, 0 ); }
};

@@ -262,9 +262,9 @@ struct ScHTMLSize
    SCCOL               mnCols;
    SCROW               mnRows;

    inline explicit     ScHTMLSize( SCCOL nCols, SCROW nRows ) :
    explicit     ScHTMLSize( SCCOL nCols, SCROW nRows ) :
                            mnCols( nCols ), mnRows( nRows ) {}
    inline void         Set( SCCOL nCols, SCROW nRows )
    void         Set( SCCOL nCols, SCROW nRows )
                            { mnCols = nCols; mnRows = nRows; }
};

@@ -277,16 +277,16 @@ public:
                            ScHTMLTableId nTableId = SC_HTML_NO_TABLE );

    /** Returns true, if the selection of the entry is empty. */
    inline bool         IsEmpty() const { return !aSel.HasRange(); }
    bool         IsEmpty() const { return !aSel.HasRange(); }
    /** Returns true, if the entry has any content to be imported. */
    bool                HasContents() const;
    /** Returns true, if the entry represents a table. */
    inline bool         IsTable() const { return nTab != SC_HTML_NO_TABLE; }
    bool         IsTable() const { return nTab != SC_HTML_NO_TABLE; }
    /** Returns true, if the entry represents a table. */
    inline ScHTMLTableId GetTableId() const { return nTab; }
    ScHTMLTableId GetTableId() const { return nTab; }

    /** Sets or cleares the import always state. */
    inline void         SetImportAlways() { mbImportAlways = true; }
    void         SetImportAlways() { mbImportAlways = true; }
    /** Sets start point of the entry selection to the start of the import info object. */
    void                AdjustStart( const ImportInfo& rInfo );
    /** Sets end point of the entry selection to the end of the import info object. */
@@ -295,9 +295,9 @@ public:
    void                Strip( const EditEngine& rEditEngine );

    /** Returns read/write access to the item set of this entry. */
    inline SfxItemSet&  GetItemSet() { return aItemSet; }
    SfxItemSet&  GetItemSet() { return aItemSet; }
    /** Returns read-only access to the item set of this entry. */
    inline const SfxItemSet& GetItemSet() const { return aItemSet; }
    const SfxItemSet& GetItemSet() const { return aItemSet; }

private:
    bool                mbImportAlways;     /// true = Always import this entry.
@@ -338,9 +338,9 @@ public:
    virtual             ~ScHTMLTable();

    /** Returns the name of the table, specified in the TABLE tag. */
    inline const OUString& GetTableName() const { return maTableName; }
    const OUString& GetTableName() const { return maTableName; }
    /** Returns the unique identifier of the table. */
    inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; }
    ScHTMLTableId GetTableId() const { return maTableId.mnTableId; }
    /** Returns the cell spanning of the specified cell. */
    ScHTMLSize          GetSpan( const ScHTMLPos& rCellPos ) const;

@@ -408,7 +408,7 @@ public:
    ScHTMLSize          GetDocSize( const ScHTMLPos& rCellPos ) const;

    /** Returns the resulting Calc position of the top left edge of the table. */
    inline const ScHTMLPos& GetDocPos() const { return maDocBasePos; }
    const ScHTMLPos& GetDocPos() const { return maDocBasePos; }
    /** Calculates the resulting Calc position of the specified HTML column/row. */
    SCCOLROW            GetDocPos( ScHTMLOrient eOrient, SCCOLROW nCellPos ) const;
    /** Calculates the resulting Calc position of the specified HTML cell. */
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 7740bfa..4a2dfaf 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -61,9 +61,9 @@ public:
    explicit            XclImpOutlineDataBuffer( const XclImpRoot& rRoot, SCTAB nScTab );
    virtual             ~XclImpOutlineDataBuffer() override;

    inline XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); }
    inline XclImpOutlineBuffer* GetColOutline()  const { return mxColOutlineBuff.get(); }
    inline XclImpOutlineBuffer* GetRowOutline()  const { return mxRowOutlineBuff.get(); }
    XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); }
    XclImpOutlineBuffer* GetColOutline()  const { return mxColOutlineBuff.get(); }
    XclImpOutlineBuffer* GetRowOutline()  const { return mxRowOutlineBuff.get(); }
    void                Convert();

private:
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 564beff..2c3b390 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -42,13 +42,13 @@ struct LotAttrWK3
    sal_uInt8 nFontCol;
    sal_uInt8 nBack;

    inline bool HasStyles () const
    bool HasStyles () const
    {
        return ( nFont || nLineStyle || nFontCol || ( nBack & 0x7F ) );
                    // !! ohne Center-Bit!!
    }

    inline bool IsCentered () const
    bool IsCentered () const
    {
        return ( nBack & 0x80 );
    }
@@ -78,7 +78,7 @@ private:
        ~ENTRY();
    };

    inline static void  MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
    static void  MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
    {
        reinterpret_cast<sal_uInt8*>(&rOut)[ 0 ] = rAttr.nFont & 0x7F;
        reinterpret_cast<sal_uInt8*>(&rOut)[ 1 ] = rAttr.nLineStyle;
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index d207d76..6c7bd0a 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -37,7 +37,7 @@ private:
        SvxFontHeightItem*  pHeight;
        SvxColorItem*       pColor;
        sal_Int32               nType;      // < 0 -> undefiniert
        inline              ENTRY()
        ENTRY()
                            {
                                pTmpName = nullptr;
                                pFont = nullptr;
@@ -45,7 +45,7 @@ private:
                                pColor = nullptr;
                                nType = -1;
                            }
        inline              ~ENTRY()
        ~ENTRY()
                            {
                                if( pTmpName )
                                    delete pTmpName;
@@ -56,20 +56,20 @@ private:
                                if( pColor )
                                    delete pColor;
                            }
        inline void         TmpName( const OUString &rNew )
        void         TmpName( const OUString &rNew )
                            {
                                if( pTmpName )
                                    *pTmpName = rNew;
                                else
                                    pTmpName = new OUString( rNew );
                            }
        inline void         Height( SvxFontHeightItem& rNew )
        void         Height( SvxFontHeightItem& rNew )
                            {
                                if( pHeight )
                                    delete pHeight;
                                pHeight = &rNew;
                            }
        inline void         Type( const sal_uInt16 nNew )       { nType = nNew; }
        void         Type( const sal_uInt16 nNew )       { nType = nNew; }
    };

    static void             MakeFont( ENTRY* pEntry );
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index 8f2b171..83fe5b2 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -169,7 +169,7 @@ struct ExtName
    sal_uInt32        nStorageId;
    sal_uInt16        nFlags;

    inline          ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}
    ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {}

    bool            IsOLE() const;
};
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index dfb8ae8..fe867c6 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -71,13 +71,13 @@ public:
    void                readIndex( SequenceInputStream& rStrm );

    /** Returns the type of the item. */
    inline sal_Int32    getType() const { return mnType; }
    sal_Int32    getType() const { return mnType; }
    /** Returns the value of the item. */
    inline const css::uno::Any& getValue() const { return maValue; }
    const css::uno::Any& getValue() const { return maValue; }
    /** Returns the string representation of the item. */
    OUString     getName() const;
    /** Returns true if the item is unused. */
    inline bool         isUnused() const { return mbUnused; }
    bool         isUnused() const { return mbUnused; }

private:
friend class PivotCacheItemList;
@@ -99,9 +99,9 @@ public:
    void                importItem( sal_Int32 nRecId, SequenceInputStream& rStrm );

    /** Returns true, if this item list is empty. */
    inline bool         empty() const { return maItems.empty(); }
    bool         empty() const { return maItems.empty(); }
    /** Returns the size of the item list. */
    inline size_t       size() const { return maItems.size(); }
    size_t       size() const { return maItems.size(); }

    /** Returns the specified item. */
    const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const;
@@ -183,7 +183,7 @@ struct PivotCacheGroupItem
    OUString     maOrigName;
    OUString     maGroupName;

    inline explicit     PivotCacheGroupItem( const OUString& rItemName ) :
    explicit     PivotCacheGroupItem( const OUString& rItemName ) :
                            maOrigName( rItemName ), maGroupName( rItemName ) {}
};

@@ -228,29 +228,29 @@ public:
    void                applyItemCaptions( const IdCaptionPairList& vCaptions );

    /** Returns true, if the field is based on source data, or false if it is grouped or calculated. */
    inline bool         isDatabaseField() const { return maFieldModel.mbDatabaseField; }
    bool         isDatabaseField() const { return maFieldModel.mbDatabaseField; }

    /** Returns true, if the field contains a list of shared items. */
    inline bool         hasSharedItems() const { return !maSharedItems.empty(); }
    bool         hasSharedItems() const { return !maSharedItems.empty(); }
    /** Returns true, if the field contains a list of grouping items. */
    inline bool         hasGroupItems() const { return !maGroupItems.empty(); }
    bool         hasGroupItems() const { return !maGroupItems.empty(); }
    /** Returns true, if the field has inplace numeric grouping settings. */
    inline bool         hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; }
    bool         hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; }
    /** Returns true, if the field has inplace date grouping settings. */
    inline bool         hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; }
    bool         hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; }
    /** Returns true, if the field has a parent group field that groups the items of this field. */
    inline bool         hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; }
    bool         hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; }

    /** Returns the name of the cache field. */
    inline const OUString& getName() const { return maFieldModel.maName; }
    const OUString& getName() const { return maFieldModel.maName; }
    /** Returns the index of the parent group field that groups the items of this field. */
    inline sal_Int32    getParentGroupField() const { return maFieldGroupModel.mnParentField; }
    sal_Int32    getParentGroupField() const { return maFieldGroupModel.mnParentField; }
    /** Returns the index of the base field grouping is based on. */
    inline sal_Int32    getGroupBaseField() const { return maFieldGroupModel.mnBaseField; }
    sal_Int32    getGroupBaseField() const { return maFieldGroupModel.mnBaseField; }
    /** Returns the finalized group name of this field.  */
    inline const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; }
    const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; }
    /** Set the finalized group name of this field.  */
    inline void            setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; }
    void            setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; }

    /** Returns the shared or group item with the specified index. */
    const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const;
@@ -367,14 +367,14 @@ public:

    /** Returns true, if the pivot cache is based on a valid data source, so
        that pivot tables can be created based on this pivot cache. */
    inline bool         isValidDataSource() const { return mbValidSource; }
    bool         isValidDataSource() const { return mbValidSource; }
    /** Returns true, if the pivot cache is based on a dummy sheet created in finalizeImport. */
    inline bool         isBasedOnDummySheet() const { return mbDummySheet; }
    bool         isBasedOnDummySheet() const { return mbDummySheet; }
    /** Returns the internal cell range the cache is based on. */
    inline const ScRange&
    const ScRange&
                        getSourceRange() const { return maSheetSrcModel.maRange; }
    /** Returns the relation identifier of the pivot cache records fragment. */
    inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; }
    const OUString& getRecordsRelId() const { return maDefModel.maRelId; }

    /** Returns the cache field with the specified index. */
    PivotCacheField* getCacheField( sal_Int32 nFieldIdx );
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index f3bc3da..083d434 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -152,7 +152,7 @@ public:
                            const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc);

    /** Returns the name of the DataPilot field in the fields collection. */
    inline const OUString& getDPFieldName() const { return maDPFieldName; }
    const OUString& getDPFieldName() const { return maDPFieldName; }

    /** Converts dimension and other settings for a row field. */
    void                convertRowField();
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 1582b4c..bb62d2e 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -51,9 +51,9 @@ public:
    void                finalizeImport();

    /** Returns the text data of this portion. */
    inline const OUString& getText() const { return maText; }
    const OUString& getText() const { return maText; }
    /** Returns true, if the portion contains font formatting. */
    inline bool         hasFont() const { return mxFont.get() != nullptr; }
    bool         hasFont() const { return mxFont.get() != nullptr; }

    /** Converts the portion and replaces or appends to the passed XText. */
    void                convert(
@@ -84,8 +84,8 @@ struct FontPortionModel
    sal_Int32           mnPos;          /// First character in the string.
    sal_Int32           mnFontId;       /// Font identifier for the next characters.

    explicit inline     FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {}
    explicit inline     FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) :
    explicit FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {}
    explicit FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) :
                            mnPos( nPos ), mnFontId( nFontId ) {}

    void                read( SequenceInputStream& rStrm );
@@ -96,7 +96,7 @@ class FontPortionModelList {
    ::std::vector< FontPortionModel > mvModels;

public:
    inline explicit     FontPortionModelList() : mvModels() {}
    explicit     FontPortionModelList() : mvModels() {}

    bool empty() const { return mvModels.empty(); }

@@ -175,8 +175,8 @@ struct PhoneticPortionModel
    sal_Int32           mnBasePos;      /// First character in base text.
    sal_Int32           mnBaseLen;      /// Number of characters in base text.

    explicit inline     PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {}
    explicit inline     PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) :
    explicit PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {}
    explicit PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) :
                            mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {}

    void                read( SequenceInputStream& rStrm );
@@ -186,7 +186,7 @@ struct PhoneticPortionModel
class PhoneticPortionModelList
{
public:
    inline explicit     PhoneticPortionModelList() : mvModels() {}
    explicit     PhoneticPortionModelList() : mvModels() {}

    bool empty() const { return mvModels.empty(); }

diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index c44088e..d74a7ed 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -75,8 +75,8 @@ class ExcRoot
{
protected:
    RootData*       pExcRoot;
    inline          ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {}
    inline          ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
    ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {}
    ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
};

// Lotus Imp~/Exp~ -
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 9f9a357..19ed1e8 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -103,7 +103,7 @@ public:
    void                importColorId( SequenceInputStream& rStrm );

    /** Returns true, if the color is set to automatic. */
    inline bool         isAuto() const { return isPlaceHolder(); }
    bool         isAuto() const { return isPlaceHolder(); }
};

SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor );
@@ -232,7 +232,7 @@ public:

    /** Returns the font model structure. This function can be called before
        finalizeImport() has been called. */
    inline const FontModel& getModel() const { return maModel; }
    const FontModel& getModel() const { return maModel; }

    /** Final processing after import of all style settings. */
    void                finalizeImport();
@@ -315,9 +315,9 @@ public:
    void                finalizeImport();

    /** Returns the alignment model structure. */
    inline const AlignmentModel& getModel() const { return maModel; }
    const AlignmentModel& getModel() const { return maModel; }
    /** Returns the converted API alignment data struct. */
    inline const ApiAlignmentData& getApiData() const { return maApiData; }
    const ApiAlignmentData& getApiData() const { return maApiData; }

    void                fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;

@@ -365,7 +365,7 @@ public:
    void                finalizeImport();

    /** Returns the converted API protection data struct. */
    inline const ApiProtectionData& getApiData() const { return maApiData; }
    const ApiProtectionData& getApiData() const { return maApiData; }

    void                fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;
private:
@@ -441,7 +441,7 @@ public:
    void                finalizeImport( bool bRTL );

    /** Returns the converted API border data struct. */
    inline const ApiBorderData& getApiData() const { return maApiData; }
    const ApiBorderData& getApiData() const { return maApiData; }

    void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const;

@@ -613,12 +613,12 @@ public:
    void                finalizeImport();

    /** Returns true, if the XF is a cell XF, and false, if it is a style XF. */
    inline bool         isCellXf() const { return maModel.mbCellXf; }
    bool         isCellXf() const { return maModel.mbCellXf; }

    /** Returns the referred font object. */
    FontRef             getFont() const;
    /** Returns the alignment data of this style. */
    inline const Alignment& getAlignment() const { return maAlignment; }
    const Alignment& getAlignment() const { return maAlignment; }

    void applyPatternToAttrList(
        AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt );
@@ -716,10 +716,10 @@ public:
    void                finalizeImport( const OUString& rFinalName );

    /** Returns the cell style model structure. */
    inline const CellStyleModel& getModel() const { return maModel; }
    const CellStyleModel& getModel() const { return maModel; }
    /** Returns the final style name used in the document. */
    inline const OUString& getFinalStyleName() const { return maFinalName; }
    inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; }
    const OUString& getFinalStyleName() const { return maFinalName; }
    ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; }
private:
    CellStyleModel      maModel;
    OUString     maFinalName;        /// Final style name used in API.
diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx
index 878c919..a5fbc55 100644
--- a/sc/source/filter/inc/stylesfragment.hxx
+++ b/sc/source/filter/inc/stylesfragment.hxx
@@ -40,7 +40,7 @@ class FontContext : public WorkbookContextBase
{
public:
    template< typename ParentType >
    inline explicit     FontContext( ParentType& rParent, const FontRef& rxFont ) :
    explicit     FontContext( ParentType& rParent, const FontRef& rxFont ) :
                            WorkbookContextBase( rParent ), mxFont( rxFont ) {}

protected:
@@ -54,7 +54,7 @@ class BorderContext : public WorkbookContextBase
{
public:
    template< typename ParentType >
    inline explicit     BorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
    explicit     BorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
                            WorkbookContextBase( rParent ), mxBorder( rxBorder ) {}

protected:
@@ -69,7 +69,7 @@ class FillContext : public WorkbookContextBase
{
public:
    template< typename ParentType >
    inline explicit     FillContext( ParentType& rParent, const FillRef& rxFill ) :
    explicit     FillContext( ParentType& rParent, const FillRef& rxFill ) :
                            WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {}

protected:
@@ -84,7 +84,7 @@ class XfContext : public WorkbookContextBase
{
public:
    template< typename ParentType >
    inline explicit     XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
    explicit     XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
                            WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {}

protected:
@@ -100,7 +100,7 @@ class DxfContext : public WorkbookContextBase
{
public:
    template< typename ParentType >
    inline explicit     DxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
    explicit     DxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
                            WorkbookContextBase( rParent ), mxDxf( rxDxf ) {}

protected:
diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx
index 384b461..43a87b9 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -50,9 +50,9 @@ public:
    /** Imports a table definition from a TABLE record. */
    void                importTable( SequenceInputStream& rStrm, sal_Int16 nSheet );
    /** Creates a new auto filter and stores it internally. */
    inline AutoFilter&  createAutoFilter() { return maAutoFilters.createAutoFilter(); }
    AutoFilter&  createAutoFilter() { return maAutoFilters.createAutoFilter(); }
    /** Creates a new tableColumns handler and stores it internally. */
    inline TableColumns&  createTableColumns() { return maTableColumns.createTableColumns(); }
    TableColumns&  createTableColumns() { return maTableColumns.createTableColumns(); }

    /** Creates a database range from this tables. */
    void                finalizeImport();
@@ -60,24 +60,24 @@ public:
    void                applyTableColumns();

    /** Returns the unique table identifier. */
    inline sal_Int32    getTableId() const { return maModel.mnId; }
    sal_Int32    getTableId() const { return maModel.mnId; }
    /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
    inline sal_Int32    getTokenIndex() const { return mnTokenIndex; }
    sal_Int32    getTokenIndex() const { return mnTokenIndex; }
    /** Returns the original display name of the table. */
    inline const OUString& getDisplayName() const { return maModel.maDisplayName; }
    const OUString& getDisplayName() const { return maModel.maDisplayName; }

    /** Returns the original (unchecked) total range of the table. */
    inline const ScRange& getOriginalRange() const { return maModel.maRange; }
    const ScRange& getOriginalRange() const { return maModel.maRange; }
    /** Returns the cell range of this table. */
    inline const ScRange& getRange() const { return maDestRange; }
    const ScRange& getRange() const { return maDestRange; }
    /** Returns the number of columns of this table. */
    inline SCCOL        getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; }
    SCCOL        getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; }
    /** Returns the number of rows of this table. */
    inline SCROW        getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; }
    SCROW        getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; }
    /** Returns the number of header rows in the table range. */
    inline sal_Int32    getHeaderRows() const { return maModel.mnHeaderRows; }
    sal_Int32    getHeaderRows() const { return maModel.mnHeaderRows; }
    /** Returns the number of totals rows in the table range. */
    inline sal_Int32    getTotalsRows() const { return maModel.mnTotalsRows; }
    sal_Int32    getTotalsRows() const { return maModel.mnTotalsRows; }

private:
    TableModel          maModel;
diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index 8ae61d1..76a6d02 100644
--- a/sc/source/filter/inc/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -40,7 +40,7 @@ public:
    sal_Int32           getColorByIndex(size_t nIndex) const;

    /** Returns the default font data for the current file type. */
    inline const FontModel& getDefaultFontModel() const { return *mxDefFontModel; }
    const FontModel& getDefaultFontModel() const { return *mxDefFontModel; }

private:
    typedef ::std::unique_ptr< FontModel > FontModelPtr;
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index cd18b10..55d0dba 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -44,9 +44,9 @@ struct TokenId
                        TokenId() : nId( 0 ) {}
                        TokenId( sal_uInt16 n ) : nId( n ) {}
                        TokenId( const TokenId& r ) : nId( r.nId ) {}
    inline  TokenId&    operator =( const TokenId& r ) { nId = r.nId; return *this; }
    inline  TokenId&    operator =( sal_uInt16 n ) { nId = n; return *this; }
    inline              operator const sal_uInt16&() const { return nId; }
    TokenId&    operator =( const TokenId& r ) { nId = r.nId; return *this; }
    TokenId&    operator =( sal_uInt16 n ) { nId = n; return *this; }
    operator const sal_uInt16&() const { return nId; }
};

struct ScComplexRefData;
@@ -232,7 +232,7 @@ class TokenStack

        inline void                 Reset();

        inline bool                 HasMoreTokens() const { return nPos > 0; }
        bool                 HasMoreTokens() const { return nPos > 0; }
        inline const TokenId        Get();
};

diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index e5e12b6..e6369c6 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -101,7 +101,7 @@ typedef std::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef;
class WorkbookHelper
{
public:
    inline /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {}
    /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {}
    virtual             ~WorkbookHelper();

    static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter );
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index ee04695..c63ce77 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -142,8 +142,8 @@ private:
public:
                                XclEscherHostAppData() : bStackedGroup( false )
                                    {}
    inline  void                SetStackedGroup( bool b )   { bStackedGroup = b; }
    inline  bool                IsStackedGroup() const  { return bStackedGroup; }
    void                SetStackedGroup( bool b )   { bStackedGroup = b; }
    bool                IsStackedGroup() const  { return bStackedGroup; }
};

// --- class XclEscherClientData -------------------------------------
@@ -172,7 +172,7 @@ public:
                            XclObj* pObj );

                                //! ONLY for the AdditionalText mimic
    inline  void        SetXclObj( XclObj* p )  { pXclObj = p; }
    void        SetXclObj( XclObj* p )  { pXclObj = p; }

    virtual void        WriteData( EscherEx& rEx ) const override;
};
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 62698c2..3d7bc09 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -52,15 +52,15 @@ public:

    void pop_back ();

    inline bool empty () const { return maObjs.empty(); }
    bool empty () const { return maObjs.empty(); }

    inline size_t size () const { return maObjs.size(); }
    size_t size () const { return maObjs.size(); }

    inline iterator begin () { return maObjs.begin(); }
    iterator begin () { return maObjs.begin(); }

    inline iterator end () { return maObjs.end(); }
    iterator end () { return maObjs.end(); }

    inline XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; }
    XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; }

                                /// close groups and DgContainer opened in ctor
    void                EndSheet();
@@ -115,25 +115,25 @@ protected:
public:
    virtual                     ~XclObj() override;

    inline sal_uInt16           GetObjType() const { return mnObjType; }
    sal_uInt16           GetObjType() const { return mnObjType; }

    inline  void                SetId( sal_uInt16 nId ) { nObjId = nId; }
    void                SetId( sal_uInt16 nId ) { nObjId = nId; }

    inline  void                SetTab( SCTAB nScTab )  { mnScTab = nScTab; }
    inline  SCTAB               GetTab() const          { return mnScTab; }
    void                SetTab( SCTAB nScTab )  { mnScTab = nScTab; }
    SCTAB               GetTab() const          { return mnScTab; }

    inline  void                SetLocked( bool b )
    void                SetLocked( bool b )
                                    { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; }
    inline  void                SetPrintable( bool b )
    void                SetPrintable( bool b )
                                    { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; }
    inline  void                SetAutoFill( bool b )
    void                SetAutoFill( bool b )
                                    { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; }
    inline  void                SetAutoLine( bool b )
    void                SetAutoLine( bool b )
                                    { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; }

                                // set corresponding Excel object type in OBJ/ftCmo
            void                SetEscherShapeType( sal_uInt16 nType );
    inline  void                SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }
    void                SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }

    /** If set to true, this object has created its own escher data.
        @descr  This causes the function EscherEx::EndShape() to not post process
@@ -144,7 +144,7 @@ public:
        EscherEx::EndShape(). */
    /** Returns true, if the object has created the escher data itself.
        @descr  See SetOwnEscher() for details. */
    inline bool                 IsOwnEscher() const { return mbOwnEscher; }
    bool                 IsOwnEscher() const { return mbOwnEscher; }

                                //! actually writes ESCHER_ClientTextbox
            void                SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj );
@@ -203,8 +203,8 @@ public:
                                XclTxo( const XclExpRoot& rRoot, const SdrTextObj& rEditObj );
                                XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObject* pCaption );

    inline void                 SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; }
    inline void                 SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; }
    void                 SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; }
    void                 SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; }

    virtual void                Save( XclExpStream& rStrm ) override;

@@ -358,7 +358,7 @@ protected:
public:
                                ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt );

    inline std::size_t          GetStringBytes() const
    std::size_t          GetStringBytes() const
                                    { return sText.GetSize(); }

    void                        WriteAddress( XclExpStream& rStrm ) const ;
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index a5b43c1..f4e05de 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -84,7 +84,7 @@ public:
    virtual             ~XclExpChRoot() override;

    /** Returns this root instance - for code readability in derived classes. */
    inline const XclExpChRoot& GetChRoot() const { return *this; }
    const XclExpChRoot& GetChRoot() const { return *this; }
    /** Returns the API Chart document model. */
    css::uno::Reference< css::chart2::XChartDocument > const &
                        GetChartDocument() const;
@@ -204,7 +204,7 @@ public:
    explicit            XclExpChFramePos( sal_uInt16 nTLMode );

    /** Returns read/write access to the frame position data. */
    inline XclChFramePos& GetFramePosData() { return maData; }
    XclChFramePos& GetFramePosData() { return maData; }

private:
    virtual void        WriteBody( XclExpStream& rStrm ) override;
@@ -224,17 +224,17 @@ public:
    void                Convert( const XclExpChRoot& rRoot,
                            const ScfPropertySet& rPropSet, XclChObjectType eObjType );
    /** Sets or clears the automatic flag. */
    inline void         SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); }
    void         SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); }
    /** Sets flag to show or hide an axis. */
    inline void         SetShowAxis( bool bShowAxis )
    void         SetShowAxis( bool bShowAxis )
                            { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS, bShowAxis ); }
    /** Sets the line format to the specified default type. */
    void                SetDefault( XclChFrameType eDefFrameType );

    /** Returns true, if the line format is set to automatic. */
    inline bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
    bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
    /** Returns true, if the line style is set to something visible. */
    inline bool         HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; }
    bool         HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; }
    /** Returns true, if the line contains default formatting according to the passed frame type. */
    bool                IsDefault( XclChFrameType eDefFrameType ) const;

@@ -258,14 +258,14 @@ public:
    bool                Convert( const XclExpChRoot& rRoot,
                            const ScfPropertySet& rPropSet, XclChObjectType eObjType );
    /** Sets or clears the automatic flag. */
    inline void         SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); }
    void         SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); }
    /** Sets the area format to the specified default type. */
    void                SetDefault( XclChFrameType eDefFrameType );

    /** Returns true, if the area format is set to automatic. */
    inline bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
    bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
    /** Returns true, if the area style is set to something visible. */
    inline bool         HasArea() const { return maData.mnPattern != EXC_PATT_NONE; }
    bool         HasArea() const { return maData.mnPattern != EXC_PATT_NONE; }
    /** Returns true, if the area contains default formatting according to the passed frame type. */
    bool                IsDefault( XclChFrameType eDefFrameType ) const;

@@ -399,7 +399,7 @@ public:
    void                AppendString( const OUString& rStr );

    /** Returns true, if this source link contains explicit string data. */
    inline bool         HasString() const { return mxString && !mxString->IsEmpty(); }
    bool         HasString() const { return mxString && !mxString->IsEmpty(); }

    /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */
    virtual void        Save( XclExpStream& rStrm ) override;
@@ -507,7 +507,7 @@ public:
    void                ConvertTrendLineEquation( const ScfPropertySet& rPropSet, const XclChDataPointPos& rPointPos );

    /** Returns true, if the string object does not contain any text data. */
    inline bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
    bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
    /** Returns the flags needed for the CHATTACHEDLABEL record. */
    sal_uInt16          GetAttLabelFlags() const;

@@ -546,11 +546,11 @@ public:
                            const ScfPropertySet& rPropSet, bool bCloseSymbol );

    /** Returns true, if markers are enabled. */
    inline bool         HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; }
    bool         HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; }
    /** Returns true, if border line of markers is visible. */
    inline bool         HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); }
    bool         HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); }
    /** Returns true, if fill area of markers is visible. */
    inline bool         HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); }
    bool         HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); }

private:
    /** Registers marker colors in palette and stores color identifiers. */
@@ -625,7 +625,7 @@ public:
    void                ConvertLine( const ScfPropertySet& rPropSet, XclChObjectType eObjType );

    /** Returns true, if this objects describes the formatting of an entire series. */
    inline bool         IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; }
    bool         IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; }

    /** Writes all embedded records. */
    virtual void        WriteSubRecords( XclExpStream& rStrm ) override;
@@ -772,9 +772,9 @@ public:
    void                SetStacked( bool bPercent );

    /** Returns true, if this is object represents a valid chart type. */
    inline bool         IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; }
    bool         IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; }
    /** Returns the chart type info struct for the contained chart type. */
    inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }

private:
    virtual void        WriteBody( XclExpStream& rStrm ) override;
@@ -793,10 +793,10 @@ public:
    /** Converts 3d settings for the passed chart type. */
    void                Convert( const ScfPropertySet& rPropSet, bool b3dWallChart );
    /** Sets flag that the data points are clustered on the X axis. */
    inline void         SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
    void         SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }

    /** Returns true, if the data points are clustered on the X axis. */
    inline bool         IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
    bool         IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }

private:
    virtual void        WriteBody( XclExpStream& rStrm ) override;
@@ -887,19 +887,19 @@ public:
    void                ConvertLegend( const ScfPropertySet& rPropSet );

    /** Returns true, if this chart type group contains at least one valid series. */
    inline bool         IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); }
    bool         IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); }
    /** Returns the index of this chart type group format. */
    inline sal_uInt16   GetGroupIdx() const { return maData.mnGroupIdx; }
    sal_uInt16   GetGroupIdx() const { return maData.mnGroupIdx; }
    /** Returns the chart type info struct for the contained chart type. */
    inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    /** Returns true, if the chart is three-dimensional. */
    inline bool         Is3dChart() const { return maTypeInfo.mb3dChart; }
    bool         Is3dChart() const { return maTypeInfo.mb3dChart; }
    /** Returns true, if chart type supports wall and floor format. */
    inline bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
    bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
    /** Returns true, if the series in this chart type group are ordered on the Z axis. */
    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
    bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
    /** Returns true, if this chart type can be combined with other types. */
    inline bool         IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }
    bool         IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }

    /** Writes all embedded records. */
    virtual void        WriteSubRecords( XclExpStream& rStrm ) override;
@@ -949,7 +949,7 @@ public:
    /** Converts position settings of a crossing axis at this axis. */
    void                ConvertAxisPosition( const ScfPropertySet& rPropSet );
    /** Sets flag for tickmark position between categories or on categories. */
    inline void         SetTicksBetweenCateg( bool bTicksBetween )
    void         SetTicksBetweenCateg( bool bTicksBetween )
                            { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); }

private:
@@ -1029,9 +1029,9 @@ public:
    void                ConvertWall( css::uno::Reference< css::chart2::XDiagram > const & xDiagram );

    /** Returns the type of this axis. */
    inline sal_uInt16   GetAxisType() const { return maData.mnType; }
    sal_uInt16   GetAxisType() const { return maData.mnType; }
    /** Returns the axis dimension index used by the chart API. */
    inline sal_Int32    GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
    sal_Int32    GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }

    /** Writes all embedded records. */
    virtual void        WriteSubRecords( XclExpStream& rStrm ) override;
@@ -1071,11 +1071,11 @@ public:
                                 sal_uInt16 nFirstGroupIdx );

    /** Returns true, if this axes set exists (returns false if this is a dummy object). */
    inline bool         IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); }
    bool         IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); }
    /** Returns the index of the axes set (primary/secondary). */
    inline sal_uInt16   GetAxesSetId() const { return maData.mnAxesSetId; }
    sal_uInt16   GetAxesSetId() const { return maData.mnAxesSetId; }
    /** Returns the axes set index used by the chart API. */
    inline sal_Int32    GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
    sal_Int32    GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
    /** Returns true, if the chart is three-dimensional. */
    bool                Is3dChart() const;

diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 06f582f..1b8d002 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -104,7 +104,7 @@ public:
    virtual             ~XclExpHyperlink() override;

    /** Returns the cell representation text or 0, if not available. */
    inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; }
    const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; }

    virtual void        SaveXml( XclExpXmlStream& rStrm ) override;

@@ -322,7 +322,7 @@ public:
    virtual             ~XclExpDV() override;

    /** Returns the core handle of the validation data. */
    inline sal_uLong        GetScHandle() const { return mnScHandle; }
    sal_uLong        GetScHandle() const { return mnScHandle; }

    /** Inserts a new cell range into the cell range list. */
    void                InsertCellRange( const ScRange& rPos );
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index fdb632b..f3a98cf 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -172,11 +172,11 @@ protected:
                            css::uno::Reference< css::drawing::XShape > const & xShape );

    /** Returns the Excel token array of the cell link, or 0, if no link present. */
    inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); }
    const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); }
    /** Returns the Excel token array of the source range, or 0, if no link present. */
    inline const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); }
    const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); }
    /** Returns the number of entries in the source range, or 0, if no source set. */
    inline sal_uInt16   GetSourceEntryCount() const { return mnEntryCount; }
    sal_uInt16   GetSourceEntryCount() const { return mnEntryCount; }

    /** Writes a formula with special style only valid in OBJ records. */
    static void         WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr );
@@ -405,7 +405,7 @@ public:
    /** Finalizes the object manager after conversion of all sheets. */
    void                EndDocument();

    inline XclEscherEx& GetEscherEx() { return *mxEscherEx; }
    XclEscherEx& GetEscherEx() { return *mxEscherEx; }
    XclExpMsoDrawing*   GetMsodrawingPerSheet();
    bool                HasObj() const;
    sal_uInt16          AddObj( XclObj* pObjRec );
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index b60d343..7bcdd57 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -189,9 +189,9 @@ public:
    XclExpHyperlinkRef  GetLinkRecord();

    /** Returns true, if multiple URLs have been processed. */
    inline bool         HasMultipleUrls() const { return mbMultipleUrls; }
    bool         HasMultipleUrls() const { return mbMultipleUrls; }
    /** Returns a string containing all processed URLs. */
    inline const OUString& GetUrlList() { return maUrlList; }
    const OUString& GetUrlList() { return maUrlList; }

private:
    XclExpHyperlinkRef  mxLinkRec;          /// Created HLINK record.
@@ -374,9 +374,9 @@ public:
                            const EditTextObject* pRightObj );

    /** Returns the last generated header/footer string. */
    inline const OUString& GetHFString() const { return maHFString; }
    const OUString& GetHFString() const { return maHFString; }
    /** Returns the total height of the last generated header/footer in twips. */
    inline sal_Int32    GetTotalHeight() const { return mnTotalHeight; }
    sal_Int32    GetTotalHeight() const { return mnTotalHeight; }

private:
    /** Converts the text object contents and stores it in the passed string. */
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index b8f0868..6798583 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -89,19 +89,19 @@ public:
    SCTAB               GetRealScTab( SCTAB nSortedScTab ) const;

    /** Returns the number of Calc sheets. */
    inline SCTAB        GetScTabCount() const { return mnScCnt; }
    SCTAB        GetScTabCount() const { return mnScCnt; }

    /** Returns the number of Excel sheets to be exported. */
    inline sal_uInt16   GetXclTabCount() const { return mnXclCnt; }
    sal_uInt16   GetXclTabCount() const { return mnXclCnt; }
    /** Returns the number of external linked sheets. */
    inline sal_uInt16   GetXclExtTabCount() const { return mnXclExtCnt; }
    sal_uInt16   GetXclExtTabCount() const { return mnXclExtCnt; }
    /** Returns the number of exported selected sheets. */
    inline sal_uInt16   GetXclSelectedCount() const { return mnXclSelCnt; }
    sal_uInt16   GetXclSelectedCount() const { return mnXclSelCnt; }

    /** Returns the Excel index of the active, displayed sheet. */
    inline sal_uInt16   GetDisplayedXclTab() const { return mnDisplXclTab; }
    sal_uInt16   GetDisplayedXclTab() const { return mnDisplXclTab; }
    /** Returns the Excel index of the first visible sheet. */
    inline sal_uInt16   GetFirstVisXclTab() const { return mnFirstVisXclTab; }
    sal_uInt16   GetFirstVisXclTab() const { return mnFirstVisXclTab; }

private:
    /** Returns true, if any of the passed flags is set for the specified Calc sheet. */
@@ -121,7 +121,7 @@ private:
        OUString            maScName;
        sal_uInt16          mnXclTab;
        ExcTabBufFlags      mnFlags;
        inline explicit     XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {}
        explicit     XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {}
    };

    typedef ::std::vector< XclExpTabInfoEntry > XclExpTabInfoVec;
diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index fe05987..6fc2060 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -96,7 +96,7 @@ public:
    explicit            XclExpPageSettings( const XclExpRoot& rRoot );

    /** Returns read-only access to the page data. */
    inline const XclPageData& GetPageData() const { return maData; }
    const XclPageData& GetPageData() const { return maData; }

    /** Writes all page settings records to the stream. */
    virtual void        Save( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 8d9cd54..7cdc389 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -45,7 +45,7 @@ public:
    explicit            XclExpPCItem( sal_Int16 nValue );
    explicit            XclExpPCItem( bool bValue );

    inline sal_uInt16   GetTypeFlag() const { return mnTypeFlag; }
    sal_uInt16   GetTypeFlag() const { return mnTypeFlag; }

    bool                EqualsText( const OUString& rText ) const;
    bool                EqualsDouble( double fValue ) const;
@@ -79,7 +79,7 @@ public:
    void                SetGroupChildField( const XclExpPCField& rChildField );

    /** Returns the name of this cache field. */
    inline const OUString& GetFieldName() const { return maFieldInfo.maName; }
    const OUString& GetFieldName() const { return maFieldInfo.maName; }

    /** Returns the number of visible items of this field. */
    sal_uInt16          GetItemCount() const;
@@ -164,12 +164,12 @@ public:
                            const ScDPObject& rDPObj, sal_uInt16 nListIdx );

    /** Returns true, if the cache has been constructed successfully. */
    inline bool         IsValid() const { return mbValid; }
    bool         IsValid() const { return mbValid; }
    /** Returns true, if the item index list will be written. */
    bool                HasItemIndexList() const;

    /** Returns the list index of the cache used in pivot table records. */
    inline sal_uInt16   GetCacheIndex() const { return mnListIdx; }
    sal_uInt16   GetCacheIndex() const { return mnListIdx; }

    /** Returns the number of pivot cache fields. */
    sal_uInt16          GetFieldCount() const;
@@ -327,7 +327,7 @@ public:
    const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const;

    /** Returns the output range of the pivot table. */
    inline SCTAB         GetScTab() const { return mnOutScTab; }
    SCTAB         GetScTab() const { return mnOutScTab; }

    /** Returns a pivot table field by its name. */
    const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const;
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 5bff610..efa20eb 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -125,16 +125,16 @@ public:
    virtual             ~XclExpRecord() override;

    /** Returns the current record ID. */
    inline sal_uInt16   GetRecId() const { return mnRecId; }
    sal_uInt16   GetRecId() const { return mnRecId; }
    /** Returns the current record size prediction. */
    inline std::size_t  GetRecSize() const { return mnRecSize; }
    std::size_t  GetRecSize() const { return mnRecSize; }

    /** Sets a new record ID. */
    inline void         SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; }
    void         SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; }
    /** Sets a new record size prediction. */
    inline void         SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; }
    void         SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; }
    /** Adds a size value to the record size prediction. */
    inline void         AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; }
    void         AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; }
    /** Sets record ID and size with one call. */
    void                SetRecHeader( sal_uInt16 nRecId, std::size_t nRecSize );

@@ -173,13 +173,13 @@ public:
    /** @param nRecId  The record ID of this record.
        @param rValue  The value for the record body.
        @param nSize  Record size. Uses sizeof( Type ), if this parameter is omitted. */
    inline explicit     XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, std::size_t nSize = sizeof( Type ) ) :
    explicit     XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, std::size_t nSize = sizeof( Type ) ) :
                            XclExpRecord( nRecId, nSize ), maValue( rValue ), mnAttribute( -1 ) {}

    /** Returns the value of the record. */
    inline const Type&  GetValue() const { return maValue; }
    const Type&  GetValue() const { return maValue; }
    /** Sets a new record value. */
    inline void         SetValue( const Type& rValue ) { maValue = rValue; }
    void         SetValue( const Type& rValue ) { maValue = rValue; }

    /** Sets the OOXML attribute this record corresponds to */
    XclExpValueRecord*  SetAttribute( sal_Int32 nId );
@@ -230,11 +230,11 @@ class XclExpBoolRecord : public XclExpRecord
public:
    /** @param nRecId  The record ID of this record.
        @param nValue  The value for the record body. */
    inline explicit     XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) :
    explicit     XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) :
                            XclExpRecord( nRecId, 2 ), mbValue( bValue ), mnAttribute( nAttribute ) {}

    /** Returns the Boolean value of the record. */
    inline bool         GetBool() const { return mbValue; }
    bool         GetBool() const { return mbValue; }

    virtual void        SaveXml( XclExpXmlStream& rStrm ) override;

@@ -297,41 +297,41 @@ class XclExpRecordList : public XclExpRecordBase
public:
    typedef std::shared_ptr< RecType > RecordRefType;

    inline bool         IsEmpty() const { return maRecs.empty(); }
    inline size_t       GetSize() const { return maRecs.size(); }
    bool         IsEmpty() const { return maRecs.empty(); }
    size_t       GetSize() const { return maRecs.size(); }

    /** Returns true, if the passed index points to an exiting record. */
    inline bool         HasRecord( size_t nPos ) const
    bool         HasRecord( size_t nPos ) const
                            { return nPos < maRecs.size(); }
    /** Returns reference to an existing record or empty reference on error. */
    inline RecordRefType GetRecord( size_t nPos ) const
    RecordRefType GetRecord( size_t nPos ) const
                            { return (nPos < maRecs.size()) ? maRecs[ nPos ] : RecordRefType(); }
    /** Returns reference to the first existing record or empty reference, if list is empty. */
    inline RecordRefType GetFirstRecord() const
    RecordRefType GetFirstRecord() const
                            { return maRecs.empty() ? RecordRefType() : maRecs.front(); }
    /** Returns reference to the last existing record or empty reference, if list is empty. */
    inline RecordRefType GetLastRecord() const
    RecordRefType GetLastRecord() const
                            { return maRecs.empty() ? RecordRefType() : maRecs.back(); }

    /** Inserts a record at the specified position into the list. */
    inline void         InsertRecord( RecordRefType xRec, size_t nPos )
    void         InsertRecord( RecordRefType xRec, size_t nPos )
                            { if( xRec.get() ) maRecs.insert( maRecs.begin() + ::std::min( nPos, maRecs.size() ), xRec ); }
    /** Appends a record to the list. */
    inline void         AppendRecord( RecordRefType xRec )
    void         AppendRecord( RecordRefType xRec )
                            { if( xRec.get() ) maRecs.push_back( xRec ); }
    /** Replaces the record at the specified position from the list with the passed record. */
    inline void         ReplaceRecord( RecordRefType xRec, size_t nPos )
    void         ReplaceRecord( RecordRefType xRec, size_t nPos )
                            { RemoveRecord( nPos ); InsertRecord( xRec, nPos ); }

    /** Appends a newly created record to the list. */
    inline void         AppendNewRecord( RecType* pRec )
    void         AppendNewRecord( RecType* pRec )
                            { if( pRec ) AppendRecord( RecordRefType( pRec ) ); }

    /** Removes the record at the specified position from the list. */
    inline void         RemoveRecord( size_t nPos )
    void         RemoveRecord( size_t nPos )
                            { if( nPos < maRecs.size() ) maRecs.erase( maRecs.begin() + nPos ); }
    /** Removes all records from the list. */
    inline void         RemoveAllRecords() { maRecs.clear(); }
    void         RemoveAllRecords() { maRecs.clear(); }

    /** Writes the complete record list. */
    virtual void Save( XclExpStream& rStrm ) override
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 5a7ac4e..6ccfda1 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -115,9 +115,9 @@ public:
    explicit            XclExpRoot( XclExpRootData& rExpRootData );

    /** Returns this root instance - for code readability in derived classes. */
    inline const XclExpRoot& GetRoot() const { return *this; }
    const XclExpRoot& GetRoot() const { return *this; }
    /** Returns true, if URLs should be stored relative to the document location. */
    inline bool         IsRelUrl() const { return mrExpData.mbRelUrl; }
    bool         IsRelUrl() const { return mrExpData.mbRelUrl; }
    sc::CompileFormulaContext& GetCompileFormulaContext() const { return *mrExpData.mpCompileFormulaCxt; }

    /** Returns the buffer for Calc->Excel sheet index conversion. */
@@ -155,7 +155,7 @@ public:
    XclExpDxfs&          GetDxfs() const;

    /** Clean and return the OStringBuffer */
    inline OStringBuffer&   GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; }
    OStringBuffer&   GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; }

    XclExpXmlPivotTableManager& GetXmlPivotTableManager();

diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 754187b..8c8808a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -84,7 +84,7 @@ public:
                        ~XclExpStream();

    /** Returns the filter root data. */
    inline const XclExpRoot& GetRoot() const { return mrRoot; }
    const XclExpRoot& GetRoot() const { return mrRoot; }

    /** Starts a new record: writes header data, stores calculated record size. */
    void                StartRecord( sal_uInt16 nRecId, std::size_t nRecSize );
@@ -92,7 +92,7 @@ public:
    void                EndRecord();

    /** Returns the position inside of current record (starts by 0 in every CONTINUE). */
    inline sal_uInt16   GetRawRecPos() const { return mnCurrSize; }
    sal_uInt16   GetRawRecPos() const { return mnCurrSize; }

    /** Sets data slice length. 0 = no slices. */
    void                SetSliceSize( sal_uInt16 nSize );
@@ -137,7 +137,7 @@ public:
    /** Sets position of system stream (only allowed outside of records). */
    void                SetSvStreamPos(sal_uInt64 nPos);
    /** Returns the absolute position of the system stream. */
    inline sal_uInt64   GetSvStreamPos() const { return mrStrm.Tell(); }
    sal_uInt64   GetSvStreamPos() const { return mrStrm.Tell(); }

    void                SetEncrypter( XclExpEncrypterRef const & xEncrypter );

@@ -295,7 +295,7 @@ public:
    virtual ~XclExpXmlStream() override;

    /** Returns the filter root data. */
    inline const XclExpRoot& GetRoot() const { return *mpRoot; }
    const XclExpRoot& GetRoot() const { return *mpRoot; }

    sax_fastparser::FSHelperPtr& GetCurrentStream();
    void PushStream( sax_fastparser::FSHelperPtr const & aStream );
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 570a3f0..56726fa 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -111,22 +111,22 @@ public:
    // get data ---------------------------------------------------------------

    /** Returns the character count of the string. */
    inline sal_uInt16   Len() const { return mnLen; }
    sal_uInt16   Len() const { return mnLen; }
    /** Returns true, if the string is empty. */
    inline bool         IsEmpty() const { return mnLen == 0; }
    bool         IsEmpty() const { return mnLen == 0; }
    /** Returns true, if the string contains line breaks. */
    inline bool         IsWrapped() const { return mbWrapped; }
    bool         IsWrapped() const { return mbWrapped; }
    /** Returns true, if this string is equal to the passed string. */
    bool                IsEqual( const XclExpString& rCmp ) const;
    /** Returns true, if this string is less than the passed string. */
    bool                IsLessThan( const XclExpString& rCmp ) const;

    /** Returns true, if the string contains formatting information. */
    inline bool         IsRich() const { return !maFormats.empty(); }
    bool         IsRich() const { return !maFormats.empty(); }
    /** Returns the current count of formatting runs for rich strings. */
    sal_uInt16          GetFormatsCount() const;
    /** Returns the vector with all formatting runs. */
    inline const XclFormatRunVec& GetFormats() const { return maFormats; }
    const XclFormatRunVec& GetFormats() const { return maFormats; }

    /** Returns the current string flags field to export. */
    sal_uInt8           GetFlagField() const;
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index f22d4e4..0cf18f9 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -162,9 +162,9 @@ public:
                            const XclFontData& rFontData, XclExpColorType eColorType );

    /** Returns read-only access to font data. */
    inline const XclFontData& GetFontData() const { return maData; }
    const XclFontData& GetFontData() const { return maData; }
    /** Returns the font color identifier. */
    inline sal_uInt32   GetFontColorId() const { return mnColorId; }
    sal_uInt32   GetFontColorId() const { return mnColorId; }
    /** Compares this font with the passed font data.
        @param nHash  The hash value calculated from the font data. */
    virtual bool        Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const;
@@ -261,7 +261,7 @@ struct XclExpNumFmt
    sal_uInt16          mnXclNumFmt;    /// Resulting Excel format index.
    OUString            maNumFmtString; /// format string

    inline explicit     XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) :
    explicit     XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) :
                            mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {}

    void SaveXml( XclExpXmlStream& rStrm );
@@ -278,7 +278,7 @@ public:
    virtual             ~XclExpNumFmtBuffer() override;

    /** Returns the core index of the current standard number format. */
    inline sal_uInt32   GetStandardFormat() const { return mnStdFmt; }
    sal_uInt32   GetStandardFormat() const { return mnStdFmt; }

    /** Inserts a number format into the format buffer.
        @param nScNumFmt  The core index of the number format.
@@ -539,7 +539,7 @@ public:
    explicit            XclExpStyle( sal_uInt32 nXFId, sal_uInt8 nStyleId, sal_uInt8 nLevel );

    /** Returns true, if this record represents an Excel built-in style. */
    inline bool         IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }
    bool         IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; }

    virtual void        SaveXml( XclExpXmlStream& rStrm ) override;

diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 12837ca..1cf60bc 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -278,11 +278,11 @@ class XclExpCellBase : public XclExpRecord
{
public:
    /** Returns the (first) address of the cell(s). */
    inline const XclAddress& GetXclPos() const { return maXclPos; }
    const XclAddress& GetXclPos() const { return maXclPos; }
    /** Returns the (first) Excel column index of the cell(s). */
    inline sal_uInt16   GetXclCol() const { return maXclPos.mnCol; }
    sal_uInt16   GetXclCol() const { return maXclPos.mnCol; }
    /** Returns the Excel row index of the cell. */
    inline sal_uInt32   GetXclRow() const { return maXclPos.mnRow; }
    sal_uInt32   GetXclRow() const { return maXclPos.mnRow; }

    /** Derived classes return the column index of the last contained cell. */
    virtual sal_uInt16  GetLastXclCol() const = 0;
@@ -308,7 +308,7 @@ protected:
                            sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos );

    /** Sets this record to a new column position. */
    inline void         SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; }
    void         SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; }

private:
    XclAddress          maXclPos;       /// Address of the cell.
@@ -341,11 +341,11 @@ protected:
                            sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos,
                            const ScPatternAttr* pPattern, sal_Int16 nScript, sal_uInt32 nForcedXFId );

    inline void         SetContSize( std::size_t nContSize ) { mnContSize = nContSize; }
    inline std::size_t  GetContSize() const { return mnContSize; }
    void         SetContSize( std::size_t nContSize ) { mnContSize = nContSize; }
    std::size_t  GetContSize() const { return mnContSize; }

    inline void         SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; }
    inline sal_uInt32   GetXFId() const { return maXFId.mnXFId; }
    void         SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; }
    sal_uInt32   GetXFId() const { return maXFId.mnXFId; }

private:
    /** Writes cell address, XF index, and calls WriteContents() for each cell. */
@@ -470,7 +470,7 @@ struct XclExpMultiXFId : public XclExpXFId
{
    sal_uInt16          mnCount;        /// Number of XF identifiers.

    inline explicit     XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) :
    explicit     XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) :
                            XclExpXFId( nXFId ), mnCount( nCount ) {}
};

@@ -585,9 +585,9 @@ class XclExpOutlineBuffer
{
public:
    /** Returns true, if a collapsed group ends at the last processed position. */
    inline bool         IsCollapsed() const { return mbCurrCollapse; }
    bool         IsCollapsed() const { return mbCurrCollapse; }
    /** Returns the highest level of an open group at the last processed position. */
    inline sal_uInt8    GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); }
    sal_uInt8    GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); }

protected:
    /** Constructs the outline buffer.
@@ -603,7 +603,7 @@ private:
    {
        SCCOLROW            mnScEndPos;         /// The end position of a group in a level.
        bool                mbHidden;           /// true = Group in this level is hidden.
        inline explicit     XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {}
        explicit     XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {}
    };
    typedef ::std::vector< XclExpLevelInfo > XclExpLevelInfoVec;

@@ -617,11 +617,11 @@ private:
class XclExpColOutlineBuffer : public XclExpOutlineBuffer
{
public:
    inline explicit     XclExpColOutlineBuffer( const XclExpRoot& rRoot ) :
    explicit     XclExpColOutlineBuffer( const XclExpRoot& rRoot ) :
                            XclExpOutlineBuffer( rRoot, false ) {}

    /** Updates the current state by processing the settings of the passed Calc column. */
    inline void         Update( SCCOL nScCol )
    void         Update( SCCOL nScCol )
                            { UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); }
};

@@ -629,11 +629,11 @@ public:
class XclExpRowOutlineBuffer : public XclExpOutlineBuffer
{
public:
    inline explicit     XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) :
    explicit     XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) :
                            XclExpOutlineBuffer( rRoot, true ) {}

    /** Updates the current state by processing the settings of the passed Calc row. */
    inline void         Update( SCROW nScRow )
    void         Update( SCROW nScRow )
                            { UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); }
};

@@ -726,11 +726,11 @@ public:
    bool                TryMerge( const XclExpColinfo& rColInfo );

    /** Returns the Excel width of the column(s). */
    inline sal_uInt16   GetColWidth() const { return mnWidth; }
    sal_uInt16   GetColWidth() const { return mnWidth; }
    /** Returns the final Excel XF index of the column(s). */
    inline sal_uInt16   GetXFIndex() const { return maXFId.mnXFIndex; }
    sal_uInt16   GetXFIndex() const { return maXFId.mnXFIndex; }
    /** Returns the number of columns represented by this record. */
    inline sal_uInt16   GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; }
    sal_uInt16   GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; }

    /** Returns true, if the column has default format and width. */
    bool                IsDefault( const XclExpDefcolwidth& rDefColWidth ) const;
@@ -798,9 +798,9 @@ struct XclExpDefaultRowData
    explicit            XclExpDefaultRowData( const XclExpRow& rRow );

    /** Returns true, if rows are hidden by default. */
    inline bool         IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); }
    bool         IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); }
    /** Returns true, if the rows have a manually set height by default. */
    inline bool         IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); }
    bool         IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); }
};

/** Represents a DEFROWHEIGHT record containing default format for unused rows. */
@@ -841,17 +841,17 @@ public:
                            XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty, bool bHidden, sal_uInt16 nHeight );

    /** Returns the excel row index of this ROW record. */
    inline sal_uInt32   GetXclRow() const { return mnXclRow; }
    sal_uInt32   GetXclRow() const { return mnXclRow; }
    /** Returns the height of the row in twips. */
    inline sal_uInt16   GetHeight() const { return mnHeight; }
    sal_uInt16   GetHeight() const { return mnHeight; }
    /** Returns true, if this row does not contain at least one valid cell. */
    inline bool         IsEmpty() const { return maCellList.IsEmpty(); }
    bool         IsEmpty() const { return maCellList.IsEmpty(); }
    /** Returns true, if this row is hidden. */
    inline bool         IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); }
    bool         IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); }
    /** Returns true, if this row contains a manually set height. */
    inline bool         IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); }
    bool         IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); }
    /** Returns true, if this row is enabled (will be exported). */
    inline bool         IsEnabled() const { return mbEnabled; }
    bool         IsEnabled() const { return mbEnabled; }

    /** Appends the passed cell object to this row. */
    void                AppendCell( XclExpCellRef const & xCell, bool bIsMergedBase );
@@ -884,8 +884,8 @@ public:
    virtual void        Save( XclExpStream& rStrm ) override;
    virtual void        SaveXml( XclExpXmlStream& rStrm ) override;

    inline sal_uInt32   GetXclRowRpt() const { return mnXclRowRpt; }
    inline void         SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; }
    sal_uInt32   GetXclRowRpt() const { return mnXclRowRpt; }
    void         SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; }
private:
    /** Inserts a cell at the specified list position, tries to merge with neighbors. */
    void                InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase );
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 3a5272d..7d72bf8 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -87,7 +87,7 @@ public:
    virtual             ~XclImpChRoot() override;

    /** Returns this root instance - for code readability in derived classes. */
    inline const XclImpChRoot& GetChRoot() const { return *this; }
    const XclImpChRoot& GetChRoot() const { return *this; }
    /** Returns a reference to the parent chart data object. */
    XclImpChChart&      GetChartData() const;
    /** Returns chart type info for a unique chart type identifier. */
@@ -204,7 +204,7 @@ public:
    void                ReadChFramePos( XclImpStream& rStrm );

    /** Returns read-only access to the imported frame position data. */
    inline const XclChFramePos& GetFramePosData() const { return maData; }
    const XclChFramePos& GetFramePosData() const { return maData; }

private:
    XclChFramePos       maData;             /// Position of the frame.
@@ -217,21 +217,21 @@ class XclImpChLineFormat
{
public:
    /** Creates a new line format object with automatic formatting. */
    inline explicit     XclImpChLineFormat() {}
    explicit     XclImpChLineFormat() {}
    /** Creates a new line format object with the passed formatting. */
    inline explicit     XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {}
    explicit     XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {}

    /** Reads the CHLINEFORMAT record (basic line properties). */
    void                ReadChLineFormat( XclImpStream& rStrm );

    /** Returns true, if the line format is set to automatic. */
    inline bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
    bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); }
    /** Returns true, if the line style is set to something visible. */
    inline bool         HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); }
    bool         HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); }
    /** Returns the line width of this line format (returns 'single', if the line is invisible). */
    inline sal_Int16    GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; }
    sal_Int16    GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; }
    /** Returns true, if the "show axis" flag is set. */
    inline bool         IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); }
    bool         IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); }

    /** Converts and writes the contained data to the passed property set. */
    void                Convert( const XclImpChRoot& rRoot,
@@ -249,17 +249,17 @@ class XclImpChAreaFormat
{
public:
    /** Creates a new area format object with automatic formatting. */
    inline explicit     XclImpChAreaFormat() {}
    explicit     XclImpChAreaFormat() {}
    /** Creates a new area format object with the passed formatting. */
    inline explicit     XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {}
    explicit     XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {}

    /** Reads the CHAREAFORMAT record (basic fill properties, e.g. transparent or colored). */
    void                ReadChAreaFormat( XclImpStream& rStrm );

    /** Returns true, if the area format is set to automatic. */
    inline bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
    bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); }
    /** Returns true, if the area style is set to something visible. */
    inline bool         HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); }
    bool         HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); }

    /** Converts and writes the contained data to the passed property set. */
    void                Convert( const XclImpChRoot& rRoot,
@@ -305,7 +305,7 @@ class XclImpChFrameBase : public XclImpChGroupBase
{
public:
    /** Creates a new frame object without internal formatting objects. */
    inline explicit     XclImpChFrameBase() {}
    explicit     XclImpChFrameBase() {}
    /** Creates a new frame object with specific default formatting. */
    explicit            XclImpChFrameBase( const XclChFormatInfo& rFmtInfo );

@@ -313,14 +313,14 @@ public:
    virtual void        ReadSubRecord( XclImpStream& rStrm ) override;

    /** Returns true, if the line format is set to automatic. */
    inline bool         IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); }
    bool         IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); }
    /** Returns true, if the line style is set to something visible. */
    inline bool         HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
    bool         HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
    /** Returns the line weight used for this frame. */
    inline sal_Int16    GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
    sal_Int16    GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }

    /** Returns true, if the area format is set to automatic. */
    inline bool         IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }
    bool         IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }

protected:
    /** Converts and writes the contained line formatting to the passed property set. */
@@ -387,12 +387,12 @@ public:
    void                SetTextFormats( const XclFormatRunVec& rFormats );

    /** Returns the destination object (title, values, category, ...). */
    inline sal_uInt8    GetDestType() const { return maData.mnDestType; }
    sal_uInt8    GetDestType() const { return maData.mnDestType; }
    /** Returns the link type (to worksheet, directly, default, ...). */
    inline sal_uInt8    GetLinkType() const { return maData.mnLinkType; }
    sal_uInt8    GetLinkType() const { return maData.mnLinkType; }

    /** Returns true, if the source link contains explicit string data. */
    inline bool         HasString() const { return mxString && !mxString->IsEmpty(); }
    bool         HasString() const { return mxString && !mxString->IsEmpty(); }
    /** Returns explicit string data or an empty string. */
    OUString            GetString() const {
        if (mxString) return mxString->GetText();
@@ -452,7 +452,7 @@ public:
    void                ReadChFont( XclImpStream& rStrm );

    /** Returns the contained font index. */
    inline sal_uInt16   GetFontIndex() const { return mnFontIdx; }
    sal_uInt16   GetFontIndex() const { return mnFontIdx; }

private:
    sal_uInt16          mnFontIdx;          /// Index into font buffer.
@@ -490,13 +490,13 @@ public:
    void                UpdateDataLabel( bool bCateg, bool bValue, bool bPercent );

    /** Returns the target object this text is linked to. */
    inline sal_uInt16   GetLinkTarget() const { return maObjLink.mnTarget; }
    sal_uInt16   GetLinkTarget() const { return maObjLink.mnTarget; }
    /** Returns the position of the data point label this text is linked to. */
    inline const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
    const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
    /** Returns true, if this text group contains string data. */
    inline bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
    bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
    /** Returns true, if the text object is marked as deleted. */
    inline bool         IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }
    bool         IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }

    /** Converts and writes the contained font settings to the passed property set. */
    void                ConvertFont( ScfPropertySet& rPropSet ) const;
@@ -545,7 +545,7 @@ public:
    void                ReadChMarkerFormat( XclImpStream& rStrm );

    /** Returns true, if the marker format is set to automatic. */
    inline bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); }
    bool         IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); }

    /** Converts and writes the contained data to the passed property set. */
    void                Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet,
@@ -584,7 +584,7 @@ public:
    /** Reads the CHSERIESFORMAT record (additional settings for a series). */
    void                ReadChSeriesFormat( XclImpStream& rStrm );
    /** Returns true, if the series line is smoothed. */
    inline bool         HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); }
    bool         HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); }

private:
    sal_uInt16          mnFlags;            /// Additional flags.
@@ -642,7 +642,7 @@ public:
    /** Sets this object to the specified data point position. */
    void                SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx );
    /** Sets type and text formatting for a data point label (CHTEXT group). */
    inline void         SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; }
    void         SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; }

    /** Updates default data format for series group. */
    void                UpdateGroupFormat( const XclChExtTypeInfo& rTypeInfo );
@@ -654,15 +654,15 @@ public:
    void                UpdateTrendLineFormat();

    /** Returns the position of the data point described by this group. */
    inline const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; }
    const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; }
    /** Returns the format index of the data point described by this group. */
    inline sal_uInt16   GetFormatIdx() const { return maData.mnFormatIdx; }
    sal_uInt16   GetFormatIdx() const { return maData.mnFormatIdx; }
    /** Returns true, if markers are set to automatic format. */
    inline bool         IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
    bool         IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
    /** Returns true, if the series line is smoothed. */
    inline bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
    bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
    /** Returns the data label text object. */
    inline const XclImpChText* GetDataLabel() const { return mxLabel.get(); }
    const XclImpChText* GetDataLabel() const { return mxLabel.get(); }

    /** Converts and writes the contained data to the passed property set. */
    void                Convert( ScfPropertySet& rPropSet, const XclChExtTypeInfo& rTypeInfo ) const;
@@ -698,9 +698,9 @@ public:
    /** Reads the CHSERTRENDLINE record. */
    void                ReadChSerTrendLine( XclImpStream& rStrm );
    /** Sets formatting information for the trend line. */
    inline void         SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; }
    void         SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; }

    inline void         SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }
    void         SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; }

    /** Creates an API object representing this trend line. */
    css::uno::Reference< css::chart2::XRegressionCurve >
@@ -728,7 +728,7 @@ public:
                            XclImpChDataFormatRef const & xDataFmt );

    /** Returns the type of this error bar (X/Y, plus/minus). */
    inline sal_uInt8    GetBarType() const { return maData.mnBarType; }
    sal_uInt8    GetBarType() const { return maData.mnBarType; }
    /** Creates a labeled data sequence object from value data link. */
    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
                        CreateValueSequence() const;
@@ -772,18 +772,18 @@ public:
    void                FinalizeDataFormats();

    /** Returns the axes set identifier this series is assigned to (primary/secondary). */
    inline sal_uInt16   GetGroupIdx() const { return mnGroupIdx; }
    sal_uInt16   GetGroupIdx() const { return mnGroupIdx; }
    /** Returns the 0-based index of the parent series (e.g. of a trend line). */
    inline sal_uInt16   GetParentIdx() const { return mnParentIdx; }
    sal_uInt16   GetParentIdx() const { return mnParentIdx; }
    /** Returns true, if the series is child of another series (e.g. trend line). */
    inline bool         HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
    bool         HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
    /** Returns true, if the series contains child series (e.g. trend lines). */
    inline bool         HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); }
    bool         HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); }
    /** Returns series title or an empty string, if the series does not contain a title. */
    OUString            GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : OUString(); }

    /** Returns true, if the series line is smoothed. */
    inline bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
    bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }

    /** Creates a labeled data sequence object from value data link. */
    css::uno::Reference< css::chart2::data::XLabeledDataSequence >
@@ -854,9 +854,9 @@ public:
    void                Finalize( bool bStockChart );

    /** Returns the record identifier of the chart type record. */
    inline sal_uInt16   GetRecId() const { return mnRecId; }
    sal_uInt16   GetRecId() const { return mnRecId; }
    /** Returns the chart type info struct for the contained chart type. */
    inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    /** Returns true, if the series in this chart type group are stacked on each other (no percentage). */
    bool                IsStacked() const;
    /** Returns true, if the series in this chart type group are stacked on each other as percentage. */
@@ -884,7 +884,7 @@ public:
    /** Reads the CHCHART3D record (properties for 3D charts). */
    void                ReadChChart3d( XclImpStream& rStrm );
    /** Returns true, if the data points are clustered on the X axis. */
    inline bool         IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
    bool         IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); }
    /** Converts and writes the contained data to the passed property set. */
    void                Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) const;

@@ -974,21 +974,21 @@ public:
    sal_uInt16          PopUnusedFormatIndex();

    /** Returns the index of this chart type group. */
    inline sal_uInt16   GetGroupIdx() const { return maData.mnGroupIdx; }
    sal_uInt16   GetGroupIdx() const { return maData.mnGroupIdx; }
    /** Returns the chart type info struct for the contained chart type. */
    inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
    /** Returns true, if this chart type group contains at least one valid series. */
    inline bool         IsValidGroup() const { return !maSeries.empty(); }
    bool         IsValidGroup() const { return !maSeries.empty(); }
    /** Returns true, if the series in this chart type group are stacked on each other as percentage. */
    inline bool         IsPercent() const { return maType.IsPercent(); }
    bool         IsPercent() const { return maType.IsPercent(); }
    /** Returns true, if the chart is three-dimensional. */
    inline bool         Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; }
    bool         Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; }
    /** Returns true, if chart type supports wall and floor format in 3d mode. */
    inline bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
    bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
    /** Returns true, if the series in this chart type group are ordered on the Z axis. */
    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
    bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
    /** Returns true, if category (X axis) labels are enabled (may be disabled in radar charts). */
    inline bool         HasCategoryLabels() const { return maType.HasCategoryLabels(); }
    bool         HasCategoryLabels() const { return maType.HasCategoryLabels(); }
    /** Returns true, if points of a series show varying automatic area format. */
    bool                HasVarPointFormat() const;
    /** Returns true, if bars are connected with lines (stacked bar charts only). */
@@ -1022,7 +1022,7 @@ private:
    void                ReadChDataFormat( XclImpStream& rStrm );

    /** Returns true, if the chart type group contains drop bar formats. */
    inline bool         HasDropBars() const { return !m_DropBars.empty(); }
    bool         HasDropBars() const { return !m_DropBars.empty(); }

    /** Inserts the passed series into the chart type. Adds additional properties to the series. */
    void                InsertDataSeries( css::uno::Reference< css::chart2::XChartType > const & xChartType,
@@ -1103,7 +1103,7 @@ public:
    void                ReadChTick( XclImpStream& rStrm );

    /** Returns true, if the axis shows attached labels. */
    inline bool         HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; }
    bool         HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; }
    /** Returns the leading font color for the axis labels. */
    Color               GetFontColor() const;
    /** Returns the rotation value for the axis labels. */
@@ -1144,9 +1144,9 @@ public:
    virtual sal_uInt16  GetRotation() const override;

    /** Returns the type of this axis. */
    inline sal_uInt16   GetAxisType() const { return maData.mnType; }
    sal_uInt16   GetAxisType() const { return maData.mnType; }
    /** Returns the axis dimension index used by the chart API. */
    inline sal_Int32    GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }
    sal_Int32    GetApiAxisDimension() const { return maData.GetApiAxisDimension(); }

    /** Creates an API axis object. */
    css::uno::Reference< css::chart2::XAxis >
@@ -1196,11 +1196,11 @@ public:
    void                Finalize();

    /** Returns true, if this axes set exists (returns false if this is a dummy object). */
    inline bool         IsValidAxesSet() const { return !maTypeGroups.empty(); }
    bool         IsValidAxesSet() const { return !maTypeGroups.empty(); }
    /** Returns the index of the axes set (primary/secondary). */
    inline sal_uInt16   GetAxesSetId() const { return maData.mnAxesSetId; }
    sal_uInt16   GetAxesSetId() const { return maData.mnAxesSetId; }
    /** Returns the axes set index used by the chart API. */
    inline sal_Int32    GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }
    sal_Int32    GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); }

    /** Returns the outer plot area position, if existing. */
    const XclImpChFramePosRef& GetPlotAreaFramePos() const { return mxFramePos; }
@@ -1291,7 +1291,7 @@ public:
    /** Returns true, if the plot area has benn moved and/or resized manually. */
    bool                IsManualPlotArea() const;
    /** Returns the number of units on the progress bar needed for the chart. */
    static inline std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; }
    static std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; }

    /** Converts and writes all properties to the passed chart. */
    void                Convert(
@@ -1383,7 +1383,7 @@ public:
    /** Returns the number of units on the progress bar needed for the chart. */
    std::size_t         GetProgressSize() const;
    /** Returns true, if the chart is based on a pivot table. */
    inline bool         IsPivotChart() const { return mbIsPivotChart; }
    bool         IsPivotChart() const { return mbIsPivotChart; }

    /** Creates the chart object in the passed component. */
    void                Convert( css::uno::Reference< css::frame::XModel > const & xModel,
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 6c0552d..185ee9a3 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -73,9 +73,9 @@ public:
    static XclImpDrawObjRef ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm );

    /** Sets whether this is an area object (then its width and height must be greater than 0). */
    inline void         SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
    void         SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
    /** If set to true, a new SdrObject will be created while in DFF import. */
    inline void         SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; }
    void         SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; }

    /** Sets the object anchor explicitly. */
    void                SetAnchor( const XclObjAnchor& rAnchor );
@@ -85,32 +85,32 @@ public:
        bool bVisible, bool bAutoMargin );

    /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */
    inline void         SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; }
    void         SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; }
    /** If set to false, the SdrObject will be created or processed, but not be inserted into the draw page. */
    inline void         SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; }
    void         SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; }
    /** If set to true, a new SdrObject will be created while in DFF import. */
    inline void         SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; }
    void         SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; }

    /** Returns the sheet index and Excel object identifier from OBJ record. */
    inline sal_uInt16   GetObjId() const { return mnObjId; }
    sal_uInt16   GetObjId() const { return mnObjId; }
    /** Returns the Excel object type from OBJ record. */
    inline sal_uInt16   GetObjType() const { return mnObjType; }
    sal_uInt16   GetObjType() const { return mnObjType; }
    /** Returns the name of this object, may generate a default name. */
    virtual OUString GetObjName() const;
    /** Returns associated macro name, if set, otherwise zero length string. */
    inline const OUString& GetMacroName() const { return maMacroName; }
    const OUString& GetMacroName() const { return maMacroName; }

    /** Returns the shape identifier used in the DFF stream. */
    inline sal_uInt32   GetDffShapeId() const { return mnDffShapeId; }
    sal_uInt32   GetDffShapeId() const { return mnDffShapeId; }
    /** Returns the shape flags from the DFF stream. */
    inline sal_uInt32   GetDffFlags() const { return mnDffFlags; }
    sal_uInt32   GetDffFlags() const { return mnDffFlags; }

    /** Returns true, if the object is hidden. */
    inline bool         IsHidden() const { return mbHidden; }
    bool         IsHidden() const { return mbHidden; }
    /** Returns true, if the object is visible. */
    inline bool         IsVisible() const { return mbVisible; }
    bool         IsVisible() const { return mbVisible; }
    /** Returns true, if the object is printable. */
    inline bool         IsPrintable() const { return mbPrintable; }
    bool         IsPrintable() const { return mbPrintable; }

    /** Returns the object anchor if existing, null otherwise. */
    const XclObjAnchor* GetAnchor() const;
@@ -120,9 +120,9 @@ public:
    ScRange             GetUsedArea( SCTAB nScTab ) const;

    /** Returns true, if the object is valid and will be processed. */
    inline bool         IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; }
    bool         IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; }
    /** Returns true, if the SdrObject will be created or processed, but not be inserted into the draw page. */
    inline bool         IsInsertSdrObj() const { return mbInsertSdr; }
    bool         IsInsertSdrObj() const { return mbInsertSdr; }

    /** Returns the needed size on the progress bar (calls virtual DoGetProgressSize() function). */
    std::size_t         GetProgressSize() const;
@@ -215,7 +215,7 @@ private:
    std::vector< XclImpDrawObjRef > mObjs;

public:
    inline explicit     XclImpDrawObjVector() : mObjs() {}
    explicit     XclImpDrawObjVector() : mObjs() {}

    std::vector< XclImpDrawObjRef >::const_iterator begin() const { return mObjs.begin(); }
    std::vector< XclImpDrawObjRef >::const_iterator end() const { return mObjs.end(); }
@@ -386,7 +386,7 @@ public:
    explicit            XclImpTextObj( const XclImpRoot& rRoot );

    /** Stores the passed textbox data. */
    inline void         SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; }
    void         SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; }

protected:
    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
@@ -467,7 +467,7 @@ public:
    virtual             ~XclImpControlHelper();

    /** Returns true, if a linked cell address is present. */
    inline bool         HasCellLink() const { return mxCellLink != nullptr; }
    bool         HasCellLink() const { return mxCellLink != nullptr; }

    /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */
    SdrObjectPtr        CreateSdrObjectFromShape(
@@ -512,7 +512,7 @@ public:
    void                SetDffProperties( const DffPropSet& rDffPropSet );

    /** Returns the service name of the control component to be created. */
    inline OUString GetServiceName() const { return DoGetServiceName(); }
    OUString GetServiceName() const { return DoGetServiceName(); }
    /** Fills the passed macro event descriptor. */
    bool                FillMacroDescriptor(
                            css::script::ScriptEventDescriptor& rDescriptor ) const;
@@ -820,22 +820,22 @@ public:
    /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/
    virtual OUString GetObjName() const override;
    /** Returns the graphic imported from the IMGDATA record. */
    inline const Graphic& GetGraphic() const { return maGraphic; }
    const Graphic& GetGraphic() const { return maGraphic; }

    /** Returns the visible area of the imported graphic. */
    inline const Rectangle& GetVisArea() const { return maVisArea; }
    const Rectangle& GetVisArea() const { return maVisArea; }

    /** Returns true, if the OLE object will be shown as symbol. */
    inline bool         IsSymbol() const { return mbSymbol; }
    bool         IsSymbol() const { return mbSymbol; }
    /** Returns the storage name for the OLE object. */
    OUString            GetOleStorageName() const;

    /** Returns true, if this object is an OCX form control. */
    inline bool         IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; }
    bool         IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; }
    /** Returns the position in the 'Ctls' stream for additional form control data. */
    inline std::size_t  GetCtlsStreamPos() const { return mnCtlsStrmPos; }
    std::size_t  GetCtlsStreamPos() const { return mnCtlsStrmPos; }
    /** Returns the size in the 'Ctls' stream for additional form control data. */
    inline std::size_t  GetCtlsStreamSize() const { return mnCtlsStrmSize; }
    std::size_t  GetCtlsStreamSize() const { return mnCtlsStrmSize; }

protected:
    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
@@ -900,8 +900,8 @@ private:
    {
        SdrObject*          mpSdrObj;       /// Pointer to an SdrObject.
        sal_uInt32          mnDffFlags;     /// Shape flags from DFF stream.
        inline explicit     XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {}
        inline void         Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags )
        explicit     XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {}
        void         Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags )
                                { mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; }
    };
    typedef std::map< sal_uInt32, XclImpSdrInfo > XclImpSdrInfoMap;
@@ -962,7 +962,7 @@ public:
    /** Returns true, if the conversion of OLE objects is supported. */
    bool                SupportsOleObjects() const;
    /** Returns the default text margin in drawing layer units. */
    inline sal_Int32    GetDefaultTextMargin() const { return mnDefTextMargin; }
    sal_Int32    GetDefaultTextMargin() const { return mnDefTextMargin; }

private:
    // virtual functions of SvxMSDffManager
@@ -1068,7 +1068,7 @@ public:
    void                ReadMsoDrawing( XclImpStream& rStrm );

    /** Returns true, if the conversion of OLE objects is supported. */
    inline bool         SupportsOleObjects() const { return mbOleObjs; }
    bool         SupportsOleObjects() const { return mbOleObjs; }
    /** Finds the OBJ record data related to the DFF shape at the passed position. */
    XclImpDrawObjRef    FindDrawObj( const DffRecordHeader& rHeader ) const;
    /** Finds the OBJ record data specified by the passed object identifier. */
@@ -1133,7 +1133,7 @@ public:
    void                ReadTabChart( XclImpStream& rStrm );

    /** Returns the total cell range covered by any shapes in the sheet. */
    inline const ScRange& GetUsedArea() const { return maScUsedArea; }
    const ScRange& GetUsedArea() const { return maScUsedArea; }
    /** Converts all objects and inserts them into the sheet drawing page. */
    void                ConvertObjects( XclImpDffConverter& rDffConv );

diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index a523231..e5a5f64 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -201,11 +201,11 @@ private:    // types

private:
    /** Returns the current edit engine text object. */
    inline XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; }
    XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; }
    /** Returns the current edit engine text object. */
    inline XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; }
    XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; }
    /** Returns the current selection. */
    inline ESelection&  GetCurrSel() { return GetCurrInfo().maSel; }
    ESelection&  GetCurrSel() { return GetCurrInfo().maSel; }

    /** Returns the maximum line height of the specified portion. */
    sal_uInt16          GetMaxLineHeight( XclImpHFPortion ePortion ) const;
@@ -309,15 +309,15 @@ public:
    virtual             ~XclImpCachedValue();

    /** Returns the type of the cached value (EXC_CACHEDVAL_*). */
    inline sal_uInt8    GetType() const     { return mnType; }
    sal_uInt8    GetType() const     { return mnType; }
    /** Returns the cached string value, if this value is a string, else an empty string. */
    const OUString& GetString() const { return maStr;}
    /** Returns the cached number, if this value has number type, else 0.0. */
    inline double       GetValue() const    { return mfValue; }
    double       GetValue() const    { return mfValue; }
    /** Returns the cached Boolean value, if this value has Boolean type, else false. */
    inline bool         GetBool() const     { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); }
    bool         GetBool() const     { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); }
    /** Returns the cached Calc error code, if this value has Error type, else 0. */
    inline sal_uInt8    GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
    sal_uInt8    GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
    /** Returns the cached Calc error code, if this value has Error type, else 0. */
    FormulaError        GetScError() const;

diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index a7e686c..0da156d 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -51,12 +51,12 @@ public:

    explicit            XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx );

    inline const OUString& GetXclName() const { return maXclName; }
    inline const OUString& GetScName() const { return maScName; }
    inline SCTAB        GetScTab() const { return mnScTab; }
    inline const ScRangeData* GetScRangeData() const { return mpScData; }
    inline bool         IsGlobal() const { return mnScTab == SCTAB_MAX; }
    inline bool         IsVBName() const { return mbVBName; }
    const OUString& GetXclName() const { return maXclName; }
    const OUString& GetScName() const { return maScName; }
    SCTAB        GetScTab() const { return mnScTab; }
    const ScRangeData* GetScRangeData() const { return mpScData; }
    bool         IsGlobal() const { return mnScTab == SCTAB_MAX; }
    bool         IsVBName() const { return mbVBName; }
    bool IsMacro() const { return mbMacro; }
    void ConvertTokens();

diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx
index eef405a..f7b1756 100644
--- a/sc/source/filter/inc/xipage.hxx
+++ b/sc/source/filter/inc/xipage.hxx
@@ -33,7 +33,7 @@ public:
    explicit            XclImpPageSettings( const XclImpRoot& rRoot );

    /** Returns read-only access to the page data. */
    inline const XclPageData& GetPageData() const { return maData; }
    const XclPageData& GetPageData() const { return maData; }

    /** Initializes the object to be used for a new sheet. */
    void                Initialize();
@@ -58,7 +58,7 @@ public:
    /** Overrides paper size and orientation (used in sheet-charts). */
    void                SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait );
    /** Sets or clears the fit-to-pages setting (contained in WSBOOL record). */
    inline void         SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; }
    void         SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; }

    /** Creates a page stylesheet from current settings and sets it at current sheet. */
    void                Finalize();
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 8bf4305..34c0c32 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -149,7 +149,7 @@ public:
    // data access ------------------------------------------------------------

    /** Returns the data source range read from the DCONREF record. */
    inline const ScRange& GetSourceRange() const { return maSrcRange; }
    const ScRange& GetSourceRange() const { return maSrcRange; }

    const OUString& GetSourceRangeName() const { return maSrcRangeName; }

@@ -236,9 +236,9 @@ public:
    const OUString* GetItemName( sal_uInt16 nItemIdx ) const;

    /** Returns the flags of the axes this field is part of. */
    inline sal_uInt16   GetAxes() const { return maFieldInfo.mnAxes; }
    sal_uInt16   GetAxes() const { return maFieldInfo.mnAxes; }
    /** Sets the flags of the axes this field is part of. */
    inline void         SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; }
    void         SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; }

    // records ----------------------------------------------------------------

@@ -298,7 +298,7 @@ public:
    // cache/field access, misc. ----------------------------------------------

    const XclImpPivotCacheRef& GetPivotCache() const { return mxPCache; }
    inline const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; }
    const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; }

    sal_uInt16          GetFieldCount() const;
    const XclImpPTField* GetField( sal_uInt16 nFieldIdx ) const;
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 0af4386..389df5c 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -129,8 +129,8 @@ public:
    explicit            XclImpRoot( XclImpRootData& rImpRootData );

    /** Returns this root instance - for code readability in derived classes. */
    inline const XclImpRoot& GetRoot() const { return *this; }
    inline XclImpRoot& GetRoot() { return *this; }
    const XclImpRoot& GetRoot() const { return *this; }
    XclImpRoot& GetRoot() { return *this; }

    /** Sets a code page read from a CODEPAGE record for byte string import. */
    void                SetCodePage( sal_uInt16 nCodePage );
@@ -204,9 +204,9 @@ public:
    static OUString      GetScAddInName( const OUString& rXclName );

    /** Returns true, if the document contains a VB project. */
    inline bool         HasBasic() const { return mrImpData.mbHasBasic; }
    bool         HasBasic() const { return mrImpData.mbHasBasic; }
    /** Called to indicate that the document contains a VB project. */
    inline void         SetHasBasic() { mrImpData.mbHasBasic = true; }
    void         SetHasBasic() { mrImpData.mbHasBasic = true; }
    /** Reads the CODENAME record and inserts the codename into the document. */
    void                ReadCodeName( XclImpStream& rStrm, bool bGlobals );

diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 8c55675..a3f6890c 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -47,9 +47,9 @@ public:
    virtual             ~XclImpDecrypter() override;

    /** Returns the current error code of the decrypter. */
    inline ErrCode      GetError() const { return mnError; }
    ErrCode      GetError() const { return mnError; }
    /** Returns true, if the decoder has been initialized correctly. */
    inline bool         IsValid() const { return mnError == ERRCODE_NONE; }
    bool         IsValid() const { return mnError == ERRCODE_NONE; }

    /** Creates a (ref-counted) copy of this decrypter object. */
    XclImpDecrypterRef  Clone() const;
@@ -214,7 +214,7 @@ public:
                            bool& rbValid ) const;

    /** Returns the stored stream position. */
    inline std::size_t  GetPos() const { return mnPos; }
    std::size_t  GetPos() const { return mnPos; }

private:
    std::size_t         mnPos;          /// Absolute position of the stream.
@@ -289,7 +289,7 @@ public:
                        ~XclImpStream();

    /** Returns the filter root data. */
    inline const XclImpRoot& GetRoot() const { return mrRoot; }
    const XclImpRoot& GetRoot() const { return mrRoot; }

    /** Sets stream pointer to the start of the next record content.
        @descr  Ignores all CONTINUE records of the current record, if automatic
@@ -330,7 +330,7 @@ public:
    /** Switches usage of current decryption algorithm off.
        @descr  This is a record-local setting. The function StartNextRecord()
        always enables decryption. */
    inline void         DisableDecryption() { EnableDecryption( false ); }
    void         DisableDecryption() { EnableDecryption( false ); }

    /** Pushes current position on user position stack.
        @descr  This stack is emptied when starting a new record with
@@ -347,9 +347,9 @@ public:
    void                SeekGlobalPosition();

    /** Returns record reading state: false = record overread. */
    inline bool         IsValid() const { return mbValid; }
    bool         IsValid() const { return mbValid; }
    /** Returns the current record ID. */
    inline sal_uInt16   GetRecId() const { return mnRecId; }
    sal_uInt16   GetRecId() const { return mnRecId; }
    /** Returns the position inside of the whole record content. */
    std::size_t         GetRecPos() const;
    /** Returns the data size of the whole record without record headers. */
@@ -426,7 +426,7 @@ public:
        @param cNulSubst  The character to use for NUL replacement. It is
        possible to specify NUL here. in this case strings are terminated when
        the first NUL occurs during string import. */
    inline void         SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; }
    void         SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; }

    /** Reads nChars characters and returns the string. */
    OUString            ReadRawUniString( sal_uInt16 nChars, bool b16Bit );
@@ -455,9 +455,9 @@ public:
    // *** SvStream functions *** ---------------------------------------------

    /** Returns the absolute stream position. */
    inline std::size_t  GetSvStreamPos() const { return mrStrm.Tell(); }
    std::size_t  GetSvStreamPos() const { return mrStrm.Tell(); }
    /** Returns the stream size. */
    inline std::size_t  GetSvStreamSize() const { return mnStreamSize; }
    std::size_t  GetSvStreamSize() const { return mnStreamSize; }

    /** Stores current stream position into rPos. */
    void                StorePosition( XclImpStreamPos& rPos );
diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index 0cf90c0..bb9d9f3 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -41,23 +41,23 @@ public:
    void                Read( XclImpStream& rStrm, XclStrFlags nFlags = EXC_STR_DEFAULT );

    /** Sets the passed string data. */
    inline void         SetText( const OUString& rText ) { maString = rText; }
    void         SetText( const OUString& rText ) { maString = rText; }
    /** Sets the passed formatting buffer. */
    inline void         SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; }
    void         SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; }
    /** Reads and appends the formatting information (run count and runs) from stream. */
    inline void         ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); }
    void         ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); }
    /** Reads and appends formatting runs from an OBJ or TXO record. */
    inline void         ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); }
    void         ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); }

    /** Returns true, if the string is empty. */
    inline bool         IsEmpty() const { return maString.isEmpty(); }
    bool         IsEmpty() const { return maString.isEmpty(); }
    /** Returns the pure text data of the string. */
    inline const OUString& GetText() const { return maString; }
    const OUString& GetText() const { return maString; }

    /** Returns true, if the string contains formatting information. */
    inline bool         IsRich() const { return !maFormats.empty(); }
    bool         IsRich() const { return !maFormats.empty(); }
    /** Returns the formatting run vector. */
    inline const XclFormatRunVec& GetFormats() const { return maFormats; }
    const XclFormatRunVec& GetFormats() const { return maFormats; }

    /** Insert a formatting run to the passed format buffer. */
    static void         AppendFormat( XclFormatRunVec& rFormats, sal_uInt16 nChar, sal_uInt16 nFontIdx );
@@ -82,9 +82,9 @@ public:
    explicit            XclImpStringIterator( const XclImpString& rString );

    /** Returns true, if the iterator references a valid text portion. */
    inline bool         Is() const { return mnTextBeg < mrText.getLength(); }
    bool         Is() const { return mnTextBeg < mrText.getLength(); }
    /** Returns the index of the current text portion. */
    inline size_t       GetPortionIndex() const { return mnPortion; }
    size_t       GetPortionIndex() const { return mnPortion; }
    /** Returns the string of the current text portion. */
    OUString            GetPortionText() const;
    /** Returns the font index of the current text portion. */
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index eb4c0c5..66592f6 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -57,7 +57,7 @@ public:
    /** Returns the color for a (non-zero-based) Excel palette entry.
        @descr  First looks for a color read from file, then looks for a default color.
        @return  The color from current or default palette or COL_AUTO, if nothing else found. */
    inline Color        GetColor( sal_uInt16 nXclIndex ) const
    Color        GetColor( sal_uInt16 nXclIndex ) const
                            { return Color( GetColorData( nXclIndex ) ); }

    /** Reads a PALETTE record. */
@@ -89,16 +89,16 @@ public:
    void                SetFontData( const XclFontData& rFontData, bool bHasCharSet );

    /** Returns read-only access to font data. */
    inline const XclFontData& GetFontData() const { return maData; }
    const XclFontData& GetFontData() const { return maData; }
    /** Returns true, if the font character set is valid. */
    inline bool         HasCharSet() const { return mbHasCharSet; }
    bool         HasCharSet() const { return mbHasCharSet; }
    /** Returns true, if the font contains superscript or subscript. */
    inline bool         HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; }
    bool         HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; }
    /** Returns the text encoding for strings used with this font. */
    rtl_TextEncoding    GetFontEncoding() const;

    /** Returns true, if this font contains characters for Asian scripts (CJK). */
    inline bool         HasAsianChars() const { return mbHasAsian; }
    bool         HasAsianChars() const { return mbHasAsian; }

    /** Reads a FONT record for all BIFF versions. */
    void                ReadFont( XclImpStream& rStrm );
@@ -171,7 +171,7 @@ public:
    /** Returns the object that stores all contents of a FONT record. */
    const XclImpFont*   GetFont( sal_uInt16 nFontIndex ) const;
    /** Returns the application font data of this file, needed i.e. for column width. */
    inline const XclFontData& GetAppFontData() const { return maAppFont; }
    const XclFontData& GetAppFontData() const { return maAppFont; }

    /** Reads a FONT record. */
    void                ReadFont( XclImpStream& rStrm );
@@ -362,11 +362,11 @@ struct XclImpCellArea : public XclCellArea
class XclImpXFIndex
{
public:
    inline explicit     XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) :
    explicit     XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) :
                            mnXFIndex( nXFIndex ), mbBoolCell( bBoolCell ) {}

    inline sal_uInt16   GetXFIndex() const { return mnXFIndex; }
    inline bool         IsBoolCell() const { return mbBoolCell; }
    sal_uInt16   GetXFIndex() const { return mnXFIndex; }
    bool         IsBoolCell() const { return mbBoolCell; }

private:
    sal_uInt16          mnXFIndex;      /// The XF record index.
@@ -393,8 +393,8 @@ public:
    /** Reads an XF record. */
    void                ReadXF( XclImpStream& rStrm );

    inline sal_uInt8    GetHorAlign() const { return maAlignment.mnHorAlign; }
    inline sal_uInt16   GetFontIndex() const { return mnXclFont; }
    sal_uInt8    GetHorAlign() const { return maAlignment.mnHorAlign; }
    sal_uInt16   GetFontIndex() const { return mnXclFont; }

    /** Creates a Calc item set containing an item set with all cell properties.
        @param bSkipPoolDefs  true = Do not put items equal to pool default; false = Put all items.
@@ -453,11 +453,11 @@ public:
    /** Reads a STYLE record. */
    void                ReadStyle( XclImpStream& rStrm );

    inline const OUString& GetName() const { return maName; }
    inline sal_uInt16   GetXfId() const { return mnXfId; }
    inline bool         IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); }
    inline sal_uInt8    GetBuiltinId() const { return mnBuiltinId; }
    inline sal_uInt8    GetLevel() const { return mnLevel; }
    const OUString& GetName() const { return maName; }
    sal_uInt16   GetXfId() const { return mnXfId; }
    bool         IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); }
    sal_uInt8    GetBuiltinId() const { return mnBuiltinId; }
    sal_uInt8    GetLevel() const { return mnLevel; }

    /** Creates a cell style sheet and inserts it into the Calc document.
        @return  The pointer to the cell style sheet, or 0, if there is no style sheet. */
@@ -498,10 +498,10 @@ public:
    void                ReadStyle( XclImpStream& rStrm );

    /** Returns the object that stores all contents of an XF record. */
    inline XclImpXF*    GetXF( sal_uInt16 nXFIndex )
    XclImpXF*    GetXF( sal_uInt16 nXFIndex )
                            { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); }

    inline const XclImpXF*    GetXF( sal_uInt16 nXFIndex ) const
    const XclImpXF*    GetXF( sal_uInt16 nXFIndex ) const
                            { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); }

    /** Returns the index to the Excel font used in the specified XF record. */
@@ -578,7 +578,7 @@ public:

    typedef std::vector< std::unique_ptr<XclImpXFRange> > IndexList;

    inline explicit     XclImpXFRangeColumn() {}
    explicit     XclImpXFRangeColumn() {}

    IndexList::iterator begin() { return maIndexList.begin(); }
    IndexList::iterator end() { return maIndexList.end(); }
diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index 1723c8a..60a8430 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -32,11 +32,11 @@ struct XclAddress
    sal_uInt16          mnCol;
    sal_uInt32          mnRow;

    inline explicit     XclAddress( ScAddress::Uninitialized ) {}
    inline explicit     XclAddress() : mnCol( 0 ), mnRow( 0 ) {}
    inline explicit     XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
    explicit     XclAddress( ScAddress::Uninitialized ) {}
    explicit     XclAddress() : mnCol( 0 ), mnRow( 0 ) {}
    explicit     XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}

    inline void         Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }
    void         Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }

    void                Read( XclImpStream& rStrm );
    void                Write( XclExpStream& rStrm ) const;
@@ -60,17 +60,17 @@ struct XclRange
    XclAddress          maFirst;
    XclAddress          maLast;

    inline explicit     XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {}
    inline explicit     XclRange() {}
    inline explicit     XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {}
    inline explicit     XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
    explicit     XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {}
    explicit     XclRange() {}
    explicit     XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {}
    explicit     XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
                            maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {}

    inline void         Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 )
    void         Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 )
                            { maFirst.Set( nCol1, nRow1 ); maLast.Set( nCol2, nRow2 ); }

    inline sal_uInt16   GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
    inline sal_uInt32   GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
    sal_uInt16   GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
    sal_uInt32   GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
    bool                Contains( const XclAddress& rPos ) const;

    void                Read( XclImpStream& rStrm, bool bCol16Bit = true );
@@ -98,7 +98,7 @@ private:
    XclRangeVector mRanges;

public:
    inline explicit     XclRangeList() : mRanges() {}
    explicit     XclRangeList() : mRanges() {}

    size_t size() const { return mRanges.size(); }
    bool empty() const { return mRanges.empty(); }
@@ -137,11 +137,11 @@ public:
    virtual             ~XclAddressConverterBase();

    /** Returns whether the "some columns have been cut" warning box should be shown. */
    inline bool         IsColTruncated() const { return mbColTrunc; }
    bool         IsColTruncated() const { return mbColTrunc; }
    /** Returns whether the "some rows have been cut" warning box should be shown. */
    inline bool         IsRowTruncated() const { return mbRowTrunc; }
    bool         IsRowTruncated() const { return mbRowTrunc; }
    /** Returns whether the "some sheets have been cut" warning box should be shown. */
    inline bool         IsTabTruncated() const { return mbTabTrunc; }
    bool         IsTabTruncated() const { return mbTabTrunc; }

    /** Checks if the passed sheet index is valid.
        @param nScTab  The sheet index to check.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index b47d408..8aa8a47 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1227,10 +1227,10 @@ struct XclChExtTypeInfo : public XclChTypeInfo
    void                Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool bSpline );

    /** Returns true, if this chart type supports area formatting for its series. */
    inline bool         IsSeriesFrameFormat() const
    bool         IsSeriesFrameFormat() const
                            { return mb3dChart ? mbSeriesIsFrame3d : mbSeriesIsFrame2d; }
    /** Returns the correct object type identifier for series and data points. */
    inline XclChObjectType GetSeriesObjectType() const
    XclChObjectType GetSeriesObjectType() const
                            { return IsSeriesFrameFormat() ? EXC_CHOBJTYPE_FILLEDSERIES : EXC_CHOBJTYPE_LINEARSERIES; }
};

@@ -1268,7 +1268,7 @@ enum XclChTextType
/** A map key for text and title objects. */
struct XclChTextKey : public ::std::pair< XclChTextType, ::std::pair< sal_uInt16, sal_uInt16 > >
{
    inline explicit     XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 )
    explicit     XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 )
                            { first = eTextType; second.first = nMainIdx; second.second = nSubIdx; }
};

diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 421cd7c..7ad4d40 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -360,8 +360,8 @@ struct XclObjLineData

    explicit            XclObjLineData();

    inline bool         IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); }
    inline bool         IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); }
    bool         IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); }
    bool         IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); }
};

XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData );
@@ -375,8 +375,8 @@ struct XclObjFillData

    explicit            XclObjFillData();

    inline bool         IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); }
    inline bool         IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); }
    bool         IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); }
    bool         IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); }
};

XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData );
@@ -402,8 +402,8 @@ struct XclObjTextData
    /** Reads text data from a BIFF8 TXO record. */
    void                ReadTxo8( XclImpStream& rStrm );

    inline sal_uInt8    GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); }
    inline sal_uInt8    GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); }
    sal_uInt8    GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); }
    sal_uInt8    GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); }
};

enum XclTbxEventType
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index a0fcc25..f1e1287 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -324,15 +324,15 @@ struct XclFunctionInfo
                                                EXC_FUNCFLAG_ADDINEQUIV is set. */

    /** Returns true, if the function is volatile. */
    inline bool         IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); }
    bool         IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); }
    /** Returns true, if optional parameters are expected to appear in pairs. */
    inline bool         IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); }
    bool         IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); }
    /** Returns true, if the function parameter count is fixed. */
    inline bool         IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); }
    bool         IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); }
    /** Returns true, if the function is simulated by a macro call. */
    inline bool         IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
    bool         IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
    /** Returns true, if the function is stored as an add-in call. */
    inline bool         IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
    bool         IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); }
    /** Returns the name of the external function as string. */
    OUString            GetMacroFuncName() const;
    /** Returns the programmatical name of the Add-In function as string. */
@@ -383,13 +383,13 @@ public:
    explicit            XclTokenArray( ScfUInt8Vec& rTokVec, ScfUInt8Vec& rExtDataVec, bool bVolatile = false );

    /** Returns true, if the token array is empty. */
    inline bool         Empty() const { return maTokVec.empty(); }
    bool         Empty() const { return maTokVec.empty(); }
    /** Returns the size of the token array in bytes. */
    sal_uInt16          GetSize() const;
    /** Returns read-only access to the byte vector storing token data. */
    inline const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); }
    const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); }
    /** Returns true, if the formula contains a volatile function. */
    inline bool         IsVolatile() const { return mbVolatile; }
    bool         IsVolatile() const { return mbVolatile; }

    /** Reads the size field of the token array. */
    void                ReadSize( XclImpStream& rStrm );
@@ -446,11 +446,11 @@ public:

    void                Init( const ScTokenArray& rScTokArr, bool bSkipSpaces );

    inline bool         Is() const { return mppScToken != nullptr; }
    inline bool         operator!() const { return !Is(); }
    inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; }
    inline const ::formula::FormulaToken* operator->() const { return Get(); }
    inline const ::formula::FormulaToken& operator*() const { return *Get(); }
    bool         Is() const { return mppScToken != nullptr; }
    bool         operator!() const { return !Is(); }
    const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; }
    const ::formula::FormulaToken* operator->() const { return Get(); }
    const ::formula::FormulaToken& operator*() const { return *Get(); }

    XclTokenArrayIterator& operator++();

@@ -492,7 +492,7 @@ public:
    inline static sal_uInt8 GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass );

    /** Returns the token class of the passed token ID. */
    inline static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; }
    static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; }
    /** Changes the token class in the passed classified token ID. */
    inline static void  ChangeTokenClass( sal_uInt8& rnTokenId, sal_uInt8 nTokenClass );

diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 67158c3..26a7d301 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -388,7 +388,7 @@ public:
    void                SetBool( bool bValue );

    /** Returns the text representation of the item. */
    inline const OUString& ConvertToText() const { return maText; }
    const OUString& ConvertToText() const { return maText; }

    /** Returns true, if the passed term equals this item. */
    bool                IsEqual( const XclPCItem& rItem ) const;
@@ -475,7 +475,7 @@ public:
    virtual             ~XclPCField();

    /** Returns the index of this field in the containing pivot cache. */
    inline sal_uInt16   GetFieldIndex() const { return mnFieldIdx; }
    sal_uInt16   GetFieldIndex() const { return mnFieldIdx; }

    /** Returns true, if the type of the field is supported by Calc. */
    bool                IsSupportedField() const;
@@ -544,7 +544,7 @@ struct XclPTCachedName
    OUString       maName;         /// The visible name, if used.
    bool                mbUseCache;     /// true = Use name in cache instead of maName.

    inline explicit     XclPTCachedName() : mbUseCache( true ) {}
    explicit     XclPTCachedName() : mbUseCache( true ) {}
};

XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName );
@@ -556,7 +556,7 @@ struct XclPTVisNameInfo
    XclPTCachedName     maVisName;      /// The displayed name of the item.

    /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */
    inline bool         HasVisName() const { return !maVisName.mbUseCache; }
    bool         HasVisName() const { return !maVisName.mbUseCache; }
    /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */
    const OUString* GetVisName() const;
    /** Sets the visible name and enables usage of cache if name is empty. */
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index f90598f..f1b9a10 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -45,7 +45,7 @@ struct XclRange;
struct XclDebugObjCounter
{
    sal_Int32           mnObjCnt;
    inline explicit     XclDebugObjCounter() : mnObjCnt( 0 ) {}
    explicit     XclDebugObjCounter() : mnObjCnt( 0 ) {}
                        ~XclDebugObjCounter();
};
#endif
@@ -138,30 +138,30 @@ public:
    XclRoot&            operator=( const XclRoot& rRoot );

    /** Returns old RootData struct. Deprecated. */
    inline RootData&    GetOldRoot() const { return *mrData.mxRD; }
    RootData&    GetOldRoot() const { return *mrData.mxRD; }

    /** Returns the current BIFF version of the importer/exporter. */
    inline XclBiff      GetBiff() const { return mrData.meBiff; }
    XclBiff      GetBiff() const { return mrData.meBiff; }
    /** Returns the current output format of the importer/exporter. */
    inline XclOutput    GetOutput() const { return mrData.meOutput; }
    XclOutput    GetOutput() const { return mrData.meOutput; }
    /** Returns true, if currently a document is imported. */
    inline bool         IsImport() const { return !mrData.mbExport; }
    bool         IsImport() const { return !mrData.mbExport; }
    /** Returns the text encoding to import/export byte strings. */
    inline rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; }
    rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; }
    /** Returns the system language, i.e. for number formats. */
    inline LanguageType GetSysLanguage() const { return mrData.meSysLang; }
    LanguageType GetSysLanguage() const { return mrData.meSysLang; }
    /** Returns the document language. */
    inline LanguageType GetDocLanguage() const { return mrData.meDocLang; }
    LanguageType GetDocLanguage() const { return mrData.meDocLang; }
    /** Returns the UI language. */
    inline LanguageType GetUILanguage() const { return mrData.meUILang; }
    LanguageType GetUILanguage() const { return mrData.meUILang; }
    /** Returns the default script type, e.g. for blank cells. */
    inline sal_Int16    GetDefApiScript() const { return mrData.mnDefApiScript; }
    sal_Int16    GetDefApiScript() const { return mrData.mnDefApiScript; }
    /** Returns the width of the '0' character (default font) for the current printer (twips). */
    inline long         GetCharWidth() const { return mrData.mnCharWidth; }
    long         GetCharWidth() const { return mrData.mnCharWidth; }
    /** Returns the current Calc sheet index. */
    inline bool         IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; }
    bool         IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; }
    /** Returns the current Calc sheet index. */
    inline SCTAB        GetCurrScTab() const { return mrData.mnScTab; }
    SCTAB        GetCurrScTab() const { return mrData.mnScTab; }

    /** Calculates the width of the passed number of pixels in 1/100 mm. */
    sal_Int32           GetHmmFromPixelX( double fPixelX ) const;
@@ -169,16 +169,16 @@ public:
    sal_Int32           GetHmmFromPixelY( double fPixelY ) const;

    /** Returns the medium to import from. */
    inline SfxMedium&   GetMedium() const { return mrData.mrMedium; }
    SfxMedium&   GetMedium() const { return mrData.mrMedium; }
    /** Returns the document URL of the imported/exported file. */
    inline const OUString& GetDocUrl() const { return mrData.maDocUrl; }
    const OUString& GetDocUrl() const { return mrData.maDocUrl; }
    /** Returns the base path of the imported/exported file. */
    inline const OUString& GetBasePath() const { return mrData.maBasePath; }
    const OUString& GetBasePath() const { return mrData.maBasePath; }
    /** Returns the current user name. */
    inline const OUString& GetUserName() const { return mrData.maUserName; }
    const OUString& GetUserName() const { return mrData.maUserName; }

    /** Returns the default password used for stream encryption. */
    inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
    const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
    /** Requests and verifies a password from the medium or the user. */
    css::uno::Sequence< css::beans::NamedValue >
        RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
@@ -245,25 +245,25 @@ public:
    XclTracer&          GetTracer() const;

    /** Returns the highest possible cell address in a Calc document. */
    inline const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; }
    const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; }
    /** Returns the highest possible cell address in an Excel document (using current BIFF version). */
    inline const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; }
    const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; }
    /** Returns the highest possible cell address valid in Calc and Excel (using current BIFF version). */
    inline const ScAddress& GetMaxPos() const { return mrData.maMaxPos; }
    const ScAddress& GetMaxPos() const { return mrData.maMaxPos; }

    /** Sets the document language. */
    inline void         SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; }
    void         SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; }
    /** Sets the UI language, i.e. if it has been read from a file. */
    inline void         SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; }
    void         SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; }
    /** Sets the text encoding to import/export byte strings. */
    void                SetTextEncoding( rtl_TextEncoding eTextEnc );
    /** Sets the width of the '0' character (default font) for the current printer (twips).
        @param rFontData  The font used for the '0' character. */
    void                SetCharWidth( const XclFontData& rFontData );
    /** Sets the current Calc sheet index. */
    inline void         SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; }
    void         SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; }
    /** Increases the current Calc sheet index by 1. */
    inline void         IncCurrScTab() { ++mrData.mnScTab; }
    void         IncCurrScTab() { ++mrData.mnScTab; }

private:
    XclRootData& mrData;        /// Reference to the global data struct.
diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 1052a6b..6f45c5b 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -61,8 +61,8 @@ struct XclFormatRun
    sal_uInt16          mnChar;         /// First character this format applies to.
    sal_uInt16          mnFontIdx;      /// Excel font index for the next characters.

    explicit inline     XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {}
    explicit inline     XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) :
    explicit XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {}
    explicit XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) :
                            mnChar( nChar ), mnFontIdx( nFontIdx ) {}
};

diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 5a258be..3770095 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -255,16 +255,16 @@ public:
    explicit            XclDefaultPalette( const XclRoot& rRoot );

    /** Returns the color count in the current palette. */
    inline sal_uInt32   GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; }
    sal_uInt32   GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; }

    /** Returns the default RGB color data for a (non-zero-based) Excel color or COL_AUTO on error. */
    ColorData           GetDefColorData( sal_uInt16 nXclIndex ) const;
    /** Returns the default color for a (non-zero-based) Excel color or COL_AUTO on error. */
    inline Color        GetDefColor( sal_uInt16 nXclIndex ) const
    Color        GetDefColor( sal_uInt16 nXclIndex ) const
                            { return Color( GetDefColorData( nXclIndex ) ); }

    /** Returns true, if the passed Excel color index is a system color. */
    inline bool         IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; }
    bool         IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; }

private:
    const ColorData*    mpnColorTable;      /// The table with RGB values.
@@ -452,7 +452,7 @@ public:
    explicit            XclNumFmtBuffer( const XclRoot& rRoot );

    /** Returns the core index of the current standard number format. */
    inline sal_uLong        GetStdScNumFmt() const { return mnStdScNumFmt; }
    sal_uLong        GetStdScNumFmt() const { return mnStdScNumFmt; }

protected:
    typedef ::std::map< sal_uInt16, XclNumFmt > XclNumFmtMap;
@@ -461,7 +461,7 @@ protected:
    void                InitializeImport();

    /** Returns the current number format map. */
    inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; }
    const XclNumFmtMap& GetFormatMap() const { return maFmtMap; }

    /** Inserts a new number format for the specified Excel format index. */
    void                InsertFormat( sal_uInt16 nXclNumFmt, const OUString& rFormat );
@@ -575,9 +575,9 @@ public:
    bool                HasUsedFlags() const;

    /** Returns true, if this is a hard cell format. */
    inline bool         IsCellXF() const    { return mbCellXF; }
    bool         IsCellXF() const    { return mbCellXF; }
    /** Returns true, if this is a cell style. */
    inline bool         IsStyleXF() const   { return !IsCellXF(); }
    bool         IsStyleXF() const   { return !IsCellXF(); }

protected:
    /** Returns true, if this object is equal to the passed. */
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index bc69f89..38a62ac 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -55,7 +55,7 @@ public:
                                ~XclTracer();

    /** Returns true, if tracing is enabled. */
    inline bool                 IsEnabled() const { return mbEnabled; }
    bool                 IsEnabled() const { return mbEnabled; }

    /** Ensure that particular traces are logged once per document. */
    void                        ProcessTraceOnce(XclTracerId eProblem);
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 4de059d..a742bb6 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -109,7 +109,7 @@ struct XclSelectionData
    XclRangeList        maXclSelection;     /// Selected cell ranges.
    sal_uInt16          mnCursorIdx;        /// Index of cursor in selection list.

    inline explicit     XclSelectionData() : mnCursorIdx( 0 ) {}
    explicit     XclSelectionData() : mnCursorIdx( 0 ) {}
};

typedef std::shared_ptr< XclSelectionData > XclSelectionDataRef;
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index e253ca0..f25b3eb 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -40,8 +40,8 @@ union DecodedDouble
    double              mfValue;
    sal_math_Double     maStruct;

    inline explicit     DecodedDouble() {}
    inline explicit     DecodedDouble( double fValue ) : mfValue( fValue ) {}
    explicit     DecodedDouble() {}
    explicit     DecodedDouble( double fValue ) : mfValue( fValue ) {}
};

} // namespace
diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 05dcb5b..71475c1 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -56,7 +56,7 @@ struct SheetCodeNameInfo
    PropertySet         maSheetProps;       /// Property set of the sheet without codename.
    OUString            maPrefix;           /// Prefix for the codename to be generated.

    inline explicit     SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) :
    explicit     SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) :
                            maSheetProps( rSheetProps ), maPrefix( rPrefix ) {}
};

diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 82d9aa9..b94cd73 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -466,7 +466,7 @@ protected:
    template< typename Type >
    bool                pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
    template< typename Type >
    inline bool         pushValueOperandToken( const Type& rValue )
    bool         pushValueOperandToken( const Type& rValue )
                            { return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); }
    bool                pushParenthesesOperandToken( const WhiteSpaceVec* pClosingSpaces = nullptr );
    bool                pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
@@ -481,7 +481,7 @@ protected:
    template< typename Type >
    bool                pushValueOperand( const Type& rValue, sal_Int32 nOpCode );
    template< typename Type >
    inline bool         pushValueOperand( const Type& rValue )
    bool         pushValueOperand( const Type& rValue )
                            { return pushValueOperand( rValue, OPCODE_PUSH ); }
    bool                pushBoolOperand( bool bValue );
    bool                pushErrorOperand( double fEncodedError );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 3fb7178..2f49878 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1850,7 +1850,7 @@ class NumberFormatFinalizer
public:
    explicit            NumberFormatFinalizer( const WorkbookHelper& rHelper );

    inline void         operator()( NumberFormat& rNumFmt ) const
    void         operator()( NumberFormat& rNumFmt ) const
                            { rNumFmt.finalizeImport( mxNumFmts, maEnUsLocale ); }

private:
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index b0397f4..beeea7b 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -385,11 +385,11 @@ public:

private:
    /** Returns the current edit engine text object. */
    inline HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; }
    HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; }
    /** Returns the start cursor of the current text range. */
    inline const Reference<text::XTextCursor>& getStartPos() { return getPortion().mxStart; }
    const Reference<text::XTextCursor>& getStartPos() { return getPortion().mxStart; }
    /** Returns the end cursor of the current text range. */
    inline const Reference<text::XTextCursor>& getEndPos() { return getPortion().mxEnd; }
    const Reference<text::XTextCursor>& getEndPos() { return getPortion().mxEnd; }

    /** Returns the current line height of the specified portion. */
    double              getCurrHeight( HFPortionId ePortion ) const;
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index c29fced..aad783f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -114,29 +114,29 @@ public:
                        ~WorkbookGlobals();

    /** Returns true, if this helper refers to a valid document. */
    inline bool         isValid() const { return mxDoc.is(); }
    bool         isValid() const { return mxDoc.is(); }

    // filter -----------------------------------------------------------------

    /** Returns the base filter object (base class of all filters). */
    inline FilterBase&  getBaseFilter() const { return mrBaseFilter; }
    FilterBase&  getBaseFilter() const { return mrBaseFilter; }
    /** Returns the filter progress bar. */
    inline SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
    SegmentProgressBar& getProgressBar() const { return *mxProgressBar; }
    /** Returns the VBA project storage. */
    const StorageRef&   getVbaProjectStorage() const { return mxVbaPrjStrg; }
    /** Returns the index of the current Calc sheet, if filter currently processes a sheet. */
    inline sal_Int16    getCurrentSheetIndex() const { return mnCurrSheet; }
    sal_Int16    getCurrentSheetIndex() const { return mnCurrSheet; }
    /** Returns true when reading a file generated by a known good generator. */
    inline bool         isGeneratorKnownGood() const { return mbGeneratorKnownGood; }
    bool         isGeneratorKnownGood() const { return mbGeneratorKnownGood; }

    /** Sets the VBA project storage used to import VBA source code and forms. */
    inline void         setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
    void         setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; }
    /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
    inline void         setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; }
    void         setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; }

    // document model ---------------------------------------------------------

    inline ScEditEngineDefaulter& getEditEngine() const
    ScEditEngineDefaulter& getEditEngine() const
    {
        return *mxEditEngine.get();
    }
@@ -168,58 +168,58 @@ public:

    // buffers ----------------------------------------------------------------

    inline FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; }
    FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; }
    /** Returns the global workbook settings object. */
    inline WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; }
    WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; }
    /** Returns the workbook and sheet view settings object. */
    inline ViewSettings& getViewSettings() const { return *mxViewSettings; }
    ViewSettings& getViewSettings() const { return *mxViewSettings; }
    /** Returns the worksheet buffer containing sheet names and properties. */
    inline WorksheetBuffer& getWorksheets() const { return *mxWorksheets; }
    WorksheetBuffer& getWorksheets() const { return *mxWorksheets; }
    /** Returns the office theme object read from the theme substorage. */
    inline ThemeBuffer& getTheme() const { return *mxTheme; }
    ThemeBuffer& getTheme() const { return *mxTheme; }
    /** Returns all cell formatting objects read from the styles substream. */
    inline StylesBuffer& getStyles() const { return *mxStyles; }
    StylesBuffer& getStyles() const { return *mxStyles; }
    /** Returns the shared strings read from the shared strings substream. */
    inline SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; }
    SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; }
    /** Returns the external links read from the external links substream. */
    inline ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; }
    ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; }
    /** Returns the defined names read from the workbook globals. */
    inline DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; }
    DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; }
    /** Returns the tables collection (equivalent to Calc's database ranges). */
    inline TableBuffer& getTables() const { return *mxTables; }
    TableBuffer& getTables() const { return *mxTables; }
    /** Returns the scenarios collection. */
    inline ScenarioBuffer& getScenarios() const { return *mxScenarios; }
    ScenarioBuffer& getScenarios() const { return *mxScenarios; }
    /** Returns the collection of external data connections. */
    inline ConnectionsBuffer&  getConnections() const { return *mxConnections; }
    ConnectionsBuffer&  getConnections() const { return *mxConnections; }
    /** Returns the collection of pivot caches. */
    inline PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; }
    PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; }
    /** Returns the collection of pivot tables. */
    inline PivotTableBuffer& getPivotTables() { return *mxPivotTables; }
    PivotTableBuffer& getPivotTables() { return *mxPivotTables; }

    // converters -------------------------------------------------------------

    /** Returns a shared import formula parser. */
    inline FormulaParser& getFormulaParser() const { return *mxFmlaParser; }
    FormulaParser& getFormulaParser() const { return *mxFmlaParser; }
    /** Returns an unshared import formula parser. */
    inline FormulaParser* createFormulaParser() { return new FormulaParser(*this); }
    FormulaParser* createFormulaParser() { return new FormulaParser(*this); }
    /** Returns the measurement unit converter. */
    inline UnitConverter& getUnitConverter() const { return *mxUnitConverter; }
    UnitConverter& getUnitConverter() const { return *mxUnitConverter; }
    /** Returns the converter for string to cell address/range conversion. */
    inline AddressConverter& getAddressConverter() const { return *mxAddrConverter; }
    AddressConverter& getAddressConverter() const { return *mxAddrConverter; }
    /** Returns the chart object converter. */
    inline oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); }
    oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); }
    /** Returns the page/print settings converter. */
    inline PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; }
    PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; }

    // OOXML/BIFF12 specific --------------------------------------------------

    /** Returns the base OOXML/BIFF12 filter object. */
    inline XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; }
    XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; }

    // BIFF2-BIFF8 specific ---------------------------------------------------

    /** Returns the text encoding used to import/export byte strings. */
    inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; }
    rtl_TextEncoding getTextEncoding() const { return meTextEnc; }

private:
    /** Initializes some basic members and sets needed document properties. */
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 0f01e0d..9cc3cf2 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -208,14 +208,14 @@ public:
                            SCTAB nSheet );

    /** Returns true, if this helper refers to an existing Calc sheet. */
    inline bool         isValidSheet() const { return mxSheet.is(); }
    bool         isValidSheet() const { return mxSheet.is(); }

    /** Returns the type of this sheet. */
    inline WorksheetType getSheetType() const { return meSheetType; }
    WorksheetType getSheetType() const { return meSheetType; }
    /** Returns the index of the current sheet. */
    inline SCTAB        getSheetIndex() const { return maUsedArea.aStart.Tab(); }
    SCTAB        getSheetIndex() const { return maUsedArea.aStart.Tab(); }
    /** Returns the XSpreadsheet interface of the current sheet. */
    inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }
    const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }

    /** Returns the XCell interface for the passed cell address. */
    Reference< XCell >  getCell( const ScAddress& rAddress ) const;
@@ -243,25 +243,25 @@ public:
    ScRange                  getCellRangeFromRectangle( const awt::Rectangle& rRect ) const;

    /** Returns the buffer for cell contents and cell formatting. */
    inline SheetDataBuffer& getSheetData() { return maSheetData; }
    SheetDataBuffer& getSheetData() { return maSheetData; }
    /** Returns the conditional formatting in this sheet. */
    inline CondFormatBuffer& getCondFormats() { return maCondFormats; }
    CondFormatBuffer& getCondFormats() { return maCondFormats; }
    /** Returns the buffer for all cell comments in this sheet. */
    inline CommentsBuffer& getComments() { return maComments; }
    CommentsBuffer& getComments() { return maComments; }
    /** Returns the auto filters for the sheet. */
    inline AutoFilterBuffer& getAutoFilters() { return maAutoFilters; }
    AutoFilterBuffer& getAutoFilters() { return maAutoFilters; }
    /** Returns the buffer for all web query tables in this sheet. */
    inline QueryTableBuffer& getQueryTables() { return maQueryTables; }
    QueryTableBuffer& getQueryTables() { return maQueryTables; }
    /** Returns the worksheet settings object. */
    inline WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
    WorksheetSettings& getWorksheetSettings() { return maSheetSett; }
    /** Returns the page/print settings for this sheet. */
    inline PageSettings& getPageSettings() { return maPageSett; }
    PageSettings& getPageSettings() { return maPageSett; }
    /** Returns the view settings for this sheet. */
    inline SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; }
    SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; }
    /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
    inline VmlDrawing&  getVmlDrawing() { return *mxVmlDrawing; }
    VmlDrawing&  getVmlDrawing() { return *mxVmlDrawing; }
    /** returns the ExtLst entries that need to be filled */
    inline ExtLst&      getExtLst() { return maExtLst; }
    ExtLst&      getExtLst() { return maExtLst; }

    /** Sets a column or row page break described in the passed struct. */
    void                setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 22ddc9b..a90f697 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -62,10 +62,10 @@ private:
    ScMyImpDetectiveOpList      aDetectiveOpList;

public:
    inline                      ScMyImpDetectiveOpArray() :
    ScMyImpDetectiveOpArray() :
                                    aDetectiveOpList()  {}

    inline void                 AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
    void                 AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
                                    { aDetectiveOpList.push_back( rDetOp ); }

    void                        Sort();
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index c7998c1..196d3e5 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -153,10 +153,10 @@ struct ScMyAreaLink
    ScRange                     aDestRange;
    sal_Int32                   nRefresh;

    inline                      ScMyAreaLink() : nRefresh( 0 ) {}
    ScMyAreaLink() : nRefresh( 0 ) {}

    inline sal_Int32            GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; }
    inline sal_Int32            GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; }
    sal_Int32            GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; }
    sal_Int32            GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; }

    bool                        Compare( const ScMyAreaLink& rAreaLink ) const;
    bool                        operator<(const ScMyAreaLink& rAreaLink ) const;
@@ -174,7 +174,7 @@ public:
                                ScMyAreaLinksContainer();
    virtual                     ~ScMyAreaLinksContainer() override;

    inline void                 AddNewAreaLink( const ScMyAreaLink& rAreaLink )
    void                 AddNewAreaLink( const ScMyAreaLink& rAreaLink )
                                    { aAreaLinkList.push_back( rAreaLink ); }

                                using ScMyIteratorBase::UpdateAddress;
@@ -341,19 +341,19 @@ public:

    void                        Clear();

    inline void                 SetShapes(ScMyShapesContainer* pNewShapes)
    void                 SetShapes(ScMyShapesContainer* pNewShapes)
                                    { pShapes = pNewShapes; }
    inline void                 SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
    void                 SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
                                    { pNoteShapes = pNewNoteShapes; }
    inline void                 SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
    void                 SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
                                    { pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; }
    inline void                 SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
    void                 SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
                                    { pMergedRanges = pNewMergedRanges; }
    inline void                 SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
    void                 SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
                                    { pAreaLinks = pNewAreaLinks; }
    inline void                 SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
    void                 SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
                                    { pDetectiveObj = pNewDetectiveObj; }
    inline void                 SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
    void                 SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
                                    { pDetectiveOp = pNewDetectiveOp; }

    void                        SetCurrentTable(const SCTAB nTable,
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index f1a69c5..a02a6ee 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -235,8 +235,8 @@ public:
    virtual ~ScXMLExport() override;

    static sal_Int16 GetMeasureUnit();
    inline ScDocument*          GetDocument()           { return pDoc; }
    inline const ScDocument*    GetDocument() const     { return pDoc; }
    ScDocument*          GetDocument()           { return pDoc; }
    const ScDocument*    GetDocument() const     { return pDoc; }
    bool IsMatrix (const ScAddress& aCell,
        ScRange& aCellAddress, bool& bIsFirst) const;

diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index e11e61e..7cf6278 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -990,8 +990,8 @@ public:

    ScDocumentImport& GetDoc();

    inline ScDocument*          GetDocument()           { return pDoc; }
    inline const ScDocument*    GetDocument() const     { return pDoc; }
    ScDocument*          GetDocument()           { return pDoc; }
    const ScDocument*    GetDocument() const     { return pDoc; }

    ScMyTables& GetTables() { return aTables; }

diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 31cb87e..89982b3 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -47,7 +47,7 @@ struct Func_SetType
{
    sal_Int32                   mnType;
    explicit                    Func_SetType( sal_Int32 nType ) : mnType( nType ) {}
    inline void                 operator()( ScCsvColState& rState ) const
    void                 operator()( ScCsvColState& rState ) const
        { rState.mnType = mnType; }
};

@@ -55,7 +55,7 @@ struct Func_Select
{
    bool                        mbSelect;
    explicit                    Func_Select( bool bSelect ) : mbSelect( bSelect ) {}
    inline void                 operator()( ScCsvColState& rState ) const
    void                 operator()( ScCsvColState& rState ) const
        { rState.Select( mbSelect ); }
};

diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 836addd..234ca32 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -88,7 +88,7 @@ protected:
    virtual Rectangle GetBoundingBox() const override;

    /** Returns whether the object is alive. Must be called with locked mutex. */
    inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; }
    bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; }
    /** @throws css::lang::DisposedException if the object is disposed/disposing or any pointer
        is missing. Should be used with locked mutex! */
    void ensureAlive() const;
@@ -444,16 +444,16 @@ private:
    /** Returns the count of selected columns in the table. */
    sal_Int32 implGetSelColumnCount() const;
    /** Returns the total cell count in the table (including header). */
    inline sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }
    sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }

    /** Returns the row index from cell index (including header). */
    inline sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); }
    sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); }
    /** Returns the column index from cell index (including header). */
    inline sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); }
    sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); }
    /** Returns the absolute column index of the nSelColumn-th selected column. */
    sal_Int32 implGetSelColumn( sal_Int32 nSelColumn ) const;
    /** Returns the child index from cell position (including header). */
    inline sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; }
    sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; }

    /** Returns the contents of the specified cell (including header). Indexes must be valid. */
    OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 03cbaeb..215341a 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -88,7 +88,7 @@ public:
    void                RefInputDone( bool bForced );
    void                ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton );

    inline void         SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; }
    void         SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; }
    void                DoClose( sal_uInt16 nId );
    static void         SetDispatcherLock( bool bLock );
    static void         EnableSpreadsheets( bool bFlag = true );
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index ac724af..6aec2ad 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -69,8 +69,8 @@ struct ScCsvExpData
    sal_Int32                   mnIndex;        /// Index of a column.
    sal_uInt8                   mnType;         /// External type of the column.

    inline                      ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {}
    inline                      ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) :
    ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {}
    ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) :
                                    mnIndex( nIndex ), mnType( nType ) {}
};

@@ -207,14 +207,14 @@ private:
    sal_Int32                   mnParam2;       /// Second parameter.

public:
    inline explicit             ScCsvCmd() : meType( CSVCMD_NONE ),
    explicit             ScCsvCmd() : meType( CSVCMD_NONE ),
                                    mnParam1( CSV_POS_INVALID ), mnParam2( CSV_POS_INVALID ) {}

    inline void                 Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 );

    inline ScCsvCmdType         GetType() const     { return meType; }
    inline sal_Int32            GetParam1() const   { return mnParam1; }
    inline sal_Int32            GetParam2() const   { return mnParam2; }
    ScCsvCmdType         GetType() const     { return meType; }
    sal_Int32            GetParam1() const   { return mnParam1; }
    sal_Int32            GetParam2() const   { return mnParam2; }
};

inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 )
@@ -262,11 +262,11 @@ public:
    // repaint helpers --------------------------------------------------------

    /** Sets the graphic invalid (next Redraw() will not use cached graphic). */
    inline void                 InvalidateGfx() { mbValidGfx = false; }
    void                 InvalidateGfx() { mbValidGfx = false; }
    /** Sets the graphic valid (next Redraw() will use cached graphic). */
    inline void                 ValidateGfx() { mbValidGfx = true; }
    void                 ValidateGfx() { mbValidGfx = true; }
    /** Returns true, if cached graphic is valid. */
    inline bool                 IsValidGfx() const { return mbValidGfx; }
    bool                 IsValidGfx() const { return mbValidGfx; }

    /** Repaints all controls.
        @param bInvalidate  true = invalidates graphics of this control (not all). */
@@ -276,14 +276,14 @@ public:
    /** Decreases no-repaint counter and repaints if counter reaches 0. */
    void                        EnableRepaint();
    /** Returns true, if controls will not repaint. */
    inline bool                 IsNoRepaint() const { return mrData.mnNoRepaint > 0; }
    bool                 IsNoRepaint() const { return mrData.mnNoRepaint > 0; }

    // command handling -------------------------------------------------------

    /** Sets a new command handler. */
    inline void                 SetCmdHdl( const Link<ScCsvControl&,void>& rHdl ) { maCmdHdl = rHdl; }
    void                 SetCmdHdl( const Link<ScCsvControl&,void>& rHdl ) { maCmdHdl = rHdl; }
    /** Returns data of the last command. */
    inline const ScCsvCmd&      GetCmd() const { return maCmd; }
    const ScCsvCmd&      GetCmd() const { return maCmd; }

    /** Executes a command by calling command handler. */
    void                        Execute(
@@ -294,18 +294,18 @@ public:
    // layout helpers ---------------------------------------------------------

    /** Returns a reference to the current layout data. */
    inline const ScCsvLayoutData& GetLayoutData() const { return mrData; }
    const ScCsvLayoutData& GetLayoutData() const { return mrData; }
    /** Returns true, if the Right-to-Left layout mode is active. */
    inline bool                 IsRTL() const { return mrData.mbAppRTL; }
    bool                 IsRTL() const { return mrData.mbAppRTL; }

    /** Returns the number of available positions. */
    inline sal_Int32            GetPosCount() const { return mrData.mnPosCount; }
    sal_Int32            GetPosCount() const { return mrData.mnPosCount; }
    /** Returns the number of visible positions. */
    sal_Int32                   GetVisPosCount() const;
    /** Returns the first visible position. */
    inline sal_Int32            GetFirstVisPos() const { return mrData.mnPosOffset; }
    sal_Int32            GetFirstVisPos() const { return mrData.mnPosOffset; }
    /** Returns the last visible position. */
    inline sal_Int32            GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); }
    sal_Int32            GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); }
    /** Returns highest possible position for first visible character. */
    sal_Int32                   GetMaxPosOffset() const;

@@ -315,9 +315,9 @@ public:
    bool                        IsVisibleSplitPos( sal_Int32 nPos ) const;

    /** Returns the width of the header column. */
    inline sal_Int32            GetHdrWidth() const { return mrData.mnHdrWidth; }
    sal_Int32            GetHdrWidth() const { return mrData.mnHdrWidth; }
    /** Returns the width of one character column. */
    inline sal_Int32            GetCharWidth() const { return mrData.mnCharWidth; }
    sal_Int32            GetCharWidth() const { return mrData.mnCharWidth; }
    /** Returns the start position of the header column. */
    sal_Int32                   GetHdrX() const;
    /** Returns the X position of the first pixel of the data area. */
@@ -330,11 +330,11 @@ public:
    sal_Int32                   GetPosFromX( sal_Int32 nX ) const;

    /** Returns the number of data lines. */
    inline sal_Int32            GetLineCount() const { return mrData.mnLineCount; }
    sal_Int32            GetLineCount() const { return mrData.mnLineCount; }
    /** Returns the number of visible lines (including partly visible bottom line). */
    sal_Int32                   GetVisLineCount() const;
    /** Returns index of first visible line. */
    inline sal_Int32            GetFirstVisLine() const { return mrData.mnLineOffset; }
    sal_Int32            GetFirstVisLine() const { return mrData.mnLineOffset; }
    /** Returns index of last visible line. */
    sal_Int32                   GetLastVisLine() const;
    /** Returns highest possible index for first line. */
@@ -346,18 +346,18 @@ public:
    bool                        IsVisibleLine( sal_Int32 nLine ) const;

    /** Returns the height of the header line. */
    inline sal_Int32            GetHdrHeight() const { return mrData.mnHdrHeight; }
    sal_Int32            GetHdrHeight() const { return mrData.mnHdrHeight; }
    /** Returns the height of one line. */
    inline sal_Int32            GetLineHeight() const { return mrData.mnLineHeight; }
    sal_Int32            GetLineHeight() const { return mrData.mnLineHeight; }
    /** Returns output Y coordinate of the specified line. */
    sal_Int32                   GetY( sal_Int32 nLine ) const;
    /** Returns line index from output coordinate. */
    sal_Int32                   GetLineFromY( sal_Int32 nY ) const;

    /** Returns the ruler cursor position. */
    inline sal_Int32            GetRulerCursorPos() const { return mrData.mnPosCursor; }
    sal_Int32            GetRulerCursorPos() const { return mrData.mnPosCursor; }
    /** Returns the data grid cursor position (not column index!). */
    inline sal_Int32            GetGridCursorPos() const { return mrData.mnColCursor; }
    sal_Int32            GetGridCursorPos() const { return mrData.mnColCursor; }

    // static helpers ---------------------------------------------------------

diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index f813c79..c75f8ef 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -145,7 +145,7 @@ private:
    // columns/column types ---------------------------------------------------
public:
    /** Returns the number of columns. */
    inline sal_uInt32           GetColumnCount() const { return maColStates.size(); }
    sal_uInt32           GetColumnCount() const { return maColStates.size(); }
    /** Returns the index of the first visible column. */
    sal_uInt32                  GetFirstVisColumn() const;
    /** Returns the index of the last visible column. */
@@ -162,14 +162,14 @@ public:
    sal_uInt32                  GetColumnFromX( sal_Int32 nX ) const;

    /** Returns start position of the column with the specified index. */
    inline sal_Int32            GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; }
    sal_Int32            GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; }
    /** Returns column index from position. A split counts to its following column. */
    sal_uInt32                  GetColumnFromPos( sal_Int32 nPos ) const;
    /** Returns the character width of the column with the specified index. */
    sal_Int32                   GetColumnWidth( sal_uInt32 nColIndex ) const;

    /** Returns the vector with the states of all columns. */
    inline const ScCsvColStateVec& GetColumnStates() const { return maColStates; }
    const ScCsvColStateVec& GetColumnStates() const { return maColStates; }
    /** Sets all column states to the values in the passed vector. */
    void                        SetColumnStates( const ScCsvColStateVec& rColStates );
    /** Returns the data type of the selected columns. */
@@ -215,7 +215,7 @@ public:
    void                        SelectAll( bool bSelect = true );

    /** Returns index of the focused column. */
    inline sal_uInt32           GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); }
    sal_uInt32           GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); }

private:
    /** Moves column cursor to a new position. */
@@ -268,9 +268,9 @@ public:

private:
    /** Returns the width of the control. */
    inline sal_Int32            GetWidth() const { return maWinSize.Width(); }
    sal_Int32            GetWidth() const { return maWinSize.Width(); }
    /** Returns the height of the control. */
    inline sal_Int32            GetHeight() const { return maWinSize.Height(); }
    sal_Int32            GetHeight() const { return maWinSize.Height(); }

    /** Sets a clip region in the specified output device for the specified column. */
    SAL_DLLPRIVATE void                        ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex );
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index a4885f4..709817c 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -87,18 +87,18 @@ private:
    // split handling ---------------------------------------------------------
public:
    /** Returns the split array. */
    inline const ScCsvSplits&   GetSplits() const { return maSplits; }
    const ScCsvSplits&   GetSplits() const { return maSplits; }
    /** Returns the number of splits. */
    inline sal_uInt32           GetSplitCount() const
    sal_uInt32           GetSplitCount() const
                                    { return maSplits.Count(); }
    /** Returns the position of the specified split. */
    inline sal_Int32            GetSplitPos( sal_uInt32 nIndex ) const
    sal_Int32            GetSplitPos( sal_uInt32 nIndex ) const
                                    { return maSplits[ nIndex ]; }
    /** Finds a position nearest to nPos which does not cause scrolling the visible area. */
    sal_Int32                   GetNoScrollPos( sal_Int32 nPos ) const;

    /** Returns true if at position nPos is a split. */
    inline bool                 HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); }
    bool                 HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); }
    /** Inserts a split. */
    void                        InsertSplit( sal_Int32 nPos );
    /** Removes a split. */
@@ -149,9 +149,9 @@ public:

private:
    /** Returns the width of the control. */
    inline sal_Int32            GetWidth() const { return maWinSize.Width(); }
    sal_Int32            GetWidth() const { return maWinSize.Width(); }
    /** Returns the height of the control. */
    inline sal_Int32            GetHeight() const { return maWinSize.Height(); }
    sal_Int32            GetHeight() const { return maWinSize.Height(); }

    /** Draws the background and active area to maBackgrDev (only the given X range). */
    SAL_DLLPRIVATE void                        ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth );
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 472ab2b..852ed39 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -88,10 +88,10 @@ private:
    SAL_DLLPRIVATE void                        InitVScrollBar();

    /** Calculates and sets valid position offset nearest to nPos. */
    SAL_DLLPRIVATE inline void                 ImplSetPosOffset( sal_Int32 nPos )
    SAL_DLLPRIVATE void                 ImplSetPosOffset( sal_Int32 nPos )
                                    { maData.mnPosOffset = std::max( std::min( nPos, GetMaxPosOffset() ), sal_Int32( 0 ) ); }
    /** Calculates and sets valid line offset nearest to nLine. */
    SAL_DLLPRIVATE inline void                 ImplSetLineOffset( sal_Int32 nLine )
    SAL_DLLPRIVATE void                 ImplSetLineOffset( sal_Int32 nLine )
                                    { maData.mnLineOffset = std::max( std::min( nLine, GetMaxLineOffset() ), sal_Int32( 0 ) ); }
    /** Moves controls (not cursors!) so that nPos becomes visible. */
    SAL_DLLPRIVATE void                        MakePosVisible( sal_Int32 nPos );
@@ -108,7 +108,7 @@ public:
    /** Reads UI strings for data types from the list box. */
    void                        InitTypes( const ListBox& rListBox );
    /** Returns the data type of the selected columns. */
    inline sal_Int32            GetSelColumnType() const { return maGrid->GetSelColumnType(); }
    sal_Int32            GetSelColumnType() const { return maGrid->GetSelColumnType(); }

    /** Fills the options object with current column data. */
    void                        FillColumnData( ScAsciiOptions& rOptions ) const;
@@ -116,9 +116,9 @@ public:
    // event handling ---------------------------------------------------------
public:
    /** Sets a new handler for "update cell texts" requests. */
    inline void                 SetUpdateTextHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maUpdateTextHdl = rHdl; }
    void                 SetUpdateTextHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maUpdateTextHdl = rHdl; }
    /** Sets a new handler for "column selection changed" events. */
    inline void                 SetColTypeHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maColTypeHdl = rHdl; }
    void                 SetColTypeHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maColTypeHdl = rHdl; }

protected:
    virtual void                Resize() override;
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 7111ddf..ea0813e 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -126,13 +126,13 @@ public:

    /** Locks/unlocks the background layer that contains background objects.
        Unlocked layer is required to be able to edit the objects. */
    inline void     LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }
    void     LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); }

    /** Locks/unlocks the internal layer that contains caption objects of cell notes.
        Unlocked layer is required to be able to edit the contained objects. */
    inline void     LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); }
    void     LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); }
    /** Unlocks the internal layer that contains caption objects of cell notes. */
    inline void     UnlockInternalLayer() { LockInternalLayer( false ); }
    void     UnlockInternalLayer() { LockInternalLayer( false ); }

    SdrEndTextEditKind  ScEndTextEdit();    // calls SetDrawTextUndo(0)
    css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable();
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 74fce92..3007d29 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -69,7 +69,7 @@ private:
        OUString            maComment;
        bool                mbProtected;

        inline explicit     ScenarioEntry() : mbProtected( false ) {}
        explicit     ScenarioEntry() : mbProtected( false ) {}
    };
    typedef ::std::vector< ScenarioEntry > ScenarioList;

diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index f0236c2..268bb7f 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -38,14 +38,14 @@ private:
public:
                                ScNavigatorSettings();

    inline void                 SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
    inline bool                 IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; }
    void                 SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
    bool                 IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; }

    inline void                 SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; }
    inline ScContentId          GetRootSelected() const { return mnRootSelected; }
    void                 SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; }
    ScContentId          GetRootSelected() const { return mnRootSelected; }

    inline void                 SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; }
    inline sal_uLong            GetChildSelected() const { return mnChildSelected; }
    void                 SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; }
    sal_uLong            GetChildSelected() const { return mnChildSelected; }
};

#endif // INCLUDED_SC_SOURCE_UI_INC_NAVSETT_HXX
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index 7d120b9..cd9f491 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -78,9 +78,9 @@ private:
    void                        InitSettings();

    /** Returns the calc document. */
    inline ScDocument&          GetDoc() const { return *mrViewData.GetDocument(); }
    ScDocument&          GetDoc() const { return *mrViewData.GetDocument(); }
    /** Returns the current sheet index. */
    inline SCTAB                GetTab() const { return mrViewData.GetTabNo(); }
    SCTAB                GetTab() const { return mrViewData.GetTabNo(); }
    /** Returns the outline array of the corresponding document. */
    const ScOutlineArray*       GetOutlineArray() const;
    /** Returns the specified outline entry. */
@@ -178,7 +178,7 @@ private:
    /** Starts mouse tracking after click on a button. */
    void                        StartMouseTracking( size_t nLevel, size_t nEntry );
    /** Returns whether mouse tracking mode is active. */
    inline bool                 IsMouseTracking() const { return mbMTActive; }
    bool                 IsMouseTracking() const { return mbMTActive; }
    /** Ends mouse tracking. */
    void                        EndMouseTracking();

diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index 8791751..cc69e10 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -40,12 +40,12 @@ public:
    explicit            ScSelectionState( ScViewData& rViewData );

    /** Returns the type of the selection this object contains. */
    inline ScSelectionType GetSelectionType() const { return meType; }
    ScSelectionType GetSelectionType() const { return meType; }

    /** Returns the position of the cell cursor. */
    inline const ScAddress& GetCellCursor() const { return maCursor; }
    const ScAddress& GetCellCursor() const { return maCursor; }
    /** Returns the edit engine selection. */
    inline const ESelection& GetEditSelection() const { return maEditSel; }
    const ESelection& GetEditSelection() const { return maEditSel; }

private:
    ScSelectionType     meType;             /// Type of the selection.
diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index 20f96d7..ea1eaec 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -42,9 +42,9 @@ public:
    virtual void        ConvertAll( EditView& rEditView ) = 0;

    /** Returns true, if at least one cell has been modified. */
    inline bool         IsAnyModified() const { return mbIsAnyModified; }
    bool         IsAnyModified() const { return mbIsAnyModified; }
    /** Returns true, if the entire document/selection has been finished. */
    inline bool         IsFinished() const { return mbFinished; }
    bool         IsFinished() const { return mbFinished; }

protected:
    /** Implementation of cell iteration. Finds a cell that needs conversion.
diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx
index 061c0c25..af1537a 100644
--- a/sc/source/ui/inc/spellparam.hxx
+++ b/sc/source/ui/inc/spellparam.hxx
@@ -52,12 +52,12 @@ public:
                            sal_Int32 nOptions,
                            bool bIsInteractive );

    inline ScConversionType GetType() const     { return meConvType; }
    inline LanguageType GetSourceLang() const   { return meSourceLang; }
    inline LanguageType GetTargetLang() const   { return meTargetLang; }
    inline const vcl::Font*  GetTargetFont() const   { return mbUseTargetFont ? &maTargetFont : nullptr; }
    inline sal_Int32    GetOptions() const      { return mnOptions; }
    inline bool         IsInteractive() const   { return mbIsInteractive; }
    ScConversionType GetType() const     { return meConvType; }
    LanguageType GetSourceLang() const   { return meSourceLang; }
    LanguageType GetTargetLang() const   { return meTargetLang; }
    const vcl::Font*  GetTargetFont() const   { return mbUseTargetFont ? &maTargetFont : nullptr; }
    sal_Int32    GetOptions() const      { return mnOptions; }
    bool         IsInteractive() const   { return mbIsInteractive; }

private:
    ScConversionType    meConvType;         /// Type of the conversion.
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index ab8c102..8634372 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -83,11 +83,11 @@ public:
        const uno::Type& rVbaType );

    /** Returns the VBA helper interface of the VBA collection object. */
    inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; }
    const uno::Reference< XHelperInterface >& getParent() const { return mxParent; }
    /** Returns the component context of the VBA collection object. */
    inline const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; }
    const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; }
    /** Returns the VBA type information of the objects in this container. */
    inline const uno::Type& getVbaType() const { return maVbaType; }
    const uno::Type& getVbaType() const { return maVbaType; }

    /** Collects all shapes supported by this instance and inserts them into
        the internal shape vector.
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 80679d8..6e48840 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -289,11 +289,11 @@ public:
                                SortedIndividualInt32List();
                                ~SortedIndividualInt32List();

    inline sal_uInt32           Count() const
    sal_uInt32           Count() const
                                    { return maVector.size(); }

                                /// @return  element on position nIndex or 0 on invalid index
    inline sal_Int32            Get( sal_uInt32 n ) const
    sal_Int32            Get( sal_uInt32 n ) const
                                    { return maVector[n]; }

                                /// @return  true if nVal (internal date representation) is contained
@@ -317,11 +317,11 @@ class ScaDoubleList
private:
    std::vector<double>         maVector;
protected:
    inline void                 ListAppend( double fValue ) { maVector.push_back(fValue); }
    void                 ListAppend( double fValue ) { maVector.push_back(fValue); }

    /// @throws css::uno::RuntimeException
    /// @throws css::lang::IllegalArgumentException
    inline void                 Append( double fValue )
    void                 Append( double fValue )
                                    { if( CheckInsert( fValue ) ) ListAppend( fValue ); }

                                /** @param rAnyConv  must be an initialized ScaAnyConmverter
@@ -357,9 +357,9 @@ protected:
public:
    virtual                     ~ScaDoubleList() {}

    inline sal_uInt32           Count() const
    sal_uInt32           Count() const
                                    { return maVector.size(); }
    inline double               Get( sal_uInt32 n ) const
    double               Get( sal_uInt32 n ) const
                                        { return maVector[n]; }

    /// @throws css::uno::RuntimeException
@@ -501,9 +501,9 @@ public:

    inline const Complex*   Get( sal_uInt32 nIndex ) const;

    inline bool             empty() const
    bool             empty() const
                                { return maVector.empty(); }
    inline sal_uInt32       Count() const
    sal_uInt32       Count() const
                                { return maVector.size(); }

    inline void             Append( Complex* pNew );
@@ -803,9 +803,9 @@ public:
    ScaDate&                    operator=( const ScaDate& rCopy );

                                /// @return  the current month.
    inline sal_uInt16           getMonth() const    { return nMonth; };
    sal_uInt16           getMonth() const    { return nMonth; };
                                /// @return  the current year.
    inline sal_uInt16           getYear() const     { return nYear; };
    sal_uInt16           getYear() const     { return nYear; };

                                /// adds/subtracts the given count of months, adjusts day
                                ///
@@ -827,9 +827,9 @@ public:
    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo );

    bool                        operator<( const ScaDate& rCmp ) const;
    inline bool                 operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
    inline bool                 operator>( const ScaDate& rCmp ) const  { return rCmp < *this; }
    inline bool                 operator>=( const ScaDate& rCmp ) const { return !(*this < rCmp); }
    bool                 operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
    bool                 operator>( const ScaDate& rCmp ) const  { return rCmp < *this; }
    bool                 operator>=( const ScaDate& rCmp ) const { return !(*this < rCmp); }
};

inline sal_uInt16 ScaDate::getDaysInMonth() const
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index d2b4608..e06c292 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -81,16 +81,16 @@ public:
                                ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr );
                                ~ScaFuncData();

    inline sal_uInt16           GetUINameID() const     { return nUINameID; }
    inline sal_uInt16           GetDescrID() const      { return nDescrID; }
    inline ScaCategory          GetCategory() const     { return eCat; }
    inline bool                 IsDouble() const        { return bDouble; }
    sal_uInt16           GetUINameID() const     { return nUINameID; }
    sal_uInt16           GetDescrID() const      { return nDescrID; }
    ScaCategory          GetCategory() const     { return eCat; }
    bool                 IsDouble() const        { return bDouble; }

    sal_uInt16                  GetStrIndex( sal_uInt16 nParam ) const;
    inline bool                 Is( const OUString& rCompare ) const
    bool                 Is( const OUString& rCompare ) const
                                                    { return aIntName == rCompare; }

    inline const std::vector<OUString>& GetCompNameList() const { return aCompList; }
    const std::vector<OUString>& GetCompNameList() const { return aCompList; }
};

typedef std::vector<ScaFuncData> ScaFuncDataList;
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 55e7855..abeb6ab 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -91,16 +91,16 @@ public:
                                ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rRscMgr );
                                ~ScaFuncData();

    inline sal_uInt16           GetUINameID() const     { return nUINameID; }
    inline sal_uInt16           GetDescrID() const      { return nDescrID; }
    inline ScaCategory          GetCategory() const     { return eCat; }
    inline bool                 IsDouble() const        { return bDouble; }
    sal_uInt16           GetUINameID() const     { return nUINameID; }
    sal_uInt16           GetDescrID() const      { return nDescrID; }
    ScaCategory          GetCategory() const     { return eCat; }
    bool                 IsDouble() const        { return bDouble; }

    sal_uInt16                  GetStrIndex( sal_uInt16 nParam ) const;
    inline bool                 Is( const OUString& rCompare ) const
    bool                 Is( const OUString& rCompare ) const
                                                    { return aIntName == rCompare; }

    inline const std::vector<OUString>& GetCompNameList() const { return aCompList; }
    const std::vector<OUString>& GetCompNameList() const { return aCompList; }
};


diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 8925ff2..ad9beca 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -180,7 +180,7 @@ public:

    sal_uInt32  GetId( FontCollectionEntry& rFontDescriptor );

    inline sal_uInt32  GetCount() const { return maFonts.size(); };
    sal_uInt32  GetCount() const { return maFonts.size(); };

    const FontCollectionEntry* GetById( sal_uInt32 nId );

diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index f6f84c0..20c8798 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -118,9 +118,9 @@ public:

    void                    UpdateSelectionClipboard( bool bForceDeselect );

    inline DrawDocShell* GetDocSh() const { return mpDocSh; }
    DrawDocShell* GetDocSh() const { return mpDocSh; }
    inline SdDrawDocument& GetDoc() const;
    inline ViewShell* GetViewShell() const { return mpViewSh; }
    ViewShell* GetViewShell() const { return mpViewSh; }
    SfxViewShell* GetSfxViewShell() const override;

    virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = nullptr, vcl::Window* pWin = nullptr, bool bIsNewObj = false,
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index fa1a696..68df8b5 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -140,11 +140,11 @@ public:
    /** Return the window that is the parent of all controls of this view
        shell.  This may or may not be the window of the frame.
    */
    inline vcl::Window* GetParentWindow() const { return mpParentWindow; }
    vcl::Window* GetParentWindow() const { return mpParentWindow; }

    sd::Window* GetContentWindow() const;

    inline ::sd::View* GetView() const { return mpView; }
    ::sd::View* GetView() const { return mpView; }
    inline SdrView* GetDrawView() const;
    SD_DLLPUBLIC DrawDocShell* GetDocSh() const;

diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 810e070..1aa9271 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -266,7 +266,7 @@ private:
    void displaySlideNumber( sal_Int32 nSlide );
    void displaySlideIndex( sal_Int32 nIndex );
    sal_Int32 getCurrentSlideNumber();
    inline bool isInputFreezed() const { return mbInputFreeze; }
    bool isInputFreezed() const { return mbInputFreeze; }

    void jumpToBookmark( const OUString& sBookmark );

diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5e20423..c1f7efc 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -166,7 +166,7 @@ public:
    void ShowViewTabBar (bool bShow);

    void SetUserWantsTabBar(bool inValue);
    inline bool GetUserWantsTabBar() { return mbUserWantsTabBar; }
    bool GetUserWantsTabBar() { return mbUserWantsTabBar; }

    /** Common code of ViewShellBase::OuterResizePixel() and
        ViewShellBase::InnerResizePixel().
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 841ee78..5c1aa05 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -125,7 +125,7 @@ void SetTemplate_Impl( const OUString &rFileName,
class SfxDocPasswordVerifier : public ::comphelper::IDocPasswordVerifier
{
public:
    inline explicit     SfxDocPasswordVerifier( const Reference< embed::XStorage >& rxStorage ) :
    explicit     SfxDocPasswordVerifier( const Reference< embed::XStorage >& rxStorage ) :
                            mxStorage( rxStorage ) {}

    virtual ::comphelper::DocPasswordVerifierResult
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e3c1bcb..5628ccd 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -65,7 +65,7 @@ public:
    virtual void    RequestingChildren( SvTreeListEntry* pParent ) override;
    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;

    inline void     SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
    void     SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
    OUString        GetSelectEntry() const;
};

@@ -154,16 +154,16 @@ public:
    void                SetFactory( const OUString& rFactory );
    const OUString&     GetFactory() const { return sFactory; }
    OUString            GetSelectEntry() const;
    inline void         SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
    inline bool         HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
    void         SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
    bool         HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }

    inline void         SetKeywordHdl( const Link<IndexTabPage_Impl&,void>& rLink ) { aKeywordLink = rLink; }
    void         SetKeywordHdl( const Link<IndexTabPage_Impl&,void>& rLink ) { aKeywordLink = rLink; }
    void                SetKeyword( const OUString& rKeyword );
    bool                HasKeyword() const;
    bool                HasKeywordIgnoreCase();
    void                OpenKeyword();

    inline void         SelectExecutableEntry() { m_pIndexCB->SelectExecutableEntry(); }
    void         SelectExecutableEntry() { m_pIndexCB->SelectExecutableEntry(); }
};

// class SearchTabPage_Impl ----------------------------------------------
@@ -183,7 +183,7 @@ public:
    virtual bool        PreNotify( NotifyEvent& rNEvt ) override;
    virtual void        Select() override;

    inline void         SetSearchLink( const Link<LinkParamNone*,void>& rLink ) { aSearchLink = rLink; }
    void         SetSearchLink( const Link<LinkParamNone*,void>& rLink ) { aSearchLink = rLink; }
};

class SearchResultsBox_Impl : public ListBox
@@ -229,13 +229,13 @@ public:
    virtual Control*    GetLastFocusControl() override;

    void                SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
    inline void         SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
    void         SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
    OUString            GetSelectEntry() const;
    void                ClearPage();
    inline void         SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
    inline bool         HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
    inline OUString     GetSearchText() const { return m_pSearchED->GetText(); }
    inline bool         IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
    void         SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
    bool         HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
    OUString     GetSearchText() const { return m_pSearchED->GetText(); }
    bool         IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); }
    bool                OpenKeyword( const OUString& rKeyword );
};

@@ -333,13 +333,13 @@ public:
    virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;

    void                SetDoubleClickHdl( const Link<Control*,bool>& rLink );
    inline void         SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
    void         SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
    void                SetFactory( const OUString& rFactory, bool bActive );
    inline OUString     GetFactory() const { return pIPage->GetFactory(); }
    OUString     GetFactory() const { return pIPage->GetFactory(); }
    OUString            GetSelectEntry() const;
    void                AddBookmarks( const OUString& rTitle, const OUString& rURL );
    bool                IsValidFactory( const OUString& _rFactory );
    inline OUString     GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); }
    OUString     GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); }
    void                ClearSearchPage();
    void                GrabFocusBack();
    bool                HasFocusOnEdit() const;
@@ -474,11 +474,11 @@ public:
    const css::uno::Reference < css::frame::XFrame2 >&
                            getFrame() const { return xFrame; }

    inline void             SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
    void             SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); }
    void                    ToggleIndex( bool bOn );
    void                    SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch );
    void                    SetPageStyleHeaderOff() const;
    inline ToolBox&         GetToolBox() { return *aToolBox.get(); }
    ToolBox&         GetToolBox() { return *aToolBox.get(); }
    void                    CloseFrame();
    void                    DoSearch();
};
@@ -536,7 +536,7 @@ public:
    virtual bool        PreNotify( NotifyEvent& rNEvt ) override;

    void                setContainerWindow( const css::uno::Reference < css::awt::XWindow >& xWin );
    inline css::uno::Reference < css::frame::XFrame2 >
    css::uno::Reference < css::frame::XFrame2 >
                        getTextFrame() const { return pTextWin->getFrame(); }

    void                SetFactory( const OUString& rFactory );
@@ -545,7 +545,7 @@ public:
    void                CloseWindow();

    void                UpdateToolbox();
    inline void         OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }
    void         OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); }

    bool                HasHistoryPredecessor() const;      // forward to interceptor
    bool                HasHistorySuccessor() const;        // forward to interceptor
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 19e6611..db6782a 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -210,8 +210,8 @@ namespace sfx2

        void                    SetContext( FileDialogHelper::Context _eNewContext );

        inline bool             isSystemFilePicker() const { return mbSystemPicker; }
        inline bool             isPasswordEnabled() const { return mbIsPwdEnabled; }
        bool             isSystemFilePicker() const { return mbSystemPicker; }
        bool             isPasswordEnabled() const { return mbIsPwdEnabled; }
    };

}   // end of namespace sfx2
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 6866aa4..f1ba967 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -46,7 +46,7 @@ class SfxOleInt32Property : public SfxOlePropertyBase
public:
    explicit            SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue = 0 );

    inline sal_Int32    GetValue() const { return mnValue; }
    sal_Int32    GetValue() const { return mnValue; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -63,7 +63,7 @@ class SfxOleDoubleProperty : public SfxOlePropertyBase
public:
    explicit            SfxOleDoubleProperty( sal_Int32 nPropId, double fValue = 0.0 );

    inline double       GetValue() const { return mfValue; }
    double       GetValue() const { return mfValue; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -80,7 +80,7 @@ class SfxOleBoolProperty : public SfxOlePropertyBase
public:
    explicit            SfxOleBoolProperty( sal_Int32 nPropId, bool bValue = false );

    inline bool         GetValue() const { return mbValue; }
    bool         GetValue() const { return mbValue; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -105,8 +105,8 @@ public:
                            sal_Int32 nPropId, sal_Int32 nPropType,
                            rtl_TextEncoding eTextEnc );

    inline const OUString& GetValue() const { return maValue; }
    inline void            SetValue( const OUString& rValue ) { maValue = rValue; }
    const OUString& GetValue() const { return maValue; }
    void            SetValue( const OUString& rValue ) { maValue = rValue; }

private:
    OUString            maValue;
@@ -150,7 +150,7 @@ public:
    explicit            SfxOleFileTimeProperty( sal_Int32 nPropId, const util::DateTime& rDateTime );

    /** Returns the time value as LOCAL time. */
    inline const util::DateTime& GetValue() const { return maDateTime; }
    const util::DateTime& GetValue() const { return maDateTime; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -167,7 +167,7 @@ public:
    explicit            SfxOleDateProperty( sal_Int32 nPropId );

    /** Returns the date value as LOCAL time. */
    inline const util::Date& GetValue() const { return maDate; }
    const util::Date& GetValue() const { return maDate; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -188,7 +188,7 @@ public:
    explicit            SfxOleThumbnailProperty( sal_Int32 nPropId,
                            const uno::Sequence<sal_Int8> & i_rData);

    inline bool         IsValid() const { return mData.getLength() > 0; }
    bool         IsValid() const { return mData.getLength() > 0; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
@@ -209,7 +209,7 @@ class SfxOleBlobProperty : public SfxOlePropertyBase
public:
    explicit            SfxOleBlobProperty( sal_Int32 nPropId,
                            const uno::Sequence<sal_Int8> & i_rData);
    inline bool         IsValid() const { return mData.getLength() > 0; }
    bool         IsValid() const { return mData.getLength() > 0; }

private:
    virtual void        ImplLoad( SvStream& rStrm ) override;
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index dfadd52..78c1ac9 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -100,20 +100,20 @@ const sal_Int32 CLIPDATAFMT_DIB         = 8;
class SfxOleTextEncoding
{
public:
    inline explicit     SfxOleTextEncoding() :
    explicit     SfxOleTextEncoding() :
                            mxTextEnc( new rtl_TextEncoding( osl_getThreadTextEncoding() ) ) {}
    inline explicit     SfxOleTextEncoding( rtl_TextEncoding eTextEnc ) :
    explicit     SfxOleTextEncoding( rtl_TextEncoding eTextEnc ) :
                            mxTextEnc( new rtl_TextEncoding( eTextEnc ) ) {}

    /** Returns the current text encoding identifier. */
    inline rtl_TextEncoding GetTextEncoding() const { return *mxTextEnc; }
    rtl_TextEncoding GetTextEncoding() const { return *mxTextEnc; }
    /** Sets the passed text encoding. */
    inline void         SetTextEncoding( rtl_TextEncoding eTextEnc ) { *mxTextEnc = eTextEnc; }
    void         SetTextEncoding( rtl_TextEncoding eTextEnc ) { *mxTextEnc = eTextEnc; }

    /** Returns true, if this object contains Unicode text encoding. */
    inline bool         IsUnicode() const { return GetTextEncoding() == RTL_TEXTENCODING_UCS2; }
    bool         IsUnicode() const { return GetTextEncoding() == RTL_TEXTENCODING_UCS2; }
    /** Sets Unicode text encoding to this object. */
    inline void         SetUnicode() { SetTextEncoding( RTL_TEXTENCODING_UCS2 ); }
    void         SetUnicode() { SetTextEncoding( RTL_TEXTENCODING_UCS2 ); }

    /** Converts the current settings to a Windows codepage identifier. */
    sal_uInt16          GetCodePage() const;
@@ -135,10 +135,10 @@ class SfxOleStringHelper : public SfxOleTextEncoding
{
public:
    /** Creates a string helper object depending on an external text encoding. */
    inline explicit     SfxOleStringHelper( const SfxOleTextEncoding& rTextEnc ) :
    explicit     SfxOleStringHelper( const SfxOleTextEncoding& rTextEnc ) :
                            SfxOleTextEncoding( rTextEnc ) {}
    /** Creates a string helper object with own text encoding. */
    inline explicit     SfxOleStringHelper( rtl_TextEncoding eTextEnc ) :
    explicit     SfxOleStringHelper( rtl_TextEncoding eTextEnc ) :
                            SfxOleTextEncoding( eTextEnc ) {}

    /** Loads a string from the passed stream with current encoding (maybe Unicode). */
@@ -167,11 +167,11 @@ private:
class SfxOleObjectBase
{
public:
    inline explicit     SfxOleObjectBase() : mnErrCode( ERRCODE_NONE ) {}
    explicit     SfxOleObjectBase() : mnErrCode( ERRCODE_NONE ) {}
    virtual             ~SfxOleObjectBase();

    /** Returns the current error code. */
    inline ErrCode      GetError() const { return mnErrCode; }
    ErrCode      GetError() const { return mnErrCode; }

    /** Loads this object from the passed stream. Calls virtual ImplLoad(). */
    ErrCode             Load( SvStream& rStrm );
@@ -181,7 +181,7 @@ public:
protected:
    /** Sets the passed error code. Will be returned by Load() and Save() functions.
        Always the first error code is stored. Multiple calls have no effect. */
    inline void         SetError( ErrCode nErrCode ) { if( mnErrCode == ERRCODE_NONE ) mnErrCode = nErrCode; }
    void         SetError( ErrCode nErrCode ) { if( mnErrCode == ERRCODE_NONE ) mnErrCode = nErrCode; }
    /** Loads the passed object from the stream. Sets returned error code as own error. */
    void                LoadObject( SvStream& rStrm, SfxOleObjectBase& rObj );
    /** Saves the passed object to the stream. Sets returned error code as own error. */
@@ -202,14 +202,14 @@ private:
class SfxOlePropertyBase : public SfxOleObjectBase
{
public:
    inline explicit     SfxOlePropertyBase( sal_Int32 nPropId, sal_Int32 nPropType ) :
    explicit     SfxOlePropertyBase( sal_Int32 nPropId, sal_Int32 nPropType ) :
                            mnPropId( nPropId ), mnPropType( nPropType ) {}

    inline sal_Int32    GetPropId() const { return mnPropId; }
    inline sal_Int32    GetPropType() const { return mnPropType; }
    sal_Int32    GetPropId() const { return mnPropId; }
    sal_Int32    GetPropType() const { return mnPropType; }

protected:
    inline void         SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; }
    void         SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; }

private:
    sal_Int32           mnPropId;
@@ -238,9 +238,9 @@ public:
    explicit            SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc );

    /** Returns true, if the property contains at least one custom property name. */
    inline bool         HasPropertyNames() const { return !maPropNameMap.empty(); }
    bool         HasPropertyNames() const { return !maPropNameMap.empty(); }
    /** Prepares the property for loading. Does not affect contained names for its own. */
    inline void         SetNameCount( sal_Int32 nNameCount ) { SetPropType( nNameCount ); }
    void         SetNameCount( sal_Int32 nNameCount ) { SetPropType( nNameCount ); }

    /** Returns the custom name for the passed property ID, or an empty string, if name not found. */
    OUString            GetPropertyName( sal_Int32 nPropId ) const;
@@ -357,7 +357,7 @@ enum SfxOleSectionType
class SfxOlePropertySet : public SfxOleObjectBase
{
public:
    inline explicit     SfxOlePropertySet() {}
    explicit     SfxOlePropertySet() {}

    /** Loads this object from the passed storage. */
    ErrCode             LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName );
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index b36f7f5..3d6e568 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -69,7 +69,7 @@ protected:
    void repeat();

    template <typename FuncT>
    inline void forEachChildNode( FuncT func,
    void forEachChildNode( FuncT func,
                                  int nodeStateMask ) const
    {
        VectorOfNodes::const_iterator iPos( maChildren.begin() );
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 1ac1db1..fafbd32 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -449,7 +449,7 @@ private:
        maCmdText.append( rText );
    }
    /** Append a blank for separation, if needed */
    inline void Separate( ){
    void Separate( ){
        if( maCmdText.isEmpty() || maCmdText[ maCmdText.getLength() - 1 ] != ' ' )
            maCmdText.append(' ');
    }
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 1bb91e3..3a90fd6 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -127,9 +127,9 @@ protected:
    void    SaveFontFormatList();

    void        SetOtherModified( bool bVal );
    inline bool IsOtherModified() const     { return bIsOtherModified; }
    bool IsOtherModified() const     { return bIsOtherModified; }
    void        SetFormatModified( bool bVal );
    inline bool IsFormatModified() const    { return bIsFormatModified; }
    bool IsFormatModified() const    { return bIsFormatModified; }

    SmFontFormatList &          GetFontFormatList();
    const SmFontFormatList &    GetFontFormatList() const
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index 5c294fc..a440c64 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -44,7 +44,7 @@ public:
    sal_uInt32   nReserved3; // not used
    sal_uInt32   nReserved4; // not used

    inline void Read(SotStorageStream *pS)
    void Read(SotStorageStream *pS)
    {
        pS->ReadUInt16( nCBHdr );
        pS->ReadUInt32( nVersion );
@@ -55,7 +55,7 @@ public:
        pS->ReadUInt32( nReserved3 );
        pS->ReadUInt32( nReserved4 );
    }
    inline void Write(SotStorageStream *pS)
    void Write(SotStorageStream *pS)
    {
        pS->WriteUInt16( nCBHdr );
        pS->WriteUInt32( nVersion );
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index 2d6c1b2..df24ca6 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -39,7 +39,7 @@ struct Link
    OUString m_name;
    OUString m_target;

    inline Link( OUString const & name, OUString const & target )
    Link( OUString const & name, OUString const & target )
        : m_name( name )
        , m_target( target )
        {}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ed9977f..b7b3620 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -72,7 +72,7 @@ static OUString invadp_getImplementationName()

struct hash_ptr
{
    inline size_t operator() ( void * p ) const
    size_t operator() ( void * p ) const
        { return reinterpret_cast<size_t>(p); }
};
typedef std::unordered_set< void *, hash_ptr > t_ptr_set;
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 081dce9..a36a3d9 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -36,14 +36,14 @@ class AbortContinuation:
    public cppu::WeakImplHelper<css::task::XInteractionAbort>
{
public:
    inline AbortContinuation() {}
    AbortContinuation() {}
    AbortContinuation(const AbortContinuation&) = delete;
    AbortContinuation& operator=(const AbortContinuation&)= delete;

    virtual void SAL_CALL select() override {}

private:
    virtual inline ~AbortContinuation() override {}
    virtual ~AbortContinuation() override {}
};

}
@@ -52,7 +52,7 @@ class InteractionRequest::RetryContinuation:
    public cppu::WeakImplHelper<css::task::XInteractionRetry>
{
public:
    inline RetryContinuation(): m_bSelected(false) {}
    RetryContinuation(): m_bSelected(false) {}
    RetryContinuation(const RetryContinuation&) = delete;
    RetryContinuation& operator=(const RetryContinuation&) = delete;

@@ -61,7 +61,7 @@ public:
    bool isSelected() const;

private:
    virtual inline ~RetryContinuation() override {}
    virtual ~RetryContinuation() override {}

    mutable osl::Mutex m_aMutex;
    bool m_bSelected;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index ef8e8ae..7bf88cc 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -124,9 +124,9 @@ public:
        css::uno::Reference< css::uno::XComponentContext > const & rContext);

private:
    inline SingletonFactory() {}
    SingletonFactory() {}

    virtual inline ~SingletonFactory() override {}
    virtual ~SingletonFactory() override {}

    SingletonFactory(const SingletonFactory&) = delete;
    SingletonFactory& operator=(const SingletonFactory&) = delete;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index f1714aa..813daffa 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -267,7 +267,7 @@ class cc_reset
public:
    explicit cc_reset( void * cc )
        : m_cc( cc ) {}
    inline ~cc_reset()
    ~cc_reset()
        { ::uno_setCurrentContext( m_cc, s_envType.pData, nullptr ); }
};

diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 8a388fe..31bdcdb 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -145,14 +145,14 @@ class PolicyReader
    sal_Unicode m_back;

    sal_Unicode get();
    inline void back( sal_Unicode c )
    void back( sal_Unicode c )
        { m_back = c; }

    static inline bool isWhiteSpace( sal_Unicode c )
    static bool isWhiteSpace( sal_Unicode c )
        { return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
    void skipWhiteSpace();

    static inline bool isCharToken( sal_Unicode c )
    static bool isCharToken( sal_Unicode c )
        { return (';' == c || ',' == c || '{' == c || '}' == c); }

public:
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 8fc189f..3ae049c 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -420,7 +420,7 @@ class RuntimePermission : public Permission
    OUString m_name;

public:
    inline RuntimePermission(
    RuntimePermission(
        security::RuntimePermission const & perm,
        ::rtl::Reference< Permission > const & next = ::rtl::Reference< Permission >() )
        : Permission( RUNTIME, next )
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index 582244e..6e9fe79 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -37,7 +37,7 @@ public:
    // mode
    enum t_type { ALL, RUNTIME, SOCKET, FILE } m_type;

    inline Permission(
    Permission(
        t_type type,
        ::rtl::Reference< Permission > const & next )
        : m_next( next )
@@ -65,9 +65,9 @@ class PermissionCollection
{
    ::rtl::Reference< Permission > m_head;
public:
    inline PermissionCollection()
    PermissionCollection()
        {}
    inline PermissionCollection( PermissionCollection const & collection )
    PermissionCollection( PermissionCollection const & collection )
        : m_head( collection.m_head )
        {}
    explicit PermissionCollection( ::rtl::Reference< Permission > const & single )
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 3f78172..6778fc3 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -59,11 +59,11 @@ class PageCache :
    size_t       m_nHit;
    size_t       m_nMissed;

    static inline int hash_Impl(sal_uInt32 a, size_t s, size_t q, size_t m)
    static int hash_Impl(sal_uInt32 a, size_t s, size_t q, size_t m)
    {
        return static_cast<int>((((a) + ((a) >> (s)) + ((a) >> ((s) << 1))) >> (q)) & (m));
    }
    inline int hash_index_Impl (sal_uInt32 nOffset)
    int hash_index_Impl (sal_uInt32 nOffset)
    {
        return hash_Impl(nOffset, m_hash_shift, m_page_shift, m_hash_size - 1);
    }
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 5d6ce67..351283b 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -224,7 +224,7 @@ private:
    // optimized substring versions

    // Whether rString contains rWhat at nPos
    static inline bool StringContains( const OUString& rWhat,
    static bool StringContains( const OUString& rWhat,
                                       const OUString& rString,
                                       sal_Int32 nPos )
        {
@@ -241,7 +241,7 @@ private:
        }

    // Whether pString contains rWhat at nPos
    static inline bool StringPtrContains( const OUString& rWhat,
    static bool StringPtrContains( const OUString& rWhat,
                                          const sal_Unicode* pString,
                                          sal_Int32 nPos ) // nPos MUST be a valid offset from pString
        {
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index e0cec64..62a6629 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -218,7 +218,7 @@ private: // Private section
    short GetKeyWord( const OUString& sSymbol,  // Determine keyword at nPos
                      sal_Int32 nPos );         // Return 0 <=> not found

    inline bool IsAmbiguousE( short nKey )      // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC
    bool IsAmbiguousE( short nKey )      // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC
        {
            return (nKey == NF_KEY_EC || nKey == NF_KEY_E) &&
                (GetKeywords()[NF_KEY_EC] == GetKeywords()[NF_KEY_E]);
@@ -242,7 +242,7 @@ private: // Private section
        reused instead of shifting all one up and nPos is decremented! */
    bool InsertSymbol( sal_uInt16 & nPos, svt::NfSymbolType eType, const OUString& rStr );

    static inline bool StringEqualsChar( const OUString& rStr, sal_Unicode ch )
    static bool StringEqualsChar( const OUString& rStr, sal_Unicode ch )
        { return rStr.getLength() == 1 && rStr[0] == ch; }

    // remove "..." and \... quotes from rStr, return how many chars removed
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 26809e9..ed1de0c 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -35,7 +35,7 @@ namespace svt

        struct  THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void>
        {
            inline void operator()(const THeaderCellMap::value_type& _aType)
            void operator()(const THeaderCellMap::value_type& _aType)
            {
                css::uno::Reference< css::lang::XComponent > xComp( _aType.second, css::uno::UNO_QUERY );
                OSL_ENSURE( xComp.is() || !_aType.second.is(), "THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!" );
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index f7e4e98..4d63b66 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -125,40 +125,40 @@ public:
        //  public interface


        inline bool UseSystemFileDialog() const
        bool UseSystemFileDialog() const
        { return m_bUseSystemFileDialog; }

        inline void SetUseSystemFileDialog( bool bSet )
        void SetUseSystemFileDialog( bool bSet )
        {  m_bUseSystemFileDialog = bSet; SetModified(); }

        inline bool IsUseSystemFileDialogReadOnly() const
        bool IsUseSystemFileDialogReadOnly() const
        { return m_bIsUseSystemFileDialogRO; }

        inline bool DisableUICustomization() const
        bool DisableUICustomization() const
        { return m_bDisableUICustomization; }

        inline void SetExperimentalMode( bool bSet )
        void SetExperimentalMode( bool bSet )
        { m_bExperimentalMode = bSet; SetModified(); }

        inline bool IsExperimentalMode() const
        bool IsExperimentalMode() const
        { return m_bExperimentalMode; }

        inline void SetMacroRecorderMode( bool bSet )
        void SetMacroRecorderMode( bool bSet )
        { m_bMacroRecorderMode = bSet; SetModified(); }

        inline bool IsMacroRecorderMode() const
        bool IsMacroRecorderMode() const
        { return m_bMacroRecorderMode; }

        inline bool IsPluginsEnabled() const
        bool IsPluginsEnabled() const
        { return m_bPluginsEnabled; }

        inline sal_Int16 GetSymbolsSize()
        sal_Int16 GetSymbolsSize()
        { return m_nSymbolsSize; }

        inline ToolBoxButtonSize GetSidebarIconSize()
        ToolBoxButtonSize GetSidebarIconSize()
        { return m_nSidebarIconSize; }

        inline ToolBoxButtonSize GetNotebookbarIconSize()
        ToolBoxButtonSize GetNotebookbarIconSize()
        { return m_nNotebookbarIconSize; }

        void SetSymbolsSize( sal_Int16 nSet );
@@ -190,19 +190,19 @@ public:
        {return m_bIconThemeWasSetAutomatically;}

        // translate to VCL settings ( "0" = 3D, "1" = FLAT )
        inline sal_Int16 GetToolboxStyle()
        sal_Int16 GetToolboxStyle()
        { return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; }

        // translate from VCL settings
        void SetToolboxStyle( sal_Int16 nStyle );

        inline bool UseSystemPrintDialog() const
        bool UseSystemPrintDialog() const
        { return m_bUseSystemPrintDialog; }

        inline void SetUseSystemPrintDialog( bool bSet )
        void SetUseSystemPrintDialog( bool bSet )
        {  m_bUseSystemPrintDialog = bSet; SetModified(); }

        inline bool ShowLinkWarningDialog() const
        bool ShowLinkWarningDialog() const
        { return m_bShowLinkWarningDialog; }

        void SetShowLinkWarningDialog( bool bSet )
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 45e8004..0a5ce6f 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -81,7 +81,7 @@ public:

    static bool TildeParsing( OUString& aText, OUString& aBaseUrl );

    inline SvtURLBox_Impl( )
    SvtURLBox_Impl( )
    {
        FilterMatch::createWildCardFilterList(OUString(),m_aFilters);
    }
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 06a27c0..a8495d7 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -52,7 +52,7 @@ private:
                                /** Gets the font of the given script type. */
    const vcl::Font&            GetFont( sal_uInt16 _nScript ) const;
                                /** Sets a font on the output device depending on the script type. */
    inline void                 SetOutDevFont( sal_uInt16 _nScript )
    void                 SetOutDevFont( sal_uInt16 _nScript )
                                    { mrOutDevice.SetFont( GetFont( _nScript ) ); }
                                /** Fills maPosVec with positions of all changes of script type.
                                    This method expects correctly initialized maPosVec and maScriptVec. */
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 28b2615..2503926 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -200,7 +200,7 @@ private:
    void                CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect );

    bool AreChildrenTransient() const { return bAreChildrenTransient; }
    inline void         SetChildrenNotTransient() { bAreChildrenTransient = false; }
    void         SetChildrenNotTransient() { bAreChildrenTransient = false; }

protected:
    VclPtr<SvTreeListBox>   pView;
@@ -333,9 +333,9 @@ public:

    /** Enables, that one cell of a tablistbox entry can be focused */
    bool IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
    inline void         EnableCellFocus() { bIsCellFocusEnabled = true; }
    void         EnableCellFocus() { bIsCellFocusEnabled = true; }
    bool                SetCurrentTabPos( sal_uInt16 _nNewPos );
    inline sal_uInt16       GetCurrentTabPos() const { return nCurTabPos; }
    sal_uInt16       GetCurrentTabPos() const { return nCurTabPos; }

    bool                IsSelectable( const SvTreeListEntry* pEntry );
};
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index e757511..c8df77d 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -111,7 +111,7 @@ namespace svt
        TemplateFolderContent   m_aSubContents;     // sorted (by name) list of the children

    private:
        inline  void    implResetDate( )
        void    implResetDate( )
        {
            m_aLastModified.NanoSeconds = m_aLastModified.Seconds = m_aLastModified.Minutes = m_aLastModified.Hours = 0;
            m_aLastModified.Day = m_aLastModified.Month = m_aLastModified.Year = 0;
@@ -124,18 +124,18 @@ namespace svt
        explicit TemplateContent( const INetURLObject& _rURL );

        // attribute access
        inline OUString                 getURL( ) const                             { return m_aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); }
        inline void                     setModDate( const util::DateTime& _rDate )  { m_aLastModified = _rDate; }
        inline const util::DateTime&    getModDate( ) const                         { return m_aLastModified; }
        OUString                 getURL( ) const                             { return m_aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); }
        void                     setModDate( const util::DateTime& _rDate )  { m_aLastModified = _rDate; }
        const util::DateTime&    getModDate( ) const                         { return m_aLastModified; }

        inline TemplateFolderContent&   getSubContents()            { return m_aSubContents; }
        inline const TemplateFolderContent& getSubContents() const  { return m_aSubContents; }
        TemplateFolderContent&   getSubContents()            { return m_aSubContents; }
        const TemplateFolderContent& getSubContents() const  { return m_aSubContents; }

                inline ConstFolderIterator              end() const             { return m_aSubContents.end(); }
        inline TemplateFolderContent::size_type
                ConstFolderIterator              end() const             { return m_aSubContents.end(); }
        TemplateFolderContent::size_type
                                        size() const    { return m_aSubContents.size(); }

        inline void                     push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement )
        void                     push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement )
                                                        { m_aSubContents.push_back( _rxNewElement ); }
    };

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index ce36856..19d87ba 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1038,7 +1038,7 @@ public:
    TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );

    /// determines whether we're currently listening
    inline bool isListening() const { return mpListener != nullptr; }
    bool isListening() const { return mpListener != nullptr; }

    /// makes the instance non-functional
    void    dispose();
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 47a71a3..9fdd30d 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -136,18 +136,18 @@ namespace svt { namespace table
    public:
        void        setModel( const PTableModel& _pModel );

        inline  const PTableInputHandler&   getInputHandler() const { return m_pInputHandler; }
        const PTableInputHandler&   getInputHandler() const { return m_pInputHandler; }

        inline  RowPos  getCurRow() const           { return m_nCurRow; }
        RowPos  getCurRow() const           { return m_nCurRow; }

        RowPos  getAnchor() const { return m_nAnchor; }
        void    setAnchor( RowPos const i_anchor ) { m_nAnchor = i_anchor; }

        inline  RowPos  getTopRow() const       { return m_nTopRow; }
        inline  ColPos  getLeftColumn() const { return m_nLeftColumn; }
        RowPos  getTopRow() const       { return m_nTopRow; }
        ColPos  getLeftColumn() const { return m_nLeftColumn; }

        inline  const TableControl&   getAntiImpl() const { return m_rAntiImpl; }
        inline        TableControl&   getAntiImpl()       { return m_rAntiImpl; }
        const TableControl&   getAntiImpl() const { return m_rAntiImpl; }
        TableControl&   getAntiImpl()       { return m_rAntiImpl; }

    public:
        explicit TableControl_Impl( TableControl& _rAntiImpl );
@@ -283,7 +283,7 @@ namespace svt { namespace table
                        getAccessible( vcl::Window& i_parentWindow );
        void            disposeAccessible();

        inline bool     isAccessibleAlive() const { return impl_isAccessibleAlive(); }
        bool     isAccessibleAlive() const { return impl_isAccessibleAlive(); }

        // ITableModelListener
        virtual void    rowsInserted( RowPos first, RowPos last ) override;
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 99def26..d7786fc 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -44,7 +44,7 @@ namespace svt { namespace table
        virtual ~TableDataWindow() override;
        virtual void dispose() override;

        inline void SetSelectHdl(const Link<LinkParamNone*,void>& rLink)
        void SetSelectHdl(const Link<LinkParamNone*,void>& rLink)
        {
            m_aSelectHdl = rLink;
        }
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index c594362..c6ffba2 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -146,11 +146,11 @@ namespace svt { namespace table
        {
        }

        inline  Rectangle   getRect() const     { return m_aRow.getRect().GetIntersection( m_aCol.getRect() ); }
        inline  ColPos      getColumn() const   { return m_aCol.getCol(); }
        inline  bool        isValid() const     { return !getRect().IsEmpty(); }
        Rectangle   getRect() const     { return m_aRow.getRect().GetIntersection( m_aCol.getRect() ); }
        ColPos      getColumn() const   { return m_aCol.getCol(); }
        bool        isValid() const     { return !getRect().IsEmpty(); }

        inline  bool        moveRight()     {return m_aCol.moveRight(); }
        bool        moveRight()     {return m_aCol.moveRight(); }
    };


diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 8bd8f6e..a23a15a 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -493,7 +493,7 @@ public:
        descriptor may be based on a UNO shape or, already, on an accessible
        shape.
    */
    inline bool operator == (const ChildDescriptor& aDescriptor) const
    bool operator == (const ChildDescriptor& aDescriptor) const
    {
        return (
                this == &aDescriptor ||
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 744b9a1..0890aae 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -162,7 +162,7 @@ class FontPrevWin_Impl


public:
    inline FontPrevWin_Impl() :
    FontPrevWin_Impl() :
        mpPrinter(nullptr),
        mbDelPrinter(false),
        mpColor(nullptr),
@@ -185,7 +185,7 @@ public:
        Invalidate100PercentFontWidth();
    }

    inline ~FontPrevWin_Impl()
    ~FontPrevWin_Impl()
    {
        delete mpColor;
        delete mpBackColor;
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 6bdc093..76ba406 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -100,10 +100,10 @@ struct LineEndResult
    long                mnOffs1;    /// Offset for top or left edge, dependent of context.
    long                mnOffs2;    /// Offset for bottom or right edge, dependent of context

    inline explicit     LineEndResult() : mnOffs1( 0 ), mnOffs2( 0 ) {}
    explicit     LineEndResult() : mnOffs1( 0 ), mnOffs2( 0 ) {}

    inline void         Swap() { std::swap( mnOffs1, mnOffs2 ); }
    inline void         Negate() { mnOffs1 = -mnOffs1; mnOffs2 = -mnOffs2; }
    void         Swap() { std::swap( mnOffs1, mnOffs2 ); }
    void         Negate() { mnOffs1 = -mnOffs1; mnOffs2 = -mnOffs2; }
};

/** Result struct used by the horizontal/vertical frame link functions.
@@ -117,7 +117,7 @@ struct BorderEndResult
    LineEndResult       maSecn;     /// Result for secondary line.
    LineEndResult       maGap;      /// Result for gap line.

    inline void         Negate() { maPrim.Negate(); maSecn.Negate(); maGap.Negate(); }
    void         Negate() { maPrim.Negate(); maSecn.Negate(); maGap.Negate(); }
};

/** Result struct used by the horizontal/vertical frame link functions.
@@ -146,7 +146,7 @@ struct DiagLineResult
    long                mnTClip;    /// Offset for top border of clipping rectangle.
    long                mnBClip;    /// Offset for bottom border of clipping rectangle.

    inline explicit     DiagLineResult() : mnLClip( 0 ), mnRClip( 0 ), mnTClip( 0 ), mnBClip( 0 ) {}
    explicit     DiagLineResult() : mnLClip( 0 ), mnRClip( 0 ), mnTClip( 0 ), mnBClip( 0 ) {}
};

/** Result struct used by the diagonal frame link functions.
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 00744c6..3438e98 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -45,7 +45,7 @@ struct Cell

    explicit            Cell();

    inline bool         IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; }
    bool         IsMerged() const { return mbMergeOrig || mbOverlapX || mbOverlapY; }

    void                MirrorSelfX();
};
@@ -122,9 +122,9 @@ struct ArrayImpl

    explicit            ArrayImpl( size_t nWidth, size_t nHeight, bool bDiagDblClip );

    inline bool         IsValidPos( size_t nCol, size_t nRow ) const
    bool         IsValidPos( size_t nCol, size_t nRow ) const
                            { return (nCol < mnWidth) && (nRow < mnHeight); }
    inline size_t       GetIndex( size_t nCol, size_t nRow ) const
    size_t       GetIndex( size_t nCol, size_t nRow ) const
                            { return nRow * mnWidth + nCol; }

    const Cell&         GetCell( size_t nCol, size_t nRow ) const;
@@ -146,7 +146,7 @@ struct ArrayImpl
    bool                IsColInClipRange( size_t nCol ) const;
    bool                IsRowInClipRange( size_t nRow ) const;

    inline size_t       GetMirrorCol( size_t nCol ) const { return mnWidth - nCol - 1; }
    size_t       GetMirrorCol( size_t nCol ) const { return mnWidth - nCol - 1; }

    long                GetColPosition( size_t nCol ) const;
    long                GetRowPosition( size_t nRow ) const;
@@ -323,9 +323,9 @@ class MergedCellIterator
public:
    explicit            MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow );

    inline bool         Is() const { return (mnCol <= mnLastCol) && (mnRow <= mnLastRow); }
    inline size_t       Col() const { return mnCol; }
    inline size_t       Row() const { return mnRow; }
    bool         Is() const { return (mnCol <= mnLastCol) && (mnRow <= mnLastRow); }
    size_t       Col() const { return mnCol; }
    size_t       Row() const { return mnRow; }

    MergedCellIterator& operator++();

diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index d935404..afc9181 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -84,8 +84,8 @@ namespace svx
                );

        // simple access methods
        inline SvxShowCharSetAcc*   getTable() const { return m_xTable.get(); }
        inline SvxShowCharSet*      getCharSetControl() const { return mpParent; }
        SvxShowCharSetAcc*   getTable() const { return m_xTable.get(); }
        SvxShowCharSet*      getCharSetControl() const { return mpParent; }
    };


@@ -174,7 +174,7 @@ namespace svx
        virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;


        inline void SAL_CALL fireEvent(
        void SAL_CALL fireEvent(
                    const sal_Int16 _nEventId,
                    const css::uno::Any& _rOldValue,
                    const css::uno::Any& _rNewValue
@@ -257,7 +257,7 @@ namespace svx
        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;


        inline void SAL_CALL fireEvent(
        void SAL_CALL fireEvent(
                    const sal_Int16 _nEventId,
                    const css::uno::Any& _rOldValue,
                    const css::uno::Any& _rNewValue
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index b8de220..123c986 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -279,7 +279,7 @@ namespace svxform

        virtual void                Resize() override;

        inline bool                 HasModel() const { return m_bHasModel; }
        bool                 HasModel() const { return m_bHasModel; }
        OUString                    SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
        void                        ClearModel();
        OUString                    LoadInstance(const PropertyValue_seq& _xPropSeq);
@@ -287,16 +287,16 @@ namespace svxform
        bool                        DoMenuAction( sal_uInt16 _nMenuID );
        void                        EnableMenuItems( Menu* _pMenu );

        inline const OUString&      GetInstanceName() const { return m_sInstanceName; }
        inline const OUString&      GetInstanceURL() const { return m_sInstanceURL; }
        inline bool                 GetLinkOnce() const { return m_bLinkOnce; }
        inline void                 SetInstanceName( const OUString &name ) { m_sInstanceName=name; }
        inline void                 SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; }
        inline void                 SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; }
        const OUString&      GetInstanceName() const { return m_sInstanceName; }
        const OUString&      GetInstanceURL() const { return m_sInstanceURL; }
        bool                 GetLinkOnce() const { return m_bLinkOnce; }
        void                 SetInstanceName( const OUString &name ) { m_sInstanceName=name; }
        void                 SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; }
        void                 SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; }

        inline css::uno::Reference<css::beans::XPropertySet>
        css::uno::Reference<css::beans::XPropertySet>
                                    GetBindingForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); }
        inline OUString             GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
        OUString             GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
        const XFormsUIHelper1_ref&  GetXFormsHelper() const { return m_xUIHelper; }
    };

@@ -579,7 +579,7 @@ namespace svxform
        virtual ~AddSubmissionDialog() override;
        virtual void dispose() override;

        inline const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; }
        const XSubmission_ref& GetNewSubmission() const { return m_xNewSubmission; }
    };


diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index a48391a..b22cb95 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -108,10 +108,10 @@ public:
    {
    }

    inline const css::uno::Reference< css::form::runtime::XFormController >&
    const css::uno::Reference< css::form::runtime::XFormController >&
        GetController() { return m_xController; }

    inline const css::uno::Reference< css::form::runtime::XFilterController >&
    const css::uno::Reference< css::form::runtime::XFilterController >&
        GetFilterController() { return m_xFilterController; }

    virtual Image GetImage() const override;
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index db0672d..1215c3c 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -105,10 +105,10 @@ namespace svxform
        void        startDrag( sal_Int8 nDragSourceActions );
        void        copyToClipboard( ) const;

        inline  bool    isDragSource() const { return m_xTransferable.is() && m_xTransferable->isDragging(); }
        inline  bool    isClipboardOwner() const { return m_xTransferable.is() && m_xTransferable->isClipboardOwner(); }
        inline  bool    isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
        inline  void        clear() { if ( isDataExchangeActive() ) m_xTransferable->clear(); }
        bool    isDragSource() const { return m_xTransferable.is() && m_xTransferable->isDragging(); }
        bool    isClipboardOwner() const { return m_xTransferable.is() && m_xTransferable->isClipboardOwner(); }
        bool    isDataExchangeActive( ) const { return isDragSource() || isClipboardOwner(); }
        void        clear() { if ( isDataExchangeActive() ) m_xTransferable->clear(); }

        SVX_DLLPRIVATE void     setClipboardListener( const Link<OLocalExchange&,void>& _rListener ) { if ( m_xTransferable.is() ) m_xTransferable->setClipboardListener( _rListener ); }

diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index f56da8cf..811086c 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -83,8 +83,8 @@ public:
    );

    // activation handling
    inline  bool    hasEverBeenActivated( ) const { return !m_bFirstActivation; }
    inline  void        setHasBeenActivated( ) { m_bFirstActivation = false; }
    bool    hasEverBeenActivated( ) const { return !m_bFirstActivation; }
    void        setHasBeenActivated( ) { m_bFirstActivation = false; }

    const css::uno::Reference< css::form::XForms>& getForms( bool _bForceCreate = true );

diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index d9b6680..6a92aa8 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -171,7 +171,7 @@ class SVX_DLLPUBLIC FmXFormShell   : public FmXFormShell_BASE
    struct SAL_DLLPRIVATE InvalidSlotInfo {
        sal_uInt16 id;
        sal_uInt8   flags;
        inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
        InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {};
    };
    std::vector<InvalidSlotInfo> m_arrInvalidSlots;
        // we explicitly switch off the propbrw before leaving the design mode
@@ -251,14 +251,14 @@ class SVX_DLLPUBLIC FmXFormShell   : public FmXFormShell_BASE

public:
    // attribute access
    SAL_DLLPRIVATE inline const css::uno::Reference< css::frame::XFrame >&
    SAL_DLLPRIVATE const css::uno::Reference< css::frame::XFrame >&
                getHostFrame() const { return m_xAttachedFrame; }
    SAL_DLLPRIVATE inline const css::uno::Reference< css::sdbc::XResultSet >&
    SAL_DLLPRIVATE const css::uno::Reference< css::sdbc::XResultSet >&
                getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; }

    SAL_DLLPRIVATE inline bool
    SAL_DLLPRIVATE bool
                didPrepareClose() const { return m_bPreparedClose; }
    SAL_DLLPRIVATE inline void
    SAL_DLLPRIVATE void
                didPrepareClose( bool _bDid ) { m_bPreparedClose = _bDid; }

public:
@@ -354,9 +354,9 @@ public:
    SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm>& getActiveForm() const {return m_xActiveForm;}
    SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;}

    SAL_DLLPRIVATE inline const svx::ControllerFeatures& getActiveControllerFeatures() const
    SAL_DLLPRIVATE const svx::ControllerFeatures& getActiveControllerFeatures() const
        { return m_aActiveControllerFeatures; }
    SAL_DLLPRIVATE inline const svx::ControllerFeatures& getNavControllerFeatures() const
    SAL_DLLPRIVATE const svx::ControllerFeatures& getNavControllerFeatures() const
        { return m_aNavControllerFeatures.isAssigned() ? m_aNavControllerFeatures : m_aActiveControllerFeatures; }

    /** announces a new "current selection"
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index b8038b2..6511ff9 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -61,8 +61,8 @@ namespace svx
        );

        /// determines whether the feature we're responsible for is currently enabled
        inline  bool                                isFeatureEnabled( ) const { return m_bFeatureEnabled; }
        inline  const css::uno::Any&   getFeatureState( ) const { return m_aFeatureState; }
        bool                                isFeatureEnabled( ) const { return m_bFeatureEnabled; }
        const css::uno::Any&   getFeatureState( ) const { return m_aFeatureState; }

        /** dispatches the feature URL to the dispatcher
        */
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 1ebc316..76c87c6 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -151,7 +151,7 @@ namespace svx
        void    executeClipboardSlot( SfxSlotId _nSlot );

    private:
        inline  bool    isControllerListening() const { return !m_aControlObservers.empty(); }
        bool    isControllerListening() const { return !m_aControlObservers.empty(); }

        FmTextControlFeature*
                        implGetFeatureDispatcher(
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 59fe6d2..4bef73e 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -216,8 +216,8 @@ public:
            getFormController( const css::uno::Reference< css::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;

    // activation handling
    inline  bool        hasEverBeenActivated( ) const { return !m_bFirstActivation; }
    inline  void        setHasBeenActivated( ) { m_bFirstActivation = false; }
    bool        hasEverBeenActivated( ) const { return !m_bFirstActivation; }
    void        setHasBeenActivated( ) { m_bFirstActivation = false; }

            void        onFirstViewActivation( const FmFormModel* _pDocModel );

diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f48357d..f733e5a 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -101,7 +101,7 @@ namespace svx
        ~ControllerFeatures();

        /// checks whether the instance is properly assigned to a form and/or controller
        inline bool isAssigned( ) const { return m_pImpl != nullptr; }
        bool isAssigned( ) const { return m_pImpl != nullptr; }

        /** assign to a controller
        */
@@ -113,8 +113,8 @@ namespace svx
        void dispose();

        // access to the instance which implements the functionality. Not to be used when not assigned
        inline const FormControllerHelper* operator->() const { return m_pImpl.get(); }
        inline       FormControllerHelper* operator->()       { return m_pImpl.get(); }
        const FormControllerHelper* operator->() const { return m_pImpl.get(); }
        FormControllerHelper* operator->()       { return m_pImpl.get(); }
    };


diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 7bb2d57..0bb1e12 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -37,38 +37,38 @@ class FrameBorder
public:
    explicit FrameBorder(FrameBorderType eType);

    inline FrameBorderType GetType() const
    FrameBorderType GetType() const
    {
        return meType;
    }

    inline bool IsEnabled() const
    bool IsEnabled() const
    {
        return mbEnabled;
    }
    void Enable(FrameSelFlags nFlags);

    inline FrameBorderState GetState() const
    FrameBorderState GetState() const
    {
        return meState;
    }
    void SetState(FrameBorderState eState);

    inline bool IsSelected() const { return mbSelected; }
    inline void Select( bool bSelect ) { mbSelected = bSelect; }
    bool IsSelected() const { return mbSelected; }
    void Select( bool bSelect ) { mbSelected = bSelect; }

    const editeng::SvxBorderLine& GetCoreStyle() const { return maCoreStyle; }
    void SetCoreStyle( const editeng::SvxBorderLine* pStyle );

    inline void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); }
    inline void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); }
    inline const frame::Style& GetUIStyle() const { return maUIStyle; }
    void SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); }
    void SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); }
    const frame::Style& GetUIStyle() const { return maUIStyle; }

    inline void ClearFocusArea() { maFocusArea.Clear(); }
    void ClearFocusArea() { maFocusArea.Clear(); }
    void AddFocusPolygon( const tools::Polygon& rFocus );
    void MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const;

    inline void ClearClickArea() { maClickArea.Clear(); }
    void ClearClickArea() { maClickArea.Clear(); }
    void AddClickRect( const Rectangle& rRect );
    bool ContainsClickPoint( const Point& rPos ) const;
    Rectangle GetClickBoundRect() const;
@@ -217,19 +217,19 @@ struct FrameSelectorImpl
/** Dummy predicate for frame border iterators to use all borders in a container. */
struct FrameBorderDummy_Pred
{
    inline bool operator()( const FrameBorder* ) const { return true; }
    bool operator()( const FrameBorder* ) const { return true; }
};

/** Predicate for frame border iterators to use only visible borders in a container. */
struct FrameBorderVisible_Pred
{
    inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FrameBorderState::Show; }
    bool operator()( const FrameBorder* pBorder ) const { return pBorder->GetState() == FrameBorderState::Show; }
};

/** Predicate for frame border iterators to use only selected borders in a container. */
struct FrameBorderSelected_Pred
{
    inline bool operator()( const FrameBorder* pBorder ) const { return pBorder->IsSelected(); }
    bool operator()( const FrameBorder* pBorder ) const { return pBorder->IsSelected(); }
};

/** Template class for all types of frame border iterators. */
@@ -244,9 +244,9 @@ public:
    typedef FrameBorderIterBase<Cont, Iter, Pred> this_type;

    explicit            FrameBorderIterBase( container_type& rCont );
    inline bool         Is() const { return maIt != maEnd; }
    bool         Is() const { return maIt != maEnd; }
    this_type&          operator++();
    inline value_type   operator*() const { return *maIt; }
    value_type   operator*() const { return *maIt; }

private:
    iterator_type       maIt;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index a337a2c..418719b 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -220,11 +220,11 @@ protected:
    const css::uno::Reference< css::sdbc::XRowSet >& getCursor() const { return m_xCursor; }

    // control transparency
    inline  bool    isTransparent( ) const { return m_bTransparent; }
    inline  void        setTransparent( bool _bSet ) { m_bTransparent = _bSet; }
    bool    isTransparent( ) const { return m_bTransparent; }
    void        setTransparent( bool _bSet ) { m_bTransparent = _bSet; }

    // control alignment
    inline  void        setAlignedController( bool _bAlign ) { m_bAlignedController = _bAlign; }
    void        setAlignedController( bool _bAlign ) { m_bAlignedController = _bAlign; }


    /** determined whether or not the value property is locked
@@ -271,7 +271,7 @@ public:
    }

    // control alignment
    inline  bool    isAlignedController() const { return m_bAlignedController; }
    bool    isAlignedController() const { return m_bAlignedController; }
            void        AlignControl(sal_Int16 nAlignment);

    void SetTextLineColor();
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index c3a2bae..95e3f7e 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -47,7 +47,7 @@ namespace svxform
        // void !, even if the object has some of the needed interfaces.

        // 'conversions'
        inline const css::uno::Reference< css::sdb::XColumn>& getColumn() const
        const css::uno::Reference< css::sdb::XColumn>& getColumn() const
        {
            return m_xColumn;
        }
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 2a13a40..ebcbc95 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -178,21 +178,21 @@ namespace sdr { namespace contact {
        }

    public:
        inline  bool    is() const { return m_xControl.is() && m_xControlWindow.is() && m_xControlView.is(); }
        inline  void    clear() { m_xControl.clear(); m_xControlWindow.clear(); m_xControlView.clear(); }
        bool    is() const { return m_xControl.is() && m_xControlWindow.is() && m_xControlView.is(); }
        void    clear() { m_xControl.clear(); m_xControlWindow.clear(); m_xControlView.clear(); }

        // delegators for the methods of the UNO interfaces
        // Note all those will crash if called for a NULL object.
        inline bool     isDesignMode() const                        { return m_xControl->isDesignMode();         }
        inline void     setDesignMode( const bool _bDesign ) const  { m_xControl->setDesignMode( _bDesign );     }
        inline bool     isVisible() const                           { return m_xControlWindow->isVisible();      }
        inline void     setVisible( const bool _bVisible ) const    { m_xControlWindow->setVisible( _bVisible ); }
        inline Reference< XControlModel >
        bool     isDesignMode() const                        { return m_xControl->isDesignMode();         }
        void     setDesignMode( const bool _bDesign ) const  { m_xControl->setDesignMode( _bDesign );     }
        bool     isVisible() const                           { return m_xControlWindow->isVisible();      }
        void     setVisible( const bool _bVisible ) const    { m_xControlWindow->setVisible( _bVisible ); }
        Reference< XControlModel >
                        getModel() const { return m_xControl->getModel(); }
        inline void     setModel( const Reference< XControlModel >& _m ) const { m_xControl->setModel( _m ); }
        void     setModel( const Reference< XControlModel >& _m ) const { m_xControl->setModel( _m ); }

        inline void     addWindowListener( const Reference< XWindowListener >& _l ) const    { m_xControlWindow->addWindowListener( _l );    }
        inline void     removeWindowListener( const Reference< XWindowListener >& _l ) const { m_xControlWindow->removeWindowListener( _l ); }
        void     addWindowListener( const Reference< XWindowListener >& _l ) const    { m_xControlWindow->addWindowListener( _l );    }
        void     removeWindowListener( const Reference< XWindowListener >& _l ) const { m_xControlWindow->removeWindowListener( _l ); }
               void     setPosSize( const Rectangle& _rPosSize ) const;
               Rectangle
                        getPosSize() const;
@@ -203,7 +203,7 @@ namespace sdr { namespace contact {
               void     invalidate() const;

    public:
        inline  const Reference< XControl >&    getControl() const  { return m_xControl; }
        const Reference< XControl >&    getControl() const  { return m_xControl; }
    };


@@ -568,10 +568,10 @@ namespace sdr { namespace contact {

            If you want to ensure that the control exists before accessing it, use ->ensureControl
        */
        inline const ControlHolder&
        const ControlHolder&
                getExistentControl() const { return m_aControl; }

        inline bool
        bool
                hasControl() const { return m_aControl.is(); }

        /** positions our XControl according to the geometry settings in the SdrUnoObj, modified by the given
@@ -756,7 +756,7 @@ namespace sdr { namespace contact {
                an SdrPageView (which carries this flag), or somebody explicitly set it from
                outside.
        */
        inline bool impl_isControlDesignMode_nothrow() const
        bool impl_isControlDesignMode_nothrow() const
        {
            DBG_ASSERT( m_eControlDesignMode != eUnknown, "ViewObjectContactOfUnoControl_Impl::impl_isControlDesignMode_nothrow: mode is still unknown!" );
            return m_eControlDesignMode == eDesign;
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 053b0948..ab62d8b 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -107,7 +107,7 @@ public:

    /** set the index _nIndex at the accessible cell param  _nIndex The new index in parent.
    */
    inline void setIndexInParent(sal_Int32 _nIndex) { mnIndexInParent = _nIndex; }
    void setIndexInParent(sal_Int32 _nIndex) { mnIndexInParent = _nIndex; }

    //Get the parent table
    AccessibleTableShape* GetParentTable() { return pAccTable; }
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 4c00601..5798179 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -105,9 +105,9 @@ private:
    void LayoutTableWidth( ::Rectangle& rArea, bool bFit );
    void LayoutTableHeight( ::Rectangle& rArea, bool bFit );

    inline bool isValidColumn( sal_Int32 nColumn ) const { return (nColumn >= 0) && (nColumn < static_cast<sal_Int32>( maColumns.size())); }
    inline bool isValidRow( sal_Int32 nRow ) const { return (nRow >= 0) && (nRow < static_cast<sal_Int32>( maRows.size())); }
    inline bool isValid( const CellPos& rPos ) const { return isValidColumn( rPos.mnCol ) && isValidRow( rPos.mnRow ); }
    bool isValidColumn( sal_Int32 nColumn ) const { return (nColumn >= 0) && (nColumn < static_cast<sal_Int32>( maColumns.size())); }
    bool isValidRow( sal_Int32 nRow ) const { return (nRow >= 0) && (nRow < static_cast<sal_Int32>( maRows.size())); }
    bool isValid( const CellPos& rPos ) const { return isValidColumn( rPos.mnCol ) && isValidRow( rPos.mnRow ); }

    void ClearBorderLayout();
    static void ClearBorderLayout(BorderLineMap& rMap);
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index e79095e..3794901 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -64,7 +64,7 @@ public:
    virtual void                PopupModeEnd() override;
    virtual void                statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;

    inline ListBox &            GetListBox()    { return *m_pListBox; }
    ListBox &            GetListBox()    { return *m_pListBox; }

    bool                        IsUserSelected() const          { return bUserSel; }
    void                        SetUserSelected( bool bVal )    { bUserSel = bVal; }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 484c1b5..99f93e1 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2207,7 +2207,7 @@ struct SvxStyleToolBoxControl::Impl
    bool                     bSpecModeWriter;
    bool                     bSpecModeCalc;

    inline Impl()
    Impl()
        :aClearForm         ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
        ,aMore              ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) )
        ,bSpecModeWriter    ( false )
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 69e817c..5b2c186 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -44,7 +44,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
        virtual void    SetPostItText() override;
        virtual void    Delete() override;
        virtual void    GotoPos() override;
        inline const SwPostItField* GetPostItField() { return mpField; }
        const SwPostItField* GetPostItField() { return mpField; }
        void UpdateText(const OUString& aText);

        virtual OUString GetAuthor() override;
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index af4e5a4..95ac4fb 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -80,21 +80,21 @@ class SwSidebarWin : public vcl::Window
        void TranslateTopPosition(const long aAmount);
        void CheckMetaText();

        inline Point GetAnchorPos() { return mAnchorRect.Pos(); }
        inline const SwRect& GetAnchorRect() { return mAnchorRect; }
        inline bool IsAnchorRectChanged() { return mbAnchorRectChanged; }
        inline void ResetAnchorRectChanged() { mbAnchorRectChanged = false; }
        inline const std::vector<basegfx::B2DRange>& GetAnnotationTextRanges() { return maAnnotationTextRanges; }
        Point GetAnchorPos() { return mAnchorRect.Pos(); }
        const SwRect& GetAnchorRect() { return mAnchorRect; }
        bool IsAnchorRectChanged() { return mbAnchorRectChanged; }
        void ResetAnchorRectChanged() { mbAnchorRectChanged = false; }
        const std::vector<basegfx::B2DRange>& GetAnnotationTextRanges() { return maAnnotationTextRanges; }
        SwEditWin& EditWin();
        inline SwSidebarItem& GetSidebarItem() { return mrSidebarItem; }
        SwSidebarItem& GetSidebarItem() { return mrSidebarItem; }

        inline OutlinerView* GetOutlinerView() { return mpOutlinerView;}
        OutlinerView* GetOutlinerView() { return mpOutlinerView;}
        bool HasScrollbar() const;
        bool IsScrollbarVisible() const;
        inline ScrollBar* Scrollbar() { return mpVScrollbar; }
        inline ::sw::sidebarwindows::AnchorOverlayObject* Anchor() { return mpAnchor;}
        inline ::sw::sidebarwindows::ShadowOverlayObject* Shadow() { return mpShadow;}
        inline ::sw::overlay::OverlayRanges* TextRange() { return mpTextRangeOverlay;}
        ScrollBar* Scrollbar() { return mpVScrollbar; }
        ::sw::sidebarwindows::AnchorOverlayObject* Anchor() { return mpAnchor;}
        ::sw::sidebarwindows::ShadowOverlayObject* Shadow() { return mpShadow;}
        ::sw::overlay::OverlayRanges* TextRange() { return mpTextRangeOverlay;}

        long            GetPostItTextHeight();

@@ -176,7 +176,7 @@ class SwSidebarWin : public vcl::Window
        }

        DECL_LINK( WindowEventListener, VclWindowEvent&, void );
        inline bool IsMouseOverSidebarWin() const { return mbMouseOver; }
        bool IsMouseOverSidebarWin() const { return mbMouseOver; }

        void SetLanguage(const SvxLanguageItem& rNewItem);

@@ -207,9 +207,9 @@ class SwSidebarWin : public vcl::Window
        DECL_LINK(ScrollHdl, ScrollBar*, void);
        DECL_LINK(DeleteHdl, void*, void);

        inline SwView& DocView() { return mrView;}
        inline SwPostItMgr& Mgr() { return mrMgr; }
        inline Outliner* Engine() { return mpOutliner;}
        SwView& DocView() { return mrView;}
        SwPostItMgr& Mgr() { return mrMgr; }
        Outliner* Engine() { return mpOutliner;}

    private:
        SwSidebarWin*   GetTopReplyNote();
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 6be2c8b..166ad1fd 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -148,7 +148,7 @@ public:

       @return the parent
    */
    inline SwNumberTreeNode* GetParent() const
    SwNumberTreeNode* GetParent() const
    {
        return mpParent;
    }
@@ -309,7 +309,7 @@ public:
        Usage: on <IsCounted()> state change its needed to invalidate the
               complete numbering tree due to wide influence of this change.
    */
    inline void InvalidateAndNotifyTree()
    void InvalidateAndNotifyTree()
    {
        if ( GetRoot() )
        {
@@ -462,7 +462,7 @@ protected:

        Usage: on <IsCounted()> state change the children have to be invalidated
    */
    inline void InvalidateChildren()
    void InvalidateChildren()
    {
        SetLastValid( mChildren.end() );
    }
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index ce3a645..9e54e74 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -32,14 +32,14 @@ struct SwAccessibilityOptions
        bIsStopAnimatedText(false),
        bIsStopAnimatedGraphics(false) {}

    inline bool IsAlwaysAutoColor() const       { return bIsAlwaysAutoColor; }
    inline void SetAlwaysAutoColor( bool b )    { bIsAlwaysAutoColor = b; }
    bool IsAlwaysAutoColor() const       { return bIsAlwaysAutoColor; }
    void SetAlwaysAutoColor( bool b )    { bIsAlwaysAutoColor = b; }

    inline bool IsStopAnimatedGraphics() const       { return bIsStopAnimatedText;}
    inline void SetStopAnimatedGraphics( bool b )    { bIsStopAnimatedText = b; }
    bool IsStopAnimatedGraphics() const       { return bIsStopAnimatedText;}
    void SetStopAnimatedGraphics( bool b )    { bIsStopAnimatedText = b; }

    inline bool IsStopAnimatedText() const       { return bIsStopAnimatedGraphics; }
    inline void SetStopAnimatedText( bool b )    { bIsStopAnimatedGraphics = b;}
    bool IsStopAnimatedText() const       { return bIsStopAnimatedGraphics; }
    void SetStopAnimatedText( bool b )    { bIsStopAnimatedGraphics = b;}
};
#endif

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 814b210..9d155dc 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -168,7 +168,7 @@ public:
                                        SwAccessibleContext *pParentImpl,
                                        bool bCreate = true );

    inline SwViewShell* GetShell() const
    SwViewShell* GetShell() const
    {
        return mpVSh;
    }
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 38561d7..8c0c36e 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -128,7 +128,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
        // declaration of pure virtual methods of base class <SwAnchoredObject>
        virtual void MakeObjPos() override;
        virtual void InvalidateObjPos() override;
        inline bool IsValidPos() const
        bool IsValidPos() const
        {
            return mbValidPos;
        }
@@ -172,7 +172,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
                                       const SwRect& _rRect,
                                       PrepareHint _eHint ) override;

        inline bool NotYetPositioned() const
        bool NotYetPositioned() const
        {
            return mbNotYetPositioned;
        }
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index a91b530..3b734e9 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -120,7 +120,7 @@ class SW_DLLPUBLIC SwAnchoredObject
            @author OD
        */
        friend class SwObjPositioningInProgress;
        inline void SetPositioningInProgress( const bool _bPosInProgress )
        void SetPositioningInProgress( const bool _bPosInProgress )
        {
            mbPositioningInProgress = _bPosInProgress;
        }
@@ -316,7 +316,7 @@ class SW_DLLPUBLIC SwAnchoredObject

            @author OD
        */
        inline bool IsPositioningInProgress() const
        bool IsPositioningInProgress() const
        {
            return mbPositioningInProgress;
        }
@@ -380,7 +380,7 @@ class SW_DLLPUBLIC SwAnchoredObject
        */
        const SwRect& GetObjRectWithSpaces() const;

        inline void InvalidateObjRectWithSpaces() const
        void InvalidateObjRectWithSpaces() const
        {
            mbObjRectWithSpacesValid = false;
        }
@@ -399,11 +399,11 @@ class SW_DLLPUBLIC SwAnchoredObject
        bool ConsiderForTextWrap() const;
        void SetConsiderForTextWrap( const bool _bConsiderForTextWrap );
        bool PositionLocked() const;
        inline void LockPosition()
        void LockPosition()
        {
            mbPositionLocked = true;
        }
        inline void UnlockPosition()
        void UnlockPosition()
        {
            if ( !mbKeepPositionLockedForSection )
            {
@@ -411,7 +411,7 @@ class SW_DLLPUBLIC SwAnchoredObject
            }
        }

        inline void SetKeepPosLocked( const bool _bKeepPosLocked )
        void SetKeepPosLocked( const bool _bKeepPosLocked )
        {
            mbKeepPositionLockedForSection = _bKeepPosLocked;
        }
@@ -423,7 +423,7 @@ class SW_DLLPUBLIC SwAnchoredObject
        void SetClearedEnvironment( const bool _bClearedEnvironment );

        // reset booleans for layout process
        inline void ResetLayoutProcessBools()
        void ResetLayoutProcessBools()
        {
            mbPositioningInProgress = false;
            mbConsiderForTextWrap = false;
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index fb345db..2696ef6 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -83,7 +83,7 @@ public:
    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override;

    inline void         SetDoc(SwDoc* pNewDoc)              { m_pDoc = pNewDoc; }
    void         SetDoc(SwDoc* pNewDoc)              { m_pDoc = pNewDoc; }
    SwDoc*              GetDoc(){ return m_pDoc; }
    void                RemoveField(sal_IntPtr nHandle);
    sal_IntPtr          AddField(const OUString& rFieldContents);
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 8587310..814e914 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -33,7 +33,7 @@ public:

    AuthorCharAttr();

    inline bool operator == ( const AuthorCharAttr& rAttr ) const
    bool operator == ( const AuthorCharAttr& rAttr ) const
    {
        return  nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
                nColor == rAttr.nColor;
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index d2d02a9..b8115e1 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -57,7 +57,7 @@ public:
    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = nullptr ) const override;
    virtual bool                operator==( const SfxPoolItem& ) const override;

    static inline const CommandStruct* GetCmds() { return aCmds; }
    static const CommandStruct* GetCmds() { return aCmds; }

    OUString            GetStyle(sal_uInt16 nPos) const;
    void                SetStyle(const OUString* pStyle, sal_uInt16 nPos);
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 36e0fc5e..af49f78 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -39,7 +39,7 @@ public:
    virtual bool            operator==( const SfxPoolItem& ) const override;
    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;

    inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
    SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
    {
        SetValue( rAttr.GetValue() );
        bAuto = rAttr.bAuto;
@@ -59,8 +59,8 @@ public:
    virtual bool            operator==( const SfxPoolItem& ) const override;
    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;

    inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
    inline void ChgDefinedIn( const SwModify* pNew )
    const SwModify* GetDefinedIn() const { return pDefinedIn; }
    void ChgDefinedIn( const SwModify* pNew )
                                            { pDefinedIn = const_cast<SwModify*>(pNew); }
    //  BoxAttribut -> BoxStartNode
    virtual const SwNode* GetNodeOfFormula() const override;
@@ -84,7 +84,7 @@ public:
    virtual bool            operator==( const SfxPoolItem& ) const override;
    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;

    inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
    SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
    {
        nValue = rCmp.nValue;
        return *this;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index ef2e953..554a6c3 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -816,11 +816,11 @@ public:
    // remove all invalid cursors
    void ClearUpCursors();

    inline void SetMacroExecAllowed( const bool _bMacroExecAllowed )
    void SetMacroExecAllowed( const bool _bMacroExecAllowed )
    {
        m_bMacroExecAllowed = _bMacroExecAllowed;
    }
    inline bool IsMacroExecAllowed()
    bool IsMacroExecAllowed()
    {
        return m_bMacroExecAllowed;
    }
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 83cfdf7..3bb687b 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -43,7 +43,7 @@ public:
    virtual OUString GetName() const override;
    virtual SwFieldType*  Copy() const override;

    inline void     AddRef() { nRefCnt++; }
    void     AddRef() { nRefCnt++; }
    void            ReleaseRef();

    const OUString&     GetColumnName() const {return sColumn;}
@@ -93,9 +93,9 @@ public:

    inline void         ChgBodyTextFlag( bool bIsInBody );

    inline bool         IsInitialized() const   { return bInitialized; }
    inline void         ClearInitialized()      { bInitialized = false; }
    inline void         SetInitialized()        { bInitialized = true; }
    bool         IsInitialized() const   { return bInitialized; }
    void         ClearInitialized()      { bInitialized = false; }
    void         SetInitialized()        { bInitialized = true; }

    /// Get name.
    virtual OUString    GetPar1() const override;
@@ -104,7 +104,7 @@ public:
    void                SetFieldCode(const OUString& rStr) { sFieldCode = rStr; }

    /// DBName
    inline const SwDBData&  GetDBData() const { return static_cast<SwDBFieldType*>(GetTyp())->GetDBData(); }
    const SwDBData&  GetDBData() const { return static_cast<SwDBFieldType*>(GetTyp())->GetDBData(); }
    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;

@@ -133,8 +133,8 @@ protected:

public:
    /// DBName
    inline const SwDBData&  GetRealDBData() const { return aDBData; }
    inline SwDBData&        GetRealDBData() { return aDBData; }
    const SwDBData&  GetRealDBData() const { return aDBData; }
    SwDBData&        GetRealDBData() { return aDBData; }

    SwDBData                GetDBData(SwDoc* pDoc);
    void                    SetDBData(const SwDBData& rDBData);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index e1ad5f7..e97d400 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -129,7 +129,7 @@ struct SwDSParam : public SwDBData
        nSelectionIndex(0)
        {}

    inline bool HasValidRecord() const
    bool HasValidRecord() const
        { return( !bEndOfDB && xResultSet.is() ); }
};

@@ -299,21 +299,21 @@ public:
    const SwXMailMerge *    GetMailMergeEvtSrc() const  { return pMergeEvtSrc; }
    void SetMailMergeEvtSrc( const SwXMailMerge *pSrc ) { pMergeEvtSrc = pSrc; }

    inline bool     IsMergeSilent() const           { return bMergeSilent; }
    inline void     SetMergeSilent( bool bVal )     { bMergeSilent = bVal; }
    bool     IsMergeSilent() const           { return bMergeSilent; }
    void     SetMergeSilent( bool bVal )     { bMergeSilent = bVal; }

    /// Merging of data records into fields.
    bool            Merge( const SwMergeDescriptor& rMergeDesc );
    void            MergeCancel();

    inline bool     IsMergeOk()     { return MergeStatus::OK     == m_aMergeStatus; };
    inline bool     IsMergeError()  { return MergeStatus::ERROR  <= m_aMergeStatus; };
    bool     IsMergeOk()     { return MergeStatus::OK     == m_aMergeStatus; };
    bool     IsMergeError()  { return MergeStatus::ERROR  <= m_aMergeStatus; };

    static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView* pView);

    /// Initialize data fields that lack name of database.
    inline bool     IsInitDBFields() const  { return bInitDBFields; }
    inline void     SetInitDBFields(bool b) { bInitDBFields = b;    }
    bool     IsInitDBFields() const  { return bInitDBFields; }
    void     SetInitDBFields(bool b) { bInitDBFields = b;    }

    /// Fill listbox with all table names of a database.
    bool            GetTableNames(ListBox* pListBox, const OUString& rDBName );
@@ -340,7 +340,7 @@ public:
                          const OUString& rTableName,
                          const OUString& rColNm );

    inline bool     IsInMerge() const   { return bInMerge; }
    bool     IsInMerge() const   { return bInMerge; }

    void            ExecuteFormLetter(SwWrtShell& rSh,
                        const css::uno::Sequence< css::beans::PropertyValue>& rProperties);
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 351d598..fe2a7f0 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -363,11 +363,11 @@ class SwDrawContact final : public SwContact
        const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const;
        SwFrame* GetAnchorFrame( SdrObject* _pDrawObj = nullptr );

        inline const SwPageFrame* GetPageFrame() const
        const SwPageFrame* GetPageFrame() const
        {
            return maAnchoredDrawObj.GetPageFrame();
        }
        inline SwPageFrame* GetPageFrame()
        SwPageFrame* GetPageFrame()
        {
            return maAnchoredDrawObj.GetPageFrame();
        }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 458d3bd..6b013fc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1032,7 +1032,7 @@ public:
        bool bMoveCursor = false );

    // Query / set rules for Outline.
    inline SwNumRule* GetOutlineNumRule() const
    SwNumRule* GetOutlineNumRule() const
    {
        return mpOutlineRule;
    }
@@ -1326,8 +1326,8 @@ public:
    ::sw::IShellCursorSupplier * GetIShellCursorSupplier();

    // OLE 2.0-notification.
    inline       void  SetOle2Link(const Link<bool,void>& rLink) {maOle2Link = rLink;}
    inline const Link<bool,void>& GetOle2Link() const {return maOle2Link;}
    void  SetOle2Link(const Link<bool,void>& rLink) {maOle2Link = rLink;}
    const Link<bool,void>& GetOle2Link() const {return maOle2Link;}

    // insert section (the ODF kind of section, not the nodesarray kind)
    SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 015ee47..f9aa442 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -157,9 +157,9 @@ public:
    virtual Value GetFormat(size_t idx) const override
        { return SwVectorModifyBase<Value>::operator[](idx); }

    inline size_t GetPos(const SwFormat *p) const
    size_t GetPos(const SwFormat *p) const
        { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFormat*>( p ) ) ); }
    inline bool Contains(const SwFormat *p) const {
    bool Contains(const SwFormat *p) const {
        Value p2 = dynamic_cast<Value>(const_cast<SwFormat*>(p));
        return p2 != nullptr && SwVectorModifyBase<Value>::Contains(p2);
    }
@@ -239,7 +239,7 @@ public:
        rangeFind( const value_type& x ) const;
    // So we can actually check for end()
    const_range_iterator rangeEnd() const { return m_TypeAndNameIndex.end(); }
    inline const_iterator rangeProject( const_range_iterator const& position )
    const_iterator rangeProject( const_range_iterator const& position )
        { return m_Array.project<0>( position ); }

    const value_type& operator[]( size_t index_ ) const
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index afc451f..f443db8 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -192,8 +192,8 @@ public:
    void                    StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = nullptr );

    /// returns Doc. But be careful!
    inline SwDoc*                   GetDoc() { return m_pDoc; }
    inline const SwDoc*             GetDoc() const { return m_pDoc; }
    SwDoc*                   GetDoc() { return m_pDoc; }
    const SwDoc*             GetDoc() const { return m_pDoc; }
    IDocumentDeviceAccess&          getIDocumentDeviceAccess();
    IDocumentChartDataProviderAccess& getIDocumentChartDataProviderAccess();

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index b55fb6f..d1ad7ec 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -190,7 +190,7 @@ public:
    virtual OUString    Expand() const override;
    virtual SwField*    Copy() const override;

    inline void         SetExpansion(const OUString& rStr) { aContent = rStr; }
    void         SetExpansion(const OUString& rStr) { aContent = rStr; }

    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
@@ -216,7 +216,7 @@ public:
    virtual OUString    Expand() const override;
    virtual SwField*    Copy() const override;

    inline void         SetExpansion(const OUString& rStr) { aContent = rStr; }
    void         SetExpansion(const OUString& rStr) { aContent = rStr; }

    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
@@ -254,7 +254,7 @@ public:
    OUString                Expand(sal_uInt16 nSubType, SvxNumType nFormat) const;
    virtual SwFieldType*    Copy() const override;

    inline void             SetNumFormat( SvxNumType eFormat )  { nNumberingType = eFormat; }
    void             SetNumFormat( SvxNumType eFormat )  { nNumberingType = eFormat; }
};

class SW_DLLPUBLIC SwDocStatField : public SwField
@@ -285,7 +285,7 @@ public:
    virtual SwFieldType*    Copy() const override;

    void                    SetHiddenFlag( bool bSetHidden );
    inline bool             GetHiddenFlag() const { return bHidden; }
    bool             GetHiddenFlag() const { return bHidden; }
};

class SwHiddenTextField : public SwField
@@ -322,7 +322,7 @@ public:

    void                Evaluate(SwDoc*);

    inline void         SetValue(bool bHidden)  { bIsHidden = bHidden; }
    void         SetValue(bool bHidden)  { bIsHidden = bHidden; }
    static OUString     GetColumnName(const OUString& rName);
    static OUString     GetDBName(const OUString& rName, SwDoc *pDoc);

@@ -464,9 +464,9 @@ public:
    virtual SwField*        Copy() const override;

    const DateTime&         GetDateTime() const             { return aDateTime; }
    inline const Date       GetDate() const                 { return Date(aDateTime.GetDate()); }
    inline const tools::Time GetTime() const                 { return aDateTime.GetTime(); }
    inline sal_uInt32 GetPostItId() const             { return m_nPostItId; }
    const Date       GetDate() const                 { return Date(aDateTime.GetDate()); }
    const tools::Time GetTime() const                 { return aDateTime.GetTime(); }
    sal_uInt32 GetPostItId() const             { return m_nPostItId; }

    /// Author
    virtual OUString        GetPar1() const override;
@@ -519,7 +519,7 @@ public:
    virtual OUString        GetFieldName() const override;
    const OUString&         GetName() const { return aName; }
    void                    SetName( const OUString& rName ) { aName = rName; }
    inline void             SetExpansion(const OUString& rStr) { aContent = rStr; }
    void             SetExpansion(const OUString& rStr) { aContent = rStr; }
    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
@@ -548,7 +548,7 @@ public:
    virtual sal_uInt16      GetSubType() const override;
    virtual void        SetSubType(sal_uInt16 nSub) override;

    inline void         SetExpansion(const OUString& rStr) { aContent = rStr; }
    void         SetExpansion(const OUString& rStr) { aContent = rStr; }

    virtual bool        QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
    virtual bool        PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index 53ba14d..2dabd51 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -54,9 +54,9 @@ public:
    sal_uLong GetDocPos() const { return nDocPos; }

    /// For sorting.
    inline bool operator==( const SwGlblDocContent& rCmp ) const
    bool operator==( const SwGlblDocContent& rCmp ) const
        {   return GetDocPos() == rCmp.GetDocPos(); }
    inline bool operator<( const SwGlblDocContent& rCmp ) const
    bool operator<( const SwGlblDocContent& rCmp ) const
        {   return GetDocPos() < rCmp.GetDocPos(); }
};

diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index fb970db..51cf4f6 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -241,8 +241,8 @@ public:
    inline bool                 IsSequenceField() const;

    /// Logical number, sequence fields.
    inline void                 SetSeqNumber( sal_uInt16 n )    { nSeqNo = n; }
    inline sal_uInt16           GetSeqNumber() const        { return nSeqNo; }
    void                 SetSeqNumber( sal_uInt16 n )    { nSeqNo = n; }
    sal_uInt16           GetSeqNumber() const        { return nSeqNo; }

    /// Query name only.
    virtual OUString       GetPar1()   const override;
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 35988c4..ed52054 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -394,17 +394,17 @@ protected:
    SwValueFieldType( const SwValueFieldType& rTyp );

public:
    inline SwDoc*   GetDoc() const                      {
    SwDoc*   GetDoc() const                      {
        return m_pDoc;
    }
    inline void     SetDoc(SwDoc* pNewDoc)              {
    void     SetDoc(SwDoc* pNewDoc)              {
        m_pDoc = pNewDoc;
    }

    inline bool     UseFormat() const                   {
    bool     UseFormat() const                   {
        return m_bUseFormat;
    }
    inline void     EnableFormat(bool bFormat = true)   {
    void     EnableFormat(bool bFormat = true)   {
        m_bUseFormat = bFormat;
    }

@@ -428,14 +428,14 @@ public:
    virtual SwFieldType*    ChgTyp( SwFieldType* ) override;
    virtual void            SetLanguage(sal_uInt16 nLng) override;

    inline SwDoc*           GetDoc() const          {
    SwDoc*           GetDoc() const          {
        return static_cast<const SwValueFieldType*>(GetTyp())->GetDoc();
    }

    virtual double          GetValue() const;
    virtual void            SetValue( const double& rVal );

    inline OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng) const {
    OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng) const {
        return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng);
    }

diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 0fd9460..825f08b 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -60,8 +60,8 @@ public:
        virtual void            SetPar2(const OUString& rStr) override;
        virtual OUString        GetPar2() const override;

        inline void             SetOffset(long nMinutes)    { nOffset = nMinutes; }
        inline long             GetOffset() const           { return nOffset; }
        void             SetOffset(long nMinutes)    { nOffset = nMinutes; }
        long             GetOffset() const           { return nOffset; }

        Date                    GetDate() const;
        tools::Time             GetTime() const;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 1f707cd..951084b 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -105,7 +105,7 @@ public:
    // to which the Paragraph Style is assigned.
    int  GetAssignedOutlineStyleLevel() const;

    inline bool IsAssignedToListLevelOfOutlineStyle() const
    bool IsAssignedToListLevelOfOutlineStyle() const
    {
        return mbAssignedToOutlineStyle;
    }
@@ -124,7 +124,7 @@ public:
    /// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style.
    virtual sal_uInt16 ResetAllFormatAttr() override;

    inline bool StayAssignedToListLevelOfOutlineStyle() const
    bool StayAssignedToListLevelOfOutlineStyle() const
    {
        return mbStayAssignedToListLevelOfOutlineStyle;
    }
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 6448028..5787351 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -42,9 +42,9 @@ public:
    virtual bool            operator==( const SfxPoolItem& ) const override;
    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;

    inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
    SwFrameFormat *GetFrameFormat() const { return pFormat; }
    /// For Undo: delete the FlyFrameFormat "logically"; it is kept in Undo-object.
    inline void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { pFormat = pNew; }
    void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { pFormat = pNew; }

    const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
};
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index c2bc8cf..2e928ea 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -65,7 +65,7 @@ public:
                                  OUString &rText,
                                  const IntlWrapper* pIntl = nullptr ) const override;

    inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
    bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }

    SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );

diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 8386c5a..98bb1bdf 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -70,7 +70,7 @@ public:
    void    SetNumOffset( const ::boost::optional<sal_uInt16>& oNum ) { oNumOffset = oNum; }

    /// Query / set where attribute is anchored.
    inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
    const SwModify* GetDefinedIn() const { return pDefinedIn; }
    void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = const_cast<SwModify*>(pNew); }
    void RegisterToPageDesc( SwPageDesc& );
    bool KnowsPageDesc() const;
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 33bcc23..eb0d2cc 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -62,8 +62,8 @@ public:

    const SwTextRefMark *GetTextRefMark() const   { return pTextAttr; }

    inline       OUString &GetRefName()       { return aRefName; }
    inline const OUString &GetRefName() const { return aRefName; }
    OUString &GetRefName()       { return aRefName; }
    const OUString &GetRefName() const { return aRefName; }

    css::uno::WeakReference<css::text::XTextContent> const& GetXRefMark() const
        { return m_wXReferenceMark; }
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index a30af53a..a3a1661 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -105,15 +105,15 @@ public:
        @return count of deleted hints. */
    virtual sal_uInt16 ResetAllFormatAttr();

    inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
    inline bool IsDefault() const { return DerivedFrom() == nullptr; }
    SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
    bool IsDefault() const { return DerivedFrom() == nullptr; }

    const OUString& GetName() const                  { return m_aFormatName; }
    inline bool HasName(const OUString &rName) const { return m_aFormatName == rName; }
    bool HasName(const OUString &rName) const { return m_aFormatName == rName; }
    virtual void SetName( const OUString& rNewName, bool bBroadcast=false );

    /// For querying the attribute array.
    inline const SwAttrSet& GetAttrSet() const { return m_aSet; }
    const SwAttrSet& GetAttrSet() const { return m_aSet; }

    /** Das Doc wird jetzt am SwAttrPool gesetzt. Dadurch hat man es immer
       im Zugriff. */
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index b55ca5d..19a509d 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -402,8 +402,8 @@ public:
    virtual sal_Int16 GetPositionLayoutDir() const override;
    virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) override;

    inline bool IsPosAttrSet() const { return mbPosAttrSet; }
    inline void PosAttrSet() { mbPosAttrSet = true; }
    bool IsPosAttrSet() const { return mbPosAttrSet; }
    void PosAttrSet() { mbPosAttrSet = true; }

    virtual OUString GetDescription() const override;

diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 9c9b625..43d8c97 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -68,15 +68,15 @@ public:
    virtual bool             PutValue( const css::uno::Any& rVal,
                                        sal_uInt8 nMemberId ) override;

    inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
    SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
        {
            SfxEnumItem::SetValue( rMirrorGrf.GetValue() );
            bGrfToggle = rMirrorGrf.IsGrfToggle();
            return *this;
        }

    inline bool IsGrfToggle() const         { return bGrfToggle; }
    inline void SetGrfToggle( bool bNew )   { bGrfToggle = bNew; }
    bool IsGrfToggle() const         { return bGrfToggle; }
    void SetGrfToggle( bool bNew )   { bGrfToggle = bNew; }
};

class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
@@ -201,7 +201,7 @@ public:
        : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( rVal )
    {}

    inline SwGammaGrf& operator=( const SwGammaGrf& rCopy )
    SwGammaGrf& operator=( const SwGammaGrf& rCopy )
    {
        nValue = rCopy.nValue;
        return *this;
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 531e17c..85b2148 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -53,7 +53,7 @@ public:

    virtual SwContentFrame *MakeFrame( SwFrame* ) override;

    inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
    SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }

    virtual Size GetTwipSize() const = 0;

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 6bbaf2e..384782b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -139,9 +139,9 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable

    /// Optimization: Asking for information about hidden characters at SwScriptInfo
    /// updates these flags.
    inline bool IsCalcHiddenCharFlags() const
    bool IsCalcHiddenCharFlags() const
        { return m_bRecalcHiddenCharFlags; }
    inline void SetHiddenCharAttribute( bool bNewHiddenCharsHidePara, bool bNewContainsHiddenChars ) const
    void SetHiddenCharAttribute( bool bNewHiddenCharsHidePara, bool bNewContainsHiddenChars ) const
    {
        m_bHiddenCharsHidePara = bNewHiddenCharsHidePara;
        m_bContainsHiddenChars = bNewContainsHiddenChars;
@@ -215,9 +215,9 @@ public:
    /// getters for SwpHints
    inline       SwpHints &GetSwpHints();
    inline const SwpHints &GetSwpHints() const;
    inline       SwpHints *GetpSwpHints()       { return m_pSwpHints; }
    inline const SwpHints *GetpSwpHints() const { return m_pSwpHints; }
    inline       bool   HasHints() const { return m_pSwpHints != nullptr; }
    SwpHints *GetpSwpHints()       { return m_pSwpHints; }
    const SwpHints *GetpSwpHints() const { return m_pSwpHints; }
    bool   HasHints() const { return m_pSwpHints != nullptr; }
    inline       SwpHints &GetOrCreateSwpHints();

    virtual ~SwTextNode() override;
@@ -421,7 +421,7 @@ public:
     */
    SwNumRule *GetNumRule(bool bInParent = true) const;

    inline const SwNodeNum* GetNum() const
    const SwNodeNum* GetNum() const
    {
        return mpNodeNum;
    }
@@ -695,26 +695,26 @@ public:
    bool GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const;

    /// Hidden Paragraph Field:
    inline bool CalcHiddenParaField()
    bool CalcHiddenParaField()
        { return m_pSwpHints && m_pSwpHints->CalcHiddenParaField(); }
    /// set CalcVisible flags
    inline void SetCalcHiddenParaField()
    void SetCalcHiddenParaField()
        { if (m_pSwpHints) m_pSwpHints->SetCalcHiddenParaField(); }

    /// is the paragraph visible?
    inline bool HasHiddenParaField() const
    bool HasHiddenParaField() const
        { return m_pSwpHints && m_pSwpHints->HasHiddenParaField(); }

    /// Hidden Paragraph Field:

    inline bool HasHiddenCharAttribute( bool bWholePara ) const
    bool HasHiddenCharAttribute( bool bWholePara ) const
    {
        if ( m_bRecalcHiddenCharFlags )
            CalcHiddenCharFlags();
        return bWholePara ? m_bHiddenCharsHidePara : m_bContainsHiddenChars;
    }

    inline void SetCalcHiddenCharFlags() const
    void SetCalcHiddenCharFlags() const
        { m_bRecalcHiddenCharFlags = true; }

    /** @return if the node is hidden due to
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index f0ab99f..04d883b 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -119,20 +119,20 @@ public:
    sal_uInt16 GetSectionLevel() const;

    inline sal_uLong StartOfSectionIndex() const;
    inline const SwStartNode* StartOfSectionNode() const { return m_pStartOfSection; }
    inline       SwStartNode* StartOfSectionNode() { return m_pStartOfSection; }
    const SwStartNode* StartOfSectionNode() const { return m_pStartOfSection; }
    SwStartNode* StartOfSectionNode() { return m_pStartOfSection; }

    inline sal_uLong EndOfSectionIndex() const;
    inline const SwEndNode* EndOfSectionNode() const;
    inline         SwEndNode* EndOfSectionNode();

    inline sal_uInt8 GetAutoFormatLvl() const     { return m_nAFormatNumLvl; }
    inline void SetAutoFormatLvl( sal_uInt8 nVal )      { m_nAFormatNumLvl = nVal; }
    sal_uInt8 GetAutoFormatLvl() const     { return m_nAFormatNumLvl; }
    void SetAutoFormatLvl( sal_uInt8 nVal )      { m_nAFormatNumLvl = nVal; }

    inline void SetNumLSpace( bool bFlag )        { m_bSetNumLSpace = bFlag; }
    void SetNumLSpace( bool bFlag )        { m_bSetNumLSpace = bFlag; }

    inline bool IsIgnoreDontExpand() const  { return m_bIgnoreDontExpand; }
    inline void SetIgnoreDontExpand( bool bNew )  { m_bIgnoreDontExpand = bNew; }
    bool IsIgnoreDontExpand() const  { return m_bIgnoreDontExpand; }
    void SetIgnoreDontExpand( bool bNew )  { m_bIgnoreDontExpand = bNew; }

    SwNodeType   GetNodeType() const { return m_nNodeType; }

@@ -275,7 +275,7 @@ public:
    /// If node is in a table return the respective table box.
    SwTableBox* GetTableBox() const;

    inline sal_uLong GetIndex() const { return GetPos(); }
    sal_uLong GetIndex() const { return GetPos(); }

    const SwTextNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;

@@ -448,8 +448,8 @@ public:
    /** Does node has already its own auto-attributes?
     Access to SwAttrSet. */
    inline const SwAttrSet &GetSwAttrSet() const;
    inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); }
    inline bool  HasSwAttrSet() const { return mpAttrSet != nullptr; }
    const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); }
    bool  HasSwAttrSet() const { return mpAttrSet != nullptr; }

    virtual SwFormatColl* ChgFormatColl( SwFormatColl* );
    SwFormatColl* GetFormatColl() const { return const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); }
@@ -472,8 +472,8 @@ public:
    short GetTextDirection( const SwPosition& rPos,
                            const Point* pPt ) const;

    inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
    inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
    void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
    bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }

    static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize );

diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 5ca5dd8..5975916 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -188,7 +188,7 @@ public:
    void AddParagraphStyle( SwTextFormatColl& rTextFormatColl );
    void RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl );

    inline void SetDefaultListId( const OUString& sDefaultListId )
    void SetDefaultListId( const OUString& sDefaultListId )
    {
        msDefaultListId = sDefaultListId;
    }
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index 46ca66d..8185e8f 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -242,7 +242,7 @@ public:

        @author
    */
    inline ~SwPagePreviewLayout()
    ~SwPagePreviewLayout()
    {
        ClearPreviewPageData();
    }
@@ -333,7 +333,7 @@ public:

        @author OD
    */
    inline sal_uInt16 SelectedPage()
    sal_uInt16 SelectedPage()
    {
        return mnSelectedPageNum;
    }
@@ -342,7 +342,7 @@ public:

        @author OD
    */
    inline void SetSelectedPage( sal_uInt16 _nSelectedPageNum )
    void SetSelectedPage( sal_uInt16 _nSelectedPageNum )
    {
        mnSelectedPageNum = _nSelectedPageNum;
    }
@@ -465,17 +465,17 @@ public:
                                   bool&        _obPosInEmptyPage,
                                   sal_uInt16&  _onPageNum ) const;

    inline bool DoesPreviewLayoutRowsFitIntoWindow() const
    bool DoesPreviewLayoutRowsFitIntoWindow() const
    {
        return mbDoesLayoutRowsFitIntoWindow;
    }

    inline bool DoesPreviewLayoutColsFitIntoWindow() const
    bool DoesPreviewLayoutColsFitIntoWindow() const
    {
        return mbDoesLayoutColsFitIntoWindow;
    }

    inline bool PreviewLayoutValid() const
    bool PreviewLayoutValid() const
    {
        return mbLayoutInfoValid && mbLayoutSizesValid && mbPaintInfoValid;
    }
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index ca69c7a..2fe0e6a 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -204,8 +204,8 @@ public:
                   SwMoveFnCollection const & fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd,
                   sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam);

    inline bool IsInFrontOfLabel() const        { return m_bIsInFrontOfLabel; }
    inline void SetInFrontOfLabel_( bool bNew ) { m_bIsInFrontOfLabel = bNew; }
    bool IsInFrontOfLabel() const        { return m_bIsInFrontOfLabel; }
    void SetInFrontOfLabel_( bool bNew ) { m_bIsInFrontOfLabel = bNew; }

    /// Unless this is called, the getter method of Mark will return Point.
    virtual void SetMark();
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 2dff35a..6bc9f69 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -85,27 +85,27 @@ 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 sal_uInt8 GetLines() const { return nLines; }
    inline sal_uInt8 &GetLines() { return nLines; }
    sal_uInt8 GetLines() const { return nLines; }
    sal_uInt8 &GetLines() { return nLines; }

    inline sal_uInt8 GetChars() const { return nChars; }
    inline sal_uInt8 &GetChars() { return nChars; }
    sal_uInt8 GetChars() const { return nChars; }
    sal_uInt8 &GetChars() { return nChars; }

    inline bool GetWholeWord() const { return bWholeWord; }
    inline bool &GetWholeWord() { return bWholeWord; }
    bool GetWholeWord() const { return bWholeWord; }
    bool &GetWholeWord() { return bWholeWord; }

    inline sal_uInt16 GetDistance() const { return nDistance; }
    inline sal_uInt16 &GetDistance() { return nDistance; }
    sal_uInt16 GetDistance() const { return nDistance; }
    sal_uInt16 &GetDistance() { return nDistance; }

    inline const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); }
    inline SwCharFormat *GetCharFormat()       { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
    const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); }
    SwCharFormat *GetCharFormat()       { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
    void SetCharFormat( SwCharFormat *pNew );
    /// Get information from Client.
    virtual bool GetInfo( SfxPoolItem& ) const override;

    /// Get and set Modify pointer.
    inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
    inline void ChgDefinedIn( const SwModify* pNew )
    const SwModify* GetDefinedIn() const { return pDefinedIn; }
    void ChgDefinedIn( const SwModify* pNew )
    { pDefinedIn = const_cast<SwModify*>(pNew); }
};

diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index fbe0ccc0..dbdedc4 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -142,7 +142,7 @@ public:
    sal_uInt16 GetAuthor() const                { return nAuthor; }
    const OUString& GetComment() const        { return sComment; }
    const DateTime& GetTimeStamp() const    { return aStamp; }
    inline const SwRedlineData* Next() const{ return pNext; }
    const SwRedlineData* Next() const{ return pNext; }

    void SetComment( const OUString& rS )     { sComment = rS; }
    void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 047814d..b124bba 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -135,8 +135,8 @@ public:
    virtual ~SwModule() override;

    // Set view for internal use only. It is public only for technical reasons.
    inline  void        SetView(SwView* pVw) { m_pView = pVw; }
    inline  SwView*     GetView() { return m_pView; }
    void        SetView(SwView* pVw) { m_pView = pVw; }
    SwView*     GetView() { return m_pView; }

    // Handler for slots.
    void                StateOther(SfxItemSet &);
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index f241da5..7ba3ffd 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -44,8 +44,8 @@ public:
    // Combine adjacent rectangles.
    void Compress();

    inline const SwRect &GetOrigin() const { return m_aOrigin; }
    inline void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
    const SwRect &GetOrigin() const { return m_aOrigin; }
    void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
};

#endif // INCLUDED_SW_INC_SWREGION_HXX
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 0a01e00..5415c99 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -106,7 +106,7 @@ public:

    inline const SfxPoolItem& GetAttr() const;
    inline       SfxPoolItem& GetAttr();
    inline sal_uInt16 Which() const { return GetAttr().Which(); }
    sal_uInt16 Which() const { return GetAttr().Which(); }

    bool operator==( const SwTextAttr& ) const;

diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 7bd3bad..8d805f5 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -39,7 +39,7 @@ public:
    SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart );
    virtual ~SwTextFootnote() override;

    inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
    SwNodeIndex *GetStartNode() const { return m_pStartNode; }
    void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true );
    void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr );
    void CopyFootnote(SwTextFootnote & rDest, SwTextNode & rDestNode) const;
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 77c0434..931dd10 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -40,7 +40,7 @@ public:
    void CopyTOXMark( SwDoc* pDestDoc );

    // get and set TextNode pointer
    inline const SwTextNode* GetpTextNd() const { return m_pTextNode; }
    const SwTextNode* GetpTextNd() const { return m_pTextNode; }
    inline const SwTextNode& GetTextNode() const;
    void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
};
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 71ee3e9..bf9f541 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -400,11 +400,11 @@ public:
    // immediately switch shell -> for GetSelectionObject
    void                    StopShellTimer();

    inline SwWrtShell&      GetWrtShell   () const { return *m_pWrtShell; }
    inline SwWrtShell*      GetWrtShellPtr() const { return  m_pWrtShell; }
    SwWrtShell&      GetWrtShell   () const { return *m_pWrtShell; }
    SwWrtShell*      GetWrtShellPtr() const { return  m_pWrtShell; }

    inline       SwEditWin &GetEditWin()        { return *m_pEditWin; }
    inline const SwEditWin &GetEditWin () const { return *m_pEditWin; }
    SwEditWin &GetEditWin()        { return *m_pEditWin; }
    const SwEditWin &GetEditWin () const { return *m_pEditWin; }

#if defined(_WIN32) || defined UNX
    void ScannerEventHdl( const css::lang::EventObject& rEventObject );
@@ -413,7 +413,7 @@ public:
    // hand the handler for text blocks to the shell; create if applicable
    SwGlossaryHdl*          GetGlosHdl();

    inline const Rectangle& GetVisArea() const { return m_aVisArea; }
    const Rectangle& GetVisArea() const { return m_aVisArea; }

    bool            IsScroll(const Rectangle& rRect) const;
    void            Scroll( const Rectangle& rRect,
@@ -512,14 +512,14 @@ public:

    // functions for drawing
    void            SetDrawFuncPtr(SwDrawBase* pFuncPtr);
    inline SwDrawBase* GetDrawFuncPtr() const  { return m_pDrawActual; }
    SwDrawBase* GetDrawFuncPtr() const  { return m_pDrawActual; }
    void            GetDrawState(SfxItemSet &rSet);
    void            ExitDraw();
    inline bool     IsDrawRotate()      { return m_bDrawRotate; }
    inline void     FlipDrawRotate()    { m_bDrawRotate = !m_bDrawRotate; }
    inline bool     IsDrawSelMode()     { return m_bDrawSelMode; }
    bool     IsDrawRotate()      { return m_bDrawRotate; }
    void     FlipDrawRotate()    { m_bDrawRotate = !m_bDrawRotate; }
    bool     IsDrawSelMode()     { return m_bDrawSelMode; }
    void            SetSelDrawSlot();
    inline void     FlipDrawSelMode()   { m_bDrawSelMode = !m_bDrawSelMode; }
    void     FlipDrawSelMode()   { m_bDrawSelMode = !m_bDrawSelMode; }
    void            NoRotate();     // turn off rotate mode
    bool            EnterDrawTextMode(const Point& aDocPos);
    /// Same as EnterDrawTextMode(), but takes an SdrObject instead of guessing it by document position.
@@ -562,8 +562,8 @@ public:
                 SfxShell       *GetCurShell()  { return m_pShell; }
                 SwDocShell     *GetDocShell();
    inline const SwDocShell     *GetDocShell() const;
    inline virtual       FmFormShell    *GetFormShell()       override { return m_pFormShell; }
    inline virtual const FmFormShell    *GetFormShell() const override { return m_pFormShell; }
    virtual       FmFormShell    *GetFormShell()       override { return m_pFormShell; }
    virtual const FmFormShell    *GetFormShell() const override { return m_pFormShell; }

    // so that in the SubShells' DTors m_pShell can be reset if applicable
    void ResetSubShell()    { m_pShell = nullptr; }
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 556e134..b44dd1d 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -197,184 +197,184 @@ public:

    static void Init( vcl::Window *pWin );        // Initializing of static data.

    inline ViewOptFlags1   GetCoreOptions() const {return m_nCoreOptions;}
    ViewOptFlags1   GetCoreOptions() const {return m_nCoreOptions;}
    inline void     SetUIOptions( const SwViewOption& );

    // Options from nCoreOptions
    inline bool IsIdle() const
    bool IsIdle() const
        { return m_bIdle; }

    // Logically this is a const function since it does not modify the viewoptions
    // but only effects idle formatting. Of course that member is already implement
    // in the wrong place here... Also currently there are many const modifying casts in the code
    // just to call this function on otherwise const objects. Thus declaring it as const now.
    inline void SetIdle( bool b ) const
    void SetIdle( bool b ) const
        { m_bIdle = b; }

    inline bool IsTab(bool bHard = false) const
    bool IsTab(bool bHard = false) const
                    {   return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Tab) &&
                            ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }
    inline void SetTab( bool b )        {
    void SetTab( bool b )        {
        b ? (m_nCoreOptions |= ViewOptFlags1::Tab ) : ( m_nCoreOptions &= ~ViewOptFlags1::Tab); }

    inline bool IsBlank(bool bHard = false) const
    bool IsBlank(bool bHard = false) const
                    { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Blank) &&
                            ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }
    inline void SetBlank( bool b )
    void SetBlank( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Blank ) : ( m_nCoreOptions &= ~ViewOptFlags1::Blank); }

    inline bool IsHardBlank() const
    bool IsHardBlank() const
                    { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::HardBlank); }
    inline void SetHardBlank( bool b )
    void SetHardBlank( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::HardBlank ) : ( m_nCoreOptions &= ~ViewOptFlags1::HardBlank); }

    inline bool IsParagraph(bool bHard = false) const
    bool IsParagraph(bool bHard = false) const
                    {   return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Paragraph) &&
                            ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }
    inline void SetParagraph( bool b )
    void SetParagraph( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Paragraph ) : ( m_nCoreOptions &= ~ViewOptFlags1::Paragraph); }

    inline bool IsLineBreak(bool bHard = false) const
    bool IsLineBreak(bool bHard = false) const
                    {   return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Linebreak) &&
                            ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }
    inline void SetLineBreak( bool b )
    void SetLineBreak( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Linebreak ) : ( m_nCoreOptions &= ~ViewOptFlags1::Linebreak); }

    inline void SetPageBreak( bool b )
    void SetPageBreak( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Pagebreak ) : ( m_nCoreOptions &= ~ViewOptFlags1::Pagebreak); }

    inline void SetColumnBreak( bool b)
    void SetColumnBreak( bool b)
        { b ? (m_nCoreOptions |= ViewOptFlags1::Columnbreak ) : ( m_nCoreOptions &= ~ViewOptFlags1::Columnbreak); }

    inline bool IsSoftHyph() const
    bool IsSoftHyph() const
                    { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::SoftHyph); }
    inline void SetSoftHyph( bool b )
    void SetSoftHyph( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::SoftHyph ) : ( m_nCoreOptions &= ~ViewOptFlags1::SoftHyph); }

    inline bool IsFieldName() const       { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::FieldName); }
    inline void SetFieldName( bool b )
    bool IsFieldName() const       { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::FieldName); }
    void SetFieldName( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::FieldName ) : ( m_nCoreOptions &= ~ViewOptFlags1::FieldName); }

    inline bool IsPostIts() const
    bool IsPostIts() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Postits); }
    inline void SetPostIts( bool b )
    void SetPostIts( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Postits ) : ( m_nCoreOptions &= ~ViewOptFlags1::Postits); }
    static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect,
                              bool bIsScript );
    static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut );

    inline bool IsShowHiddenChar(bool bHard = false) const
    bool IsShowHiddenChar(bool bHard = false) const
        { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::CharHidden) &&
                            ((m_nCoreOptions & ViewOptFlags1::ViewMetachars)||bHard); }

    inline void SetShowHiddenChar( bool b )
    void SetShowHiddenChar( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::CharHidden ) : ( m_nCoreOptions &= ~ViewOptFlags1::CharHidden); }

    inline bool IsShowHiddenField() const
    bool IsShowHiddenField() const
        { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::FieldHidden); }
    inline void SetShowHiddenField( bool b )
    void SetShowHiddenField( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::FieldHidden ) : ( m_nCoreOptions &= ~ViewOptFlags1::FieldHidden); }

    inline bool IsGraphic() const
    bool IsGraphic() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Graphic); }
    inline void SetGraphic( bool b )
    void SetGraphic( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Graphic ) : ( m_nCoreOptions &= ~ViewOptFlags1::Graphic); }

    inline bool IsPageBack() const
    bool IsPageBack() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Pageback); }
    inline void SetPageBack( bool b )
    void SetPageBack( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Pageback) : ( m_nCoreOptions &= ~ViewOptFlags1::Pageback); }

    inline bool IsTable() const
    bool IsTable() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Table); }
    inline void SetTable( bool b )
    void SetTable( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Table ) : ( m_nCoreOptions &= ~ViewOptFlags1::Table); }

    inline bool IsDraw() const
    bool IsDraw() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Draw); }
    inline void SetDraw( bool b )
    void SetDraw( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Draw ) : ( m_nCoreOptions &= ~ViewOptFlags1::Draw); }

    inline bool IsControl() const
    bool IsControl() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Control); }
    inline void SetControl( bool b )
    void SetControl( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Control ) : ( m_nCoreOptions &= ~ViewOptFlags1::Control); }

    inline bool IsSnap() const
    bool IsSnap() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Snap); }
    inline void SetSnap( bool b )
    void SetSnap( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Snap ) : ( m_nCoreOptions &= ~ViewOptFlags1::Snap); }

    inline void SetSnapSize( Size &rSz ){ m_aSnapSize = rSz; }
    inline const Size &GetSnapSize() const { return m_aSnapSize; }
    void SetSnapSize( Size &rSz ){ m_aSnapSize = rSz; }
    const Size &GetSnapSize() const { return m_aSnapSize; }

    inline bool IsGridVisible() const
    bool IsGridVisible() const
        { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::GridVisible); }
    inline void SetGridVisible( bool b )
    void SetGridVisible( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::GridVisible ) : ( m_nCoreOptions &= ~ViewOptFlags1::GridVisible); }

    inline bool IsOnlineSpell() const
    bool IsOnlineSpell() const
        { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::OnlineSpell); }
    void SetOnlineSpell( bool b );

    inline bool IsViewMetaChars() const
    bool IsViewMetaChars() const
        { return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::ViewMetachars); }
    inline void SetViewMetaChars( bool b)
    void SetViewMetaChars( bool b)
        { b ? (m_nCoreOptions |= ViewOptFlags1::ViewMetachars ) : ( m_nCoreOptions &= ~ViewOptFlags1::ViewMetachars); }

    inline bool IsSynchronize() const
    bool IsSynchronize() const
        {  return bool(m_nCoreOptions & ViewOptFlags1::Synchronize); }
    inline void SetSynchronize( bool b )
    void SetSynchronize( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Synchronize ) : ( m_nCoreOptions &= ~ViewOptFlags1::Synchronize); }

    inline bool IsCrossHair() const
    bool IsCrossHair() const
        { return bool(m_nCoreOptions & ViewOptFlags1::Crosshair); }
    inline void SetCrossHair( bool b )
    void SetCrossHair( bool b )
        { b ? (m_nCoreOptions |= ViewOptFlags1::Crosshair ) : ( m_nCoreOptions &= ~ViewOptFlags1::Crosshair); }

    // Options from nCore2Options
    inline bool IsBlackFont() const
    bool IsBlackFont() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::BlackFont); }

    inline void SetBlackFont(bool b)
    void SetBlackFont(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::BlackFont) : (m_nCore2Options &= ~ViewOptCoreFlags2::BlackFont);}

    inline bool IsShowHiddenPara() const
    bool IsShowHiddenPara() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::HiddenPara); }

    inline void SetShowHiddenPara(bool b)
    void SetShowHiddenPara(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::HiddenPara) : (m_nCore2Options &= ~ViewOptCoreFlags2::HiddenPara);}

    inline bool IsSmoothScroll() const
    bool IsSmoothScroll() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::SmoothScroll); }

    inline void SetSmoothScroll(bool b)
    void SetSmoothScroll(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::SmoothScroll) : (m_nCore2Options &= ~ViewOptCoreFlags2::SmoothScroll);}

    inline bool IsCursorInProtectedArea() const
    bool IsCursorInProtectedArea() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::CursorInProt); }

    inline void SetCursorInProtectedArea(bool b)
    void SetCursorInProtectedArea(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::CursorInProt) : (m_nCore2Options &= ~ViewOptCoreFlags2::CursorInProt);}

    static bool IsIgnoreProtectedArea();

    inline bool IsPDFExport() const
    bool IsPDFExport() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::PdfExport); }

    inline void SetPDFExport(bool b)
    void SetPDFExport(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::PdfExport) : (m_nCore2Options &= ~ViewOptCoreFlags2::PdfExport);}

    inline bool IsPrinting() const
    bool IsPrinting() const
        {return bool(m_nCore2Options & ViewOptCoreFlags2::Printing); }

    inline void SetPrinting(bool b)
    void SetPrinting(bool b)
        { b ? (m_nCore2Options |= ViewOptCoreFlags2::Printing) : (m_nCore2Options &= ~ViewOptCoreFlags2::Printing);}

    inline short GetDivisionX() const   { return m_nDivisionX; }
    inline void  SetDivisionX( short n ){ m_nDivisionX = n; }
    inline short GetDivisionY() const   { return m_nDivisionY; }
    inline void  SetDivisionY( short n ){ m_nDivisionY = n; }
    short GetDivisionX() const   { return m_nDivisionX; }
    void  SetDivisionX( short n ){ m_nDivisionX = n; }
    short GetDivisionY() const   { return m_nDivisionY; }
    void  SetDivisionY( short n ){ m_nDivisionY = n; }

    // Default margin left and above document: 284 twips == 5.0 mm.
    static constexpr sal_uInt16 GetDefDocumentBorder() { return 284; }
@@ -383,13 +383,13 @@ public:
    // Minimum edge-to-text distance: 22 twips == 0.4 mm.
    static constexpr sal_uInt16 GetMinGapBetweenPages() { return 22; }

    inline sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); }
    inline sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); }
    sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); }
    sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); }

    inline sal_uInt8  GetPagePrevRow() const      { return m_nPagePreviewRow; }
    inline void  SetPagePrevRow( sal_uInt8 n ) { m_nPagePreviewRow = n; }
    inline sal_uInt8  GetPagePrevCol() const      { return m_nPagePreviewCol; }
    inline void  SetPagePrevCol( sal_uInt8 n ) { m_nPagePreviewCol = n; }
    sal_uInt8  GetPagePrevRow() const      { return m_nPagePreviewRow; }
    void  SetPagePrevRow( sal_uInt8 n ) { m_nPagePreviewRow = n; }
    sal_uInt8  GetPagePrevCol() const      { return m_nPagePreviewCol; }
    void  SetPagePrevCol( sal_uInt8 n ) { m_nPagePreviewCol = n; }
    bool         IsReadonly() const { return m_bReadonly; }
    void         SetReadonly(bool bSet) { m_bReadonly = bSet; }

@@ -399,10 +399,10 @@ public:
    bool         IsFormView() const { return mbFormView; }
    void         SetFormView( bool bSet ) { mbFormView = bSet; }

    inline bool  getBrowseMode() const { return mbBrowseMode; }
    inline void  setBrowseMode(bool bSet) { mbBrowseMode = bSet; }
    inline bool  IsPagePrevBookview() const { return mbBookView; }
    inline void  SetPagePrevBookview(bool bSet) { mbBookView = bSet; }
    bool  getBrowseMode() const { return mbBrowseMode; }
    void  setBrowseMode(bool bSet) { mbBrowseMode = bSet; }
    bool  IsPagePrevBookview() const { return mbBookView; }
    void  SetPagePrevBookview(bool bSet) { mbBookView = bSet; }

    static bool IsAutoCompleteWords();

@@ -421,19 +421,19 @@ public:

#ifdef DBG_UTIL
    // Correspond to statements in ui/config/cfgvw.src.
    inline bool IsTest1() const     { return m_bTest1; }
    inline bool IsTest2() const     { return m_bTest2; }
    inline bool IsTest3() const     { return m_bTest3; }
    inline bool IsTest4() const     { return m_bTest4; }
    inline bool IsTest5() const     { return m_bTest5; }
    inline bool IsTest6() const     { return m_bTest6; }
    inline bool IsTest7() const     { return m_bTest7; }
    inline bool IsTest8() const     { return m_bTest8; }
    inline bool IsTest10() const    { return m_bTest10; }
    bool IsTest1() const     { return m_bTest1; }
    bool IsTest2() const     { return m_bTest2; }
    bool IsTest3() const     { return m_bTest3; }
    bool IsTest4() const     { return m_bTest4; }
    bool IsTest5() const     { return m_bTest5; }
    bool IsTest6() const     { return m_bTest6; }
    bool IsTest7() const     { return m_bTest7; }
    bool IsTest8() const     { return m_bTest8; }
    bool IsTest10() const    { return m_bTest10; }
#endif

    inline sal_uInt16 GetZoom() const    { return m_nZoom; }
    inline void   SetZoom( sal_uInt16 n ){ m_nZoom = n; }
    sal_uInt16 GetZoom() const    { return m_nZoom; }
    void   SetZoom( sal_uInt16 n ){ m_nZoom = n; }

    static void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol );
    static void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect );
@@ -443,7 +443,7 @@ public:
    // Compare methods.
    bool IsEqualFlags ( const SwViewOption &rOpt ) const;
    inline bool operator == ( const SwViewOption &rOpt ) const;
    inline bool operator != ( const SwViewOption &rOpt ) const  { return !(*this == rOpt); }
    bool operator != ( const SwViewOption &rOpt ) const  { return !(*this == rOpt); }

    // Options from nUIOptions
    bool    IsViewVScrollBar() const
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 96ddd10..c6e7b6e 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -219,7 +219,7 @@ public:
    void    SetRestoreActions(sal_uInt16 nSet);
    sal_uInt16  GetRestoreActions() const;

    inline bool HasInvalidRect() const { return maInvalidRect.HasArea(); }
    bool HasInvalidRect() const { return maInvalidRect.HasArea(); }
    void ChgHyphenation() { Reformat(); }
    void ChgNumberDigits();

@@ -286,7 +286,7 @@ public:

    const Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const;

    inline SwDoc *GetDoc()  const { return mpDoc; }  //Never 0.
    SwDoc *GetDoc()  const { return mpDoc; }  //Never 0.

    /** Provides access to the document setting interface
     */
@@ -342,12 +342,12 @@ public:
    // 2. GetWin:      Available if we not printing
    // 3. GetOut:      Printer, Window or Virtual device
    vcl::RenderContext& GetRefDev() const;
    inline vcl::Window* GetWin()    const { return mpWin; }
    inline vcl::RenderContext* GetOut()     const { return mpOut; }
    vcl::Window* GetWin()    const { return mpWin; }
    vcl::RenderContext* GetOut()     const { return mpOut; }

    void SetWin(vcl::Window* win) { mpWin = win; }
    void SetOut(vcl::RenderContext* pOut) { mpOut = pOut; }
    static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; }
    static bool IsLstEndAction() { return SwViewShell::mbLstAct; }

    // Change of all page descriptors.
    void   ChgAllPageOrientation( Orientation eOri );
@@ -423,7 +423,7 @@ public:
    // Calls Idle-formatter of Layout.
    void LayoutIdle();

    inline const SwViewOption *GetViewOptions() const { return mpOpt; }
    const SwViewOption *GetViewOptions() const { return mpOpt; }
    virtual void  ApplyViewOptions( const SwViewOption &rOpt );
           void  SetUIOptions( const SwViewOption &rOpt );
    virtual void  SetReadonlyOption(bool bSet);          // Set readonly-bit of ViewOptions.
@@ -441,8 +441,8 @@ public:
                          { return (*mpCareWindow.get()) ? mpCareWindow.get()->get() : CareChildWin(rVSh); }
    static vcl::Window*   CareChildWin(SwViewShell& rVSh);

    inline SfxViewShell   *GetSfxViewShell() const { return mpSfxViewShell; }
    inline void           SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
    SfxViewShell   *GetSfxViewShell() const { return mpSfxViewShell; }
    void           SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }

    // Selection of  Draw Engine has been changed.
    virtual void DrawSelChanged();
@@ -554,7 +554,7 @@ public:

    sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const;

    inline bool IsInConstructor() const { return mbInConstructor; }
    bool IsInConstructor() const { return mbInConstructor; }

    const BitmapEx& GetReplacementBitmap(bool bIsErrorState);
    void DeleteReplacementBitmaps();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index c5ba194..318cc9d 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -103,7 +103,7 @@ public:
    void Hide();
    void Invalidate( const SwRect& rRect );

    inline void SetShowTextInputFieldOverlay( const bool bShow )
    void SetShowTextInputFieldOverlay( const bool bShow )
    {
        m_bShowTextInputFieldOverlay = bShow;
    }
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 4206a13..9119a6a 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -91,7 +91,7 @@ private:

protected:
    void SetName( const OUString& rName ) { m_sName = rName; }
    inline sal_Int16 GetRole() const
    sal_Int16 GetRole() const
    {
        return m_nRole;
    }
@@ -107,11 +107,11 @@ protected:
    const SwAccessibleMap *GetMap() const { return m_pMap; }

    /** convenience method to get the SwViewShell through accessibility map */
    inline SwViewShell* GetShell()
    SwViewShell* GetShell()
    {
        return GetMap()->GetShell();
    }
    inline const SwViewShell* GetShell() const
    const SwViewShell* GetShell() const
    {
        return GetMap()->GetShell();
    }
@@ -183,7 +183,7 @@ protected:
        getBoundsImpl(bool bRelative);

    // #i85634#
    inline void NotRegisteredAtAccessibleMap()
    void NotRegisteredAtAccessibleMap()
    {
        m_isRegisteredAtAccessibleMap = false;
    }
@@ -334,11 +334,11 @@ public:
    virtual bool HasCursor();   // required by map to remember that object

    bool Select( SwPaM *pPaM, SdrObject *pObj, bool bAdd );
    inline bool Select( SwPaM& rPaM )
    bool Select( SwPaM& rPaM )
    {
        return Select( &rPaM, nullptr, false );
    }
    inline bool Select( SdrObject *pObj, bool bAdd )
    bool Select( SdrObject *pObj, bool bAdd )
    {
        return Select( nullptr, pObj, bAdd );
    }
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 56e8814..a6455da 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -87,12 +87,12 @@ public:
    inline bool IsShowing( const SwAccessibleMap& rAccMap ) const;

protected:
    inline bool IsInPagePreview() const
    bool IsInPagePreview() const
    {
        return mbIsInPagePreview;
    }

    inline void ClearFrame()
    void ClearFrame()
    {
        mpFrame = nullptr;
    }
@@ -134,12 +134,12 @@ protected:
    void GetChildren( SwAccessibleMap& rAccMap,
                      std::list< sw::access::SwAccessibleChild >& rChildren ) const;

    inline void SetVisArea( const SwRect& rNewVisArea )
    void SetVisArea( const SwRect& rNewVisArea )
    {
        maVisArea = rNewVisArea;
    }

    inline const SwRect& GetVisArea() const
    const SwRect& GetVisArea() const
    {
        return maVisArea;
    }
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index 0ade63d..d92adf9 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -35,7 +35,7 @@ private:
    sw::access::SwAccessibleChild m_aCurr;    // The current object
    size_t m_nNextObj;                        // The index of the current sdr object

    inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst )
    SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst )
        : m_rList( rLst )
        , m_nNextObj( 0 )
    {}
@@ -47,18 +47,18 @@ private:
    SwAccessibleChildSList_const_iterator& next_visible();

public:
    inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter )
    SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter )
        : m_rList( rIter.m_rList )
        , m_aCurr( rIter.m_aCurr )
        , m_nNextObj( rIter.m_nNextObj )
    {}

    inline bool operator==( const SwAccessibleChildSList_const_iterator& r ) const
    bool operator==( const SwAccessibleChildSList_const_iterator& r ) const
    {
        return m_aCurr == r.m_aCurr;
    }

    inline bool operator!=(
    bool operator!=(
            const SwAccessibleChildSList_const_iterator& r ) const
    {
        return !(*this == r);
@@ -66,7 +66,7 @@ public:

    SwAccessibleChildSList_const_iterator& operator++();

    inline const sw::access::SwAccessibleChild& operator*() const
    const sw::access::SwAccessibleChild& operator*() const
    {
        return m_aCurr;
    }
@@ -83,7 +83,7 @@ class SwAccessibleChildSList
public:
    typedef SwAccessibleChildSList_const_iterator const_iterator;

    inline SwAccessibleChildSList( const SwFrame& rFrame,
    SwAccessibleChildSList( const SwFrame& rFrame,
                                   SwAccessibleMap& rAccMap )
        : maVisArea()
        , mrFrame( rFrame )
@@ -91,7 +91,7 @@ public:
        , mrAccMap( rAccMap )
    {}

    inline SwAccessibleChildSList( const SwRect& rVisArea,
    SwAccessibleChildSList( const SwRect& rVisArea,
                                   const SwFrame& rFrame,
                                   SwAccessibleMap& rAccMap )
        : maVisArea( rVisArea )
@@ -101,32 +101,32 @@ public:
    {
    }

    inline const_iterator begin() const
    const_iterator begin() const
    {
        return SwAccessibleChildSList_const_iterator( *this, mrAccMap );
    }

    inline const_iterator end() const
    const_iterator end() const
    {
        return SwAccessibleChildSList_const_iterator( *this );
    }

    inline const SwFrame& GetFrame() const
    const SwFrame& GetFrame() const
    {
        return mrFrame;
    }

    inline bool IsVisibleChildrenOnly() const
    bool IsVisibleChildrenOnly() const
    {
        return mbVisibleChildrenOnly;
    }

    inline const SwRect& GetVisArea() const
    const SwRect& GetVisArea() const
    {
        return maVisArea;
    }

    inline SwAccessibleMap& GetAccMap() const
    SwAccessibleMap& GetAccMap() const
    {
        return mrAccMap;
    }
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index d47e20d..421461f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -426,16 +426,16 @@ public:
    }

    // <SetType(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
    inline void SetType( EventType eT )
    void SetType( EventType eT )
    {
        meType = eT;
    }
    inline EventType GetType() const
    EventType GetType() const
    {
        return meType;
    }

    inline ::rtl::Reference < SwAccessibleContext > GetContext() const
    ::rtl::Reference < SwAccessibleContext > GetContext() const
    {
        uno::Reference < XAccessible > xTmp( mxAcc );
        ::rtl::Reference < SwAccessibleContext > xAccImpl(
@@ -444,55 +444,55 @@ public:
        return xAccImpl;
    }

    inline const SwRect& GetOldBox() const
    const SwRect& GetOldBox() const
    {
        return maOldBox;
    }
    // <SetOldBox(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
    inline void SetOldBox( const SwRect& rOldBox )
    void SetOldBox( const SwRect& rOldBox )
    {
        maOldBox = rOldBox;
    }

    inline const SwAccessibleChild& GetFrameOrObj() const
    const SwAccessibleChild& GetFrameOrObj() const
    {
        return maFrameOrObj;
    }

    // <SetStates(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
    inline void SetStates( AccessibleStates _nStates )
    void SetStates( AccessibleStates _nStates )
    {
        mnStates |= _nStates;
    }

    inline bool IsUpdateCursorPos() const
    bool IsUpdateCursorPos() const
    {
        return bool(mnStates & AccessibleStates::CARET);
    }
    inline bool IsInvalidateStates() const
    bool IsInvalidateStates() const
    {
        return bool(mnStates & (AccessibleStates::EDITABLE | AccessibleStates::OPAQUE));
    }
    inline bool IsInvalidateRelation() const
    bool IsInvalidateRelation() const
    {
        return bool(mnStates & (AccessibleStates::RELATION_FROM | AccessibleStates::RELATION_TO));
    }
    inline bool IsInvalidateTextSelection() const
    bool IsInvalidateTextSelection() const
    {
        return bool( mnStates & AccessibleStates::TEXT_SELECTION_CHANGED );
    }

    inline bool IsInvalidateTextAttrs() const
    bool IsInvalidateTextAttrs() const
    {
        return bool( mnStates & AccessibleStates::TEXT_ATTRIBUTE_CHANGED );
    }

    inline AccessibleStates GetStates() const
    AccessibleStates GetStates() const
    {
        return mnStates;
    }

    inline AccessibleStates GetAllStates() const
    AccessibleStates GetAllStates() const
    {
        return mnStates;
    }
@@ -508,11 +508,11 @@ public:
        : mbFiring( false )
    {}

    inline void SetFiring()
    void SetFiring()
    {
        mbFiring = true;
    }
    inline bool IsFiring() const
    bool IsFiring() const
    {
        return mbFiring;
    }
@@ -685,7 +685,7 @@ public:
    void AdjustMapMode( MapMode& rMapMode,
                        const Point& rPoint ) const;

    inline const SwPageFrame *GetSelPage() const { return mpSelPage; }
    const SwPageFrame *GetSelPage() const { return mpSelPage; }

    void DisposePage(const SwPageFrame *pPageFrame );
};
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 11beb63..e4a68e4 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -97,7 +97,7 @@ class SwAccessibleTableData_Impl
                       bool bColumns ) const;

    // #i77106#
    inline bool IncludeRow( const SwFrame& rFrame ) const
    bool IncludeRow( const SwFrame& rFrame ) const
    {
        return !mbOnlyTableColumnHeader ||
               mpTabFrame->IsInHeadline( rFrame );
@@ -579,7 +579,7 @@ public:

    virtual ~SwAccSingleTableSelHander_Impl() {}

    inline bool IsSelected() const { return bSelected; }
    bool IsSelected() const { return bSelected; }

    virtual void Unselect( sal_Int32, sal_Int32 ) override;
};
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index a7e4003..f2fc518 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -64,7 +64,7 @@ protected:
    virtual ~SwAccessibleTable() override;

    // #i77106#
    inline void SetDesc( const OUString& sNewDesc )
    void SetDesc( const OUString& sNewDesc )
    {
        m_sDesc = sNewDesc;
    }
diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx
index 63cff0e..997a4c4 100644
--- a/sw/source/core/crsr/overlayrangesoutline.hxx
+++ b/sw/source/core/crsr/overlayrangesoutline.hxx
@@ -45,7 +45,7 @@ namespace sw
            virtual ~OverlayRangesOutline() override;

            // data read access
            inline const std::vector< basegfx::B2DRange >& getRanges() const
            const std::vector< basegfx::B2DRange >& getRanges() const
            {
                return maRanges;
            }
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index cb6fe9f..102d487 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -182,9 +182,9 @@ namespace
            inline void RestoreUnoCursors(updater_t& rUpdater);
            inline void SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
            inline void RestoreShellCursors(updater_t& rUpdater);
            static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
            static const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
                { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
            static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
            static void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
                { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
    };
    inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bGetPoint, bool bSetMark)
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index c693490..5f2c8d0 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -683,11 +683,11 @@ public:
    SwHyphArgs( const SwPaM *pPam, const Point &rPoint,
                sal_uInt16* pPageCount, sal_uInt16* pPageStart );
    void SetPam( SwPaM *pPam ) const;
    inline void SetNode( SwNode *pNew ) { pNode = pNew; }
    void SetNode( SwNode *pNew ) { pNode = pNew; }
    inline void SetRange( const SwNode *pNew );
    inline void NextNode() { ++nNode; }
    inline sal_uInt16 *GetPageCnt() { return pPageCnt; }
    inline sal_uInt16 *GetPageSt() { return pPageSt; }
    void NextNode() { ++nNode; }
    sal_uInt16 *GetPageCnt() { return pPageCnt; }
    sal_uInt16 *GetPageSt() { return pPageSt; }
};

SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos,
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 1beb43c..782c8c4 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1049,17 +1049,17 @@ namespace numfunc
                return msFontname;
            }

            inline bool IsFontnameUserDefined() const
            bool IsFontnameUserDefined() const
            {
                return mbUserDefinedFontname;
            }

            inline const vcl::Font& GetFont() const
            const vcl::Font& GetFont() const
            {
                return *mpFont;
            }

            inline sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const
            sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const
            {
                if (p_nListLevel >= MAXLEVEL)
                {
@@ -1275,7 +1275,7 @@ namespace numfunc
        public:
            static SwNumberingUIBehaviorConfig& getInstance();

            inline bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
            bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const
            {
                return mbChangeIndentOnTabAtFirstPosOfFirstListItem;
            }
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 0791f373..21ac834 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -84,7 +84,7 @@ public:
    virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
                            sal_Int32 nEnd = -1 ) const override;

    inline SwSectionNode* GetSectNode()
    SwSectionNode* GetSectNode()
    {
        const SwNode* pSectNd( GetAnchor() );
        return const_cast<SwSectionNode*>( dynamic_cast<const SwSectionNode*>( pSectNd ) );
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 74507f5..7397114 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -75,21 +75,21 @@ class SwLinguIter
public:
    SwLinguIter();

    inline SwEditShell *GetSh()             { return pSh; }
    SwEditShell *GetSh()             { return pSh; }

    inline const SwPosition *GetEnd() const { return pEnd; }
    inline void SetEnd( SwPosition* pNew ){ delete pEnd; pEnd = pNew; }
    const SwPosition *GetEnd() const { return pEnd; }
    void SetEnd( SwPosition* pNew ){ delete pEnd; pEnd = pNew; }

    inline const SwPosition *GetStart() const { return pStart; }
    inline void SetStart( SwPosition* pNew ){ delete pStart; pStart = pNew; }
    const SwPosition *GetStart() const { return pStart; }
    void SetStart( SwPosition* pNew ){ delete pStart; pStart = pNew; }

    inline const SwPosition *GetCurr() const { return pCurr; }
    inline void SetCurr( SwPosition* pNew ){ delete pCurr; pCurr = pNew; }
    const SwPosition *GetCurr() const { return pCurr; }
    void SetCurr( SwPosition* pNew ){ delete pCurr; pCurr = pNew; }

    inline const SwPosition *GetCurrX() const { return pCurrX; }
    inline void SetCurrX( SwPosition* pNew ){ delete pCurrX; pCurrX = pNew; }
    const SwPosition *GetCurrX() const { return pCurrX; }
    void SetCurrX( SwPosition* pNew ){ delete pCurrX; pCurrX = pNew; }

    inline sal_uInt16& GetCursorCnt(){ return nCursorCnt; }
    sal_uInt16& GetCursorCnt(){ return nCursorCnt; }

    // for the UI:
    void Start_( SwEditShell *pSh, SwDocPositions eStart,
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 7d2c6f9..e5f24a4 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -62,7 +62,7 @@ class SwUndoDelNum : public SwUndo, private SwUndRng
    {
        sal_uLong index;
        int level;
        inline NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {};
        NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {};
    };
    std::vector<NodeLevel>     aNodes;
    std::unique_ptr<SwHistory> pHistory;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index afe6717..db35e88 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -84,28 +84,28 @@ namespace objectpositioning
        virtual ~SwAnchoredObjectPosition();

        // accessors for object and its corresponding data/information
        inline SdrObject& GetObject() const
        SdrObject& GetObject() const
        {
            return mrDrawObj;
        }
        inline bool IsObjFly() const
        bool IsObjFly() const
        {
            return mbIsObjFly;
        }
        inline SwAnchoredObject& GetAnchoredObj() const
        SwAnchoredObject& GetAnchoredObj() const
        {
            return *mpAnchoredObj;
        }
        inline SwFrame& GetAnchorFrame() const
        SwFrame& GetAnchorFrame() const
        {
            return *mpAnchorFrame;
        }
        inline const SwFrameFormat& GetFrameFormat() const
        const SwFrameFormat& GetFrameFormat() const
        {
            return *mpFrameFormat;
        }
        // #i62875#
        inline bool DoesObjFollowsTextFlow() const
        bool DoesObjFollowsTextFlow() const
        {
            return mbFollowTextFlow;
        }
@@ -181,7 +181,7 @@ namespace objectpositioning
            object has to be checked and thus, (if needed) the proposed
            relative position has to be adjusted. default value <true>
        */
        inline SwTwips AdjustVertRelPos( const SwTwips nTopOfAnch,
        SwTwips AdjustVertRelPos( const SwTwips nTopOfAnch,
                                          const bool bVert,
                                          const bool bVertL2R,
                                          const SwFrame& rPageAlignLayFrame,
@@ -261,7 +261,7 @@ namespace objectpositioning

            @return adjusted relative horizontal position in SwTwips.
        */
        inline SwTwips AdjustHoriRelPos( const SwFrame&  _rPageAlignLayFrame,
        SwTwips AdjustHoriRelPos( const SwFrame&  _rPageAlignLayFrame,
                                          const SwTwips _nProposedRelPosX ) const
        {
            return !mbDoNotCaptureAnchoredObj
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 34a1de4..54a7491 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -104,7 +104,7 @@ public:

    virtual void DeleteMarked() override;

    inline void ValidateMarkList() { FlushComeBackTimer(); }
    void ValidateMarkList() { FlushComeBackTimer(); }

    // #i99665#
    bool IsAntiAliasing() const;
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 774c8d2..f293b87 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -152,8 +152,8 @@ public:
    static bool IsMoveBwdJump() { return m_bMoveBwdJump; }
    static void SetMoveBwdJump( bool bNew ){ m_bMoveBwdJump = bNew; }

    inline void SetUndersized( const bool bNew ) { m_bUndersized = bNew; }
    inline bool IsUndersized()  const { return m_bUndersized; }
    void SetUndersized( const bool bNew ) { m_bUndersized = bNew; }
    bool IsUndersized()  const { return m_bUndersized; }

    bool IsPrevObjMove() const;

diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 4fbb818..2b2b21d1 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -203,7 +203,7 @@ public:
    bool IsHeightClipped()  const   { return m_bHeightClipped; }

    bool IsLowerOf( const SwLayoutFrame* pUpper ) const;
    inline bool IsUpperOf( const SwFlyFrame& _rLower ) const
    bool IsUpperOf( const SwFlyFrame& _rLower ) const
    {
        return _rLower.IsLowerOf( this );
    }
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index ac7a6ca..7c84250 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -71,23 +71,23 @@ public:
    virtual void MakeAll(vcl::RenderContext* pRenderContext) override;

    // #i37068# - accessors for member <mbNoMoveOnCheckClip>
    inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
    void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
    {
        mbNoMoveOnCheckClip = _bNewNoMoveOnCheckClip;
    }
    inline bool IsNoMoveOnCheckClip() const
    bool IsNoMoveOnCheckClip() const
    {
        return mbNoMoveOnCheckClip;
    }
    // #i34753# - accessors for member <mbNoMakePos>
    inline void SetNoMakePos( const bool _bNoMakePos )
    void SetNoMakePos( const bool _bNoMakePos )
    {
        if ( IsFlyLayFrame() )
        {
            mbNoMakePos = _bNoMakePos;
        }
    }
    inline bool IsNoMakePos() const
    bool IsNoMakePos() const
    {
        if ( IsFlyLayFrame() )
        {
@@ -99,7 +99,7 @@ public:
        }
    }

    inline const SwRect& GetUnclippedFrame( ) const
    const SwRect& GetUnclippedFrame( ) const
    {
        if ( maUnclippedFrame.HasArea( ) )
            return maUnclippedFrame;
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 3ebd3d1..e6c4fa4 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -38,7 +38,7 @@ class Point;
class SwFntCache : public SwCache
{
public:
    inline SwFntCache() : SwCache(50
    SwFntCache() : SwCache(50
#ifdef DBG_UTIL
    , OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache"))
#endif
@@ -87,12 +87,12 @@ public:

    virtual ~SwFntObj() override;

    inline       vcl::Font *GetScrFont()     { return m_pScrFont; }
    inline       vcl::Font& GetFont()        { return m_aFont; }
    inline const vcl::Font& GetFont() const  { return m_aFont; }
    vcl::Font *GetScrFont()     { return m_pScrFont; }
    vcl::Font& GetFont()        { return m_aFont; }
    const vcl::Font& GetFont() const  { return m_aFont; }

    inline sal_uInt16 GetGuessedLeading() const  { return m_nGuessedLeading; }
    inline sal_uInt16 GetExternalLeading() const  { return m_nExtLeading; }
    sal_uInt16 GetGuessedLeading() const  { return m_nGuessedLeading; }
    sal_uInt16 GetExternalLeading() const  { return m_nExtLeading; }

    sal_uInt16 GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut );
    sal_uInt16 GetFontHeight( const SwViewShell *pSh, const OutputDevice& rOut );
@@ -101,10 +101,10 @@ public:
    void GuessLeading( const SwViewShell& rSh, const FontMetric& rMet );

    void SetDevFont( const SwViewShell *pSh, OutputDevice& rOut );
    inline OutputDevice* GetPrt() const { return m_pPrinter; }
    inline sal_uInt16   GetZoom() const { return m_nZoom; }
    inline sal_uInt16   GetPropWidth() const { return m_nPropWidth; }
    inline bool     IsSymbol() const { return m_bSymbol; }
    OutputDevice* GetPrt() const { return m_pPrinter; }
    sal_uInt16   GetZoom() const { return m_nZoom; }
    sal_uInt16   GetPropWidth() const { return m_nPropWidth; }
    bool     IsSymbol() const { return m_bSymbol; }

    void   DrawText( SwDrawTextInfo &rInf );
    /// determine the TextSize (of the printer)
@@ -135,7 +135,7 @@ public:
    SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner,
                 SwViewShell const *pShell,
                 bool bCheck = false  );
    inline SwFntObj* Get() { return static_cast<SwFntObj*>( SwCacheAccess::Get() ); }
    SwFntObj* Get() { return static_cast<SwFntObj*>( SwCacheAccess::Get() ); }
};

#endif
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 47c7835..8171908 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -411,14 +411,14 @@ public:

    inline void SetCompletePaint() const;
    inline void ResetCompletePaint() const;
    inline bool IsCompletePaint() const { return mbCompletePaint; }
    bool IsCompletePaint() const { return mbCompletePaint; }

    inline void SetRetouche() const;
    inline void ResetRetouche() const;
    inline bool IsRetouche() const { return mbRetouche; }
    bool IsRetouche() const { return mbRetouche; }

    void SetInfFlags();
    inline void InvalidateInfFlags() { mbInfInvalid = true; }
    void InvalidateInfFlags() { mbInfInvalid = true; }
    inline bool IsInDocBody() const;    // use InfoFlags, determine flags
    inline bool IsInFootnote() const;        // if necessary
    inline bool IsInTab() const;
@@ -435,15 +435,15 @@ public:

    bool IsInBalancedSection() const;

    inline bool IsReverse() const { return mbReverse; }
    bool IsReverse() const { return mbReverse; }
    inline bool IsVertical() const;

    inline bool IsVertLR() const;

    inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; }
    inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; }
    void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; }
    void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; }
    inline bool IsRightToLeft() const;
    inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L  = bNew; }
    void SetDerivedR2L( bool bNew ) { mbDerivedR2L  = bNew; }

    void CheckDirChange();
    // returns upper left frame position for LTR and
@@ -477,7 +477,7 @@ public:

    const SwAttrSet *GetAttrSet() const;

    inline bool HasFixSize() const { return mbFixSize; }
    bool HasFixSize() const { return mbFixSize; }

    // check all pages (starting from the given) and correct them if needed
    static void CheckPageDescs( SwPageFrame *pStart, bool bNotifyFields = true, SwPageFrame** ppPrev = nullptr);
@@ -732,11 +732,11 @@ public:
    void MakeUpperPos( const SwFrame*, const SwFrame*, bool );
    void MakeLeftPos( const SwFrame*, const SwFrame*, bool );
    void MakeRightPos( const SwFrame*, const SwFrame*, bool );
    inline bool IsNeighbourFrame() const
    bool IsNeighbourFrame() const
        { return bool(GetType() & FRM_NEIGHBOUR); }

    // #i65250#
    inline sal_uInt32 GetFrameId() const { return mnFrameId; }
    sal_uInt32 GetFrameId() const { return mnFrameId; }

    // NEW TABLES
    // Some functions for covered/covering table cells. This way unnecessary
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 9971364..8ec58e1 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -34,7 +34,7 @@ class SwTextFrameInfo
    static SwTwips GetLineStart( const SwTextCursor &rLine );

public:
    inline SwTextFrameInfo( const SwTextFrame *pTextFrame ) : pFrame(pTextFrame) { }
    SwTextFrameInfo( const SwTextFrame *pTextFrame ) : pFrame(pTextFrame) { }

    // Does the paragraph fit into a single line?
    bool IsOneLine() const;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index b6b56e0..81453b1 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -329,10 +329,10 @@ public:
    SwBorderAttrs( const SwModify *pOwner, const SwFrame *pConstructor );
    virtual ~SwBorderAttrs() override;

    inline const SwAttrSet      &GetAttrSet() const { return m_rAttrSet;  }
    inline const SvxULSpaceItem &GetULSpace() const { return m_rUL;       }
    inline const SvxBoxItem     &GetBox()     const { return m_rBox;      }
    inline const SvxShadowItem  &GetShadow()  const { return m_rShadow;   }
    const SwAttrSet      &GetAttrSet() const { return m_rAttrSet;  }
    const SvxULSpaceItem &GetULSpace() const { return m_rUL;       }
    const SvxBoxItem     &GetBox()     const { return m_rBox;      }
    const SvxShadowItem  &GetShadow()  const { return m_rShadow;   }

    inline sal_uInt16 CalcTopLine() const;
    inline sal_uInt16 CalcBottomLine() const;
@@ -345,9 +345,9 @@ public:

    inline bool IsLine() const;

    inline const Size &GetSize()     const { return m_aFrameSize; }
    const Size &GetSize()     const { return m_aFrameSize; }

    inline bool IsBorderDist() const { return m_bBorderDist; }
    bool IsBorderDist() const { return m_bBorderDist; }

    // Should upper (or lower) border be evaluated for this frame?
    // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index b001a94..907b8e3 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -64,14 +64,14 @@ protected:
    static void   ResetFootnote( const SwFootnoteFrame *pAssumed );

public:
    inline SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib )
    SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib )
        : SwLayoutFrame( pFormat, pSib )
        , nMaxFootnoteHeight(0)
        {}

                 SwLayoutFrame *FindBodyCont();
    inline const SwLayoutFrame *FindBodyCont() const;
    inline void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; }
    void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; }

    // footnote interface
    void AppendFootnote( SwContentFrame *, SwTextFootnote * );
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 974ad84..d9770da0 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -110,19 +110,19 @@ public:
    bool IsBackMoveLocked() { return bBackMoveLocked; }

    // prevents that the last content deletes the SwFootnoteFrame as well (Cut())
    inline void ColLock()       { mbColLocked = true; }
    inline void ColUnlock()     { mbColLocked = false; }
    void ColLock()       { mbColLocked = true; }
    void ColUnlock()     { mbColLocked = false; }

    // #i49383#
    inline void UnlockPosOfLowerObjs()
    void UnlockPosOfLowerObjs()
    {
        mbUnlockPosOfLowerObjs = true;
    }
    inline void KeepLockPosOfLowerObjs()
    void KeepLockPosOfLowerObjs()
    {
        mbUnlockPosOfLowerObjs = false;
    }
    inline bool IsUnlockPosOfLowerObjs()
    bool IsUnlockPosOfLowerObjs()
    {
        return mbUnlockPosOfLowerObjs;
    }
diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx
index 6bc78b9..2ff8197 100644
--- a/sw/source/core/inc/ifinishedthreadlistener.hxx
+++ b/sw/source/core/inc/ifinishedthreadlistener.hxx
@@ -30,14 +30,14 @@
class IFinishedThreadListener
{
public:
        inline virtual ~IFinishedThreadListener()
        virtual ~IFinishedThreadListener()
        {
        };

        virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0;

protected:
        inline IFinishedThreadListener()
        IFinishedThreadListener()
        {
        };
};
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 0541a20..51b71f05 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -150,7 +150,7 @@ public:
    void SetUpdateExpFields() {m_bUpdateExpFields = true; }

    inline void SetCheckPageNum( sal_uInt16 nNew );
    inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { m_nCheckPageNum = nNew; }
    void SetCheckPageNumDirect( sal_uInt16 nNew ) { m_nCheckPageNum = nNew; }

    void Action(OutputDevice* pRenderContext); // here it begins
    void Reset();   // back to CTor-defaults
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index ddeb9d1..e288393 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -83,17 +83,17 @@ class SwObjectFormatter

        virtual SwFrame& GetAnchorFrame() = 0;

        inline const SwPageFrame& GetPageFrame() const
        const SwPageFrame& GetPageFrame() const
        {
            return mrPageFrame;
        }

        inline bool ConsiderWrapOnObjPos() const
        bool ConsiderWrapOnObjPos() const
        {
            return mbConsiderWrapOnObjPos;
        }

        inline SwLayAction* GetLayAction()
        SwLayAction* GetLayAction()
        {
            return mpLayAction;
        }
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 22ded20..313cc29 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -46,10 +46,10 @@ class ObservableThread : public osl::Thread,
        void SetListener( std::weak_ptr< IFinishedThreadListener > const & pThreadListener,
                          const oslInterlockedCount nThreadID );

        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/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index f1505fa..3bb152e 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -188,8 +188,8 @@ public:
    void SetFootnotePage( bool b )                       { m_bFootnotePage = b; }
    void SetEndNotePage( bool b )                   { m_bEndNotePage = b; }

    inline  sal_uInt16 GetPhyPageNum() const        { return m_nPhyPageNum;}
    inline  void SetPhyPageNum( sal_uInt16 nNum )   { m_nPhyPageNum = nNum;}
    sal_uInt16 GetPhyPageNum() const        { return m_nPhyPageNum;}
    void SetPhyPageNum( sal_uInt16 nNum )   { m_nPhyPageNum = nNum;}

    /// Validate, invalidate and query the Page status
    /// Layout/Content and Fly/non-Fly respectively are inspected separately
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 983c1c39..8ff8bcca 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -46,7 +46,7 @@ private:
    {
        sal_Int32 position; //!< Character position at which we change script
        sal_uInt8       type;     //!< Script type (Latin/Asian/Complex) that we change to.
        inline ScriptChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {};
        ScriptChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {};
    };
    //TODO - This is sorted, so should probably be a std::set rather than vector.
    //       But we also use random access (probably unnecessarily).
@@ -56,7 +56,7 @@ private:
    {
        sal_Int32 position; //!< Character position at which we change direction.
        sal_uInt8       type;     //!< Direction that we change to.
        inline DirectionChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {};
        DirectionChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {};
    };
    std::vector<DirectionChangeInfo> aDirectionChanges;
    std::deque< sal_Int32 > aKashida;
@@ -70,7 +70,7 @@ private:
        sal_Int32 position; //!< Character position where the change occurs.
        sal_Int32 length;   //!< Length of the segment.
        CompType  type;     //!< Type of compression that we change to.
        inline CompressionChangeInfo(sal_Int32 pos, sal_Int32 len, CompType typ) : position(pos), length(len), type(typ) {};
        CompressionChangeInfo(sal_Int32 pos, sal_Int32 len, CompType typ) : position(pos), length(len), type(typ) {};
    };
    std::vector<CompressionChangeInfo> aCompressionChanges;
#ifdef DBG_UTIL
@@ -112,7 +112,7 @@ public:
    }

    // get default direction for paragraph
    inline sal_uInt8 GetDefaultDir() const { return nDefaultDir; };
    sal_uInt8 GetDefaultDir() const { return nDefaultDir; };

    // array operations, nCnt refers to array position
    size_t CountScriptChg() const { return aScriptChanges.size(); }
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 5a9431f..4bad9cf 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -82,10 +82,10 @@ public:

                 SwContentFrame *FindLastContent( SwFindMode nMode = SwFindMode::None );
    inline const SwContentFrame *FindLastContent() const;
    inline SwSection* GetSection() { return m_pSection; }
    inline const SwSection* GetSection() const { return m_pSection; }
    inline void ColLock()       { mbColLocked = true; }
    inline void ColUnlock()     { mbColLocked = false; }
    SwSection* GetSection() { return m_pSection; }
    const SwSection* GetSection() const { return m_pSection; }
    void ColLock()       { mbColLocked = true; }
    void ColUnlock()     { mbColLocked = false; }

    void CalcFootnoteContent();
    void SimpleFormat();
@@ -110,7 +110,7 @@ public:
     * if bCheckFollow is set.
     */
    bool ToMaximize( bool bCheckFollow ) const;
    inline bool ToMaximize_() const {
    bool ToMaximize_() const {
        if( !m_pSection ) return false;
        return ToMaximize( false );
    }
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index d8dfe25..5e6a81d 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -110,10 +110,10 @@ public:
    inline void IncreaseMax( const sal_uInt16 nAdd );
    inline void DecreaseMax( const sal_uInt16 nSub );
    sal_uInt16 GetCurMax() const { return m_nCurMax; }
    inline SwCacheObj *First() { return m_pRealFirst; }
    SwCacheObj *First() { return m_pRealFirst; }
    static inline SwCacheObj *Next( SwCacheObj *pCacheObj);
    inline SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; }
    inline sal_uInt16 size() { return m_aCacheObjects.size(); }
    SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; }
    sal_uInt16 size() { return m_aCacheObjects.size(); }
};

/// Safely manipulate the cache
@@ -143,12 +143,12 @@ class SwCacheObj

    sal_uInt8       m_nLock;

    inline SwCacheObj *GetNext() { return m_pNext; }
    inline SwCacheObj *GetPrev() { return m_pPrev; }
    inline void SetNext( SwCacheObj *pNew )  { m_pNext = pNew; }
    inline void SetPrev( SwCacheObj *pNew )  { m_pPrev = pNew; }
    SwCacheObj *GetNext() { return m_pNext; }
    SwCacheObj *GetPrev() { return m_pPrev; }
    void SetNext( SwCacheObj *pNew )  { m_pNext = pNew; }
    void SetPrev( SwCacheObj *pNew )  { m_pPrev = pNew; }

    inline void   SetCachePos( const sal_uInt16 nNew ) { m_nCachePos = nNew; }
    void   SetCachePos( const sal_uInt16 nNew ) { m_nCachePos = nNew; }

protected:
    const void *m_pOwner;
@@ -158,12 +158,12 @@ public:
    SwCacheObj( const void *pOwner );
    virtual ~SwCacheObj();

    inline const void *GetOwner() const { return m_pOwner; }
    const void *GetOwner() const { return m_pOwner; }
    inline bool IsOwner( const void *pNew ) const;

    inline sal_uInt16 GetCachePos() const { return m_nCachePos; }
    sal_uInt16 GetCachePos() const { return m_nCachePos; }

    inline bool IsLocked() const { return 0 != m_nLock; }
    bool IsLocked() const { return 0 != m_nLock; }

#ifdef DBG_UTIL
    void Lock();
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 19d50e3..244291e 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -33,7 +33,7 @@ class SwFontCache : public SwCache
{
public:

    inline SwFontCache() : SwCache(50
    SwFontCache() : SwCache(50
#ifdef DBG_UTIL
    , "Global AttributSet/Font-Cache pSwFontCache"
#endif
@@ -59,9 +59,9 @@ public:

    virtual ~SwFontObj() override;

    inline       SwFont& GetFont()        { return aSwFont; }
    inline const SwFont& GetFont() const  { return aSwFont; }
    inline const SfxPoolItem** GetDefault() { return pDefaultArray; }
    SwFont& GetFont()        { return aSwFont; }
    const SwFont& GetFont() const  { return aSwFont; }
    const SfxPoolItem** GetDefault() { return pDefaultArray; }
};

class SwFontAccess : public SwCacheAccess
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index caef07dd..4b94ff2 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -108,12 +108,12 @@ class SwSubFont : public SvxFont
    inline void SetSize( const Size& rSize );
    inline void SetWeight( const FontWeight eWeight );
    inline void SetLanguage( LanguageType eNewLang );
    inline short CheckKerning()
    short CheckKerning()
    {   return GetFixKerning() >= 0 ? GetFixKerning() : CheckKerning_( ); }
    inline void SetPropWidth( const sal_uInt16 nNew )
    void SetPropWidth( const sal_uInt16 nNew )
        { m_pMagic = nullptr; m_nProportionalWidth = nNew; }
public:
    inline SwSubFont() : m_aSize(0,0)
    SwSubFont() : m_aSize(0,0)
    { m_pMagic = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0; m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
    sal_uInt16 GetPropWidth() const { return m_nProportionalWidth; }
};
@@ -175,48 +175,48 @@ public:
    SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess );
    SwFont( const SwFont& rFont );

    inline void ChgFnt( SwViewShell const *pSh, OutputDevice& rOut )
    void ChgFnt( SwViewShell const *pSh, OutputDevice& rOut )
        { m_bPaintBlank = m_aSub[m_nActual].ChgFnt( pSh, rOut ); }

    ~SwFont();

    SwFont& operator=( const SwFont &rFont );

    inline SwFontScript GetActual() const {    return m_nActual; }
    SwFontScript GetActual() const {    return m_nActual; }
    inline void SetActual( SwFontScript nNew );
    inline const SvxFont& GetActualFont() const { return m_aSub[m_nActual]; }
    const SvxFont& GetActualFont() const { return m_aSub[m_nActual]; }

    // gets a MagicNumber via SwFntAccess
    void GoMagic( SwViewShell *pSh, SwFontScript nWhich );
    // set background color
    void SetBackColor( Color* pNewColor );
    inline const Color* GetBackColor() const{ return m_pBackColor.get(); }
    const Color* GetBackColor() const{ return m_pBackColor.get(); }
    void SetHighlightColor( const Color& aNewColor );
    const Color& GetHighlightColor() const { return m_aHighlightColor; }

    inline void ChkMagic( SwViewShell *pSh, SwFontScript nWhich )
    void ChkMagic( SwViewShell *pSh, SwFontScript nWhich )
        { if( !m_aSub[ nWhich ].m_pMagic ) GoMagic( pSh, nWhich ); }
    inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, SwFontScript nWhich )
    void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, SwFontScript nWhich )
        { rMagic = m_aSub[nWhich].m_pMagic; rIdx = m_aSub[nWhich].m_nFontIndex; }
    inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, SwFontScript nWhich )
    void SetMagic( const void* pNew, const sal_uInt16 nIdx, SwFontScript nWhich )
        { m_aSub[nWhich].m_pMagic = pNew; m_aSub[nWhich].m_nFontIndex = nIdx; }
    inline bool DifferentMagic( const SwFont* pFnt, SwFontScript nWhich )
    bool DifferentMagic( const SwFont* pFnt, SwFontScript nWhich )
        { return m_aSub[nWhich].m_pMagic != pFnt->m_aSub[nWhich].m_pMagic ||
          !m_aSub[nWhich].m_pMagic || !pFnt->m_aSub[nWhich].m_pMagic; }

    inline const Size &GetSize( SwFontScript nWhich ) const
    const Size &GetSize( SwFontScript nWhich ) const
        { return m_aSub[nWhich].m_aSize; }
    inline bool IsFntChg() const { return m_bFontChg; }
    inline void SetFntChg( const bool bNew ) { m_bFontChg = bNew; }
    bool IsFntChg() const { return m_bFontChg; }
    void SetFntChg( const bool bNew ) { m_bFontChg = bNew; }

    // the encapsulated SV-Font-methods (set bFntChg to true)
    inline void SetColor( const Color& rColor );
    inline void SetFillColor( const Color& rColor );
    inline void SetAlign( const FontAlign eAlign );
    inline void SetUnderline( const FontLineStyle eUnderline );
    inline void SetUnderColor( const Color &rColor ) { m_aUnderColor = rColor; }
    void SetUnderColor( const Color &rColor ) { m_aUnderColor = rColor; }
    inline void SetOverline( const FontLineStyle eOverline );
    inline void SetOverColor( const Color &rColor ) { m_aOverColor = rColor; }
    void SetOverColor( const Color &rColor ) { m_aOverColor = rColor; }
    inline void SetStrikeout( const FontStrikeout eStrikeout );
    inline void SetOutline( const bool bOutline );
           void SetVertical( sal_uInt16 nDir, const bool bVertLayout = false );
@@ -248,26 +248,26 @@ public:
    // Get/Set-methods for the current setting
    inline void SetNoHyph( const bool bNew );
    inline void SetBlink( const bool bBlink );
    inline bool IsBlink() const { return m_bBlink; }
    inline sal_uInt8 &GetTox() { return m_nToxCount; }
    inline bool IsTox() const { return ( 0 != m_nToxCount ); }
    inline sal_uInt8 &GetRef() { return m_nRefCount; }
    inline bool IsRef() const { return ( 0 != m_nRefCount ); }
    inline sal_uInt8 &GetMeta() { return m_nMetaCount; }
    inline bool IsMeta() const { return (0 != m_nMetaCount); }
    inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; }
    inline bool IsInputField() const { return (0 != m_nInputFieldCount); }
    inline bool IsURL() const { return m_bURL; }
    bool IsBlink() const { return m_bBlink; }
    sal_uInt8 &GetTox() { return m_nToxCount; }
    bool IsTox() const { return ( 0 != m_nToxCount ); }
    sal_uInt8 &GetRef() { return m_nRefCount; }
    bool IsRef() const { return ( 0 != m_nRefCount ); }
    sal_uInt8 &GetMeta() { return m_nMetaCount; }
    bool IsMeta() const { return (0 != m_nMetaCount); }
    sal_uInt8 &GetInputField() { return m_nInputFieldCount; }
    bool IsInputField() const { return (0 != m_nInputFieldCount); }
    bool IsURL() const { return m_bURL; }
    inline void SetGreyWave( const bool bNew );
    inline bool IsGreyWave() const { return m_bGreyWave; }
    bool IsGreyWave() const { return m_bGreyWave; }
    inline void SetNoCol( const bool bNew );
    inline bool IsPaintBlank() const { return m_bPaintBlank; }
    bool IsPaintBlank() const { return m_bPaintBlank; }

    // setting of the base class font for SwTextCharFormat
    void SetDiffFnt( const SfxItemSet* pSet,
                     const IDocumentSettingAccess* pIDocumentSettingAccess );

    inline const SvxFont &GetFnt( const SwFontScript nWhich ) const
    const SvxFont &GetFnt( const SwFontScript nWhich ) const
        { return m_aSub[nWhich]; };

    bool IsSymbol( SwViewShell *pSh )
@@ -290,13 +290,13 @@ public:
        { return m_aSub[m_nActual].GetEmphasisMark(); }
    sal_uInt16 GetOrientation( const bool bVertLayout = false ) const;

    inline const OUString& GetName( const SwFontScript nWhich ) const
    const OUString& GetName( const SwFontScript nWhich ) const
        { return m_aSub[nWhich].GetFamilyName(); }
    inline LanguageType GetLanguage( const SwFontScript nWhich ) const
    LanguageType GetLanguage( const SwFontScript nWhich ) const
        { return m_aSub[nWhich].GetLanguage(); }
    inline rtl_TextEncoding GetCharSet( const SwFontScript nWhich ) const
    rtl_TextEncoding GetCharSet( const SwFontScript nWhich ) const
        { return m_aSub[nWhich].GetCharSet(); }
    inline long GetHeight( const SwFontScript nWhich ) const
    long GetHeight( const SwFontScript nWhich ) const
        { return m_aSub[nWhich].GetFontSize().Height(); }

    // makes the logical font be effective in the OutputDevice
@@ -318,21 +318,21 @@ public:
    sal_Int32 GetCursorOfst_( SwDrawTextInfo& rInf )
        { return m_aSub[m_nActual].GetCursorOfst_( rInf ); }

    inline void DrawText_( SwDrawTextInfo &rInf )
    void DrawText_( SwDrawTextInfo &rInf )
        { m_aSub[m_nActual].DrawText_( rInf, IsGreyWave() ); }

    inline void DrawStretchText_( SwDrawTextInfo &rInf )
    void DrawStretchText_( SwDrawTextInfo &rInf )
        { m_aSub[m_nActual].DrawStretchText_( rInf ); }

    inline short CheckKerning()
    short CheckKerning()
        { return m_aSub[m_nActual].CheckKerning(); }

    inline sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut )
    sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut )
        { return m_aSub[m_nActual].GetAscent( pSh, rOut ); }
    inline sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut )
    sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut )
        { return m_aSub[m_nActual].GetHeight( pSh, rOut ); }

    inline void Invalidate()
    void Invalidate()
        { m_bFontChg = m_bOrgChg = true; }

    void SetTopBorder( const editeng::SvxBorderLine* pTopBorder );
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 4c9dcff..f52d26f 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -76,7 +76,7 @@ class ThreadManager final
            Suspending the starting of further threads is sensible during the
            destruction of a Writer document.
        */
        inline void SuspendStartingOfThreads()
        void SuspendStartingOfThreads()
        {
            osl::MutexGuard aGuard(maMutex);

@@ -87,7 +87,7 @@ class ThreadManager final
        */
        void ResumeStartingOfThreads();

        inline bool StartingOfThreadsSuspended()
        bool StartingOfThreadsSuspended()
        {
            osl::MutexGuard aGuard(maMutex);

diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index a028b04..c4a8b99 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -88,7 +88,7 @@ public:
                       const TextAndReading& rTaR2,
                       const css::lang::Locale& rLocale2 ) const;

    inline bool IsEqual( const TextAndReading& rTaR1,
    bool IsEqual( const TextAndReading& rTaR1,
                         const css::lang::Locale& rLocale1,
                         const TextAndReading& rTaR2,
                         const css::lang::Locale& rLocale2 ) const
@@ -96,7 +96,7 @@ public:
        return 0 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 );
    }

    inline bool IsLess( const TextAndReading& rTaR1,
    bool IsLess( const TextAndReading& rTaR1,
                        const css::lang::Locale& rLocale1,
                        const TextAndReading& rTaR2,
                        const css::lang::Locale& rLocale2 ) const
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 36f9327..6fe54f9 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -121,12 +121,12 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
    bool mbFollowFormatAllowed : 1;

    void ResetPreps();
    inline void Lock() { mbLocked = true; }
    inline void Unlock() { mbLocked = false; }
    inline void SetWidow( const bool bNew ) { mbWidow = bNew; }
    inline void SetJustWidow( const bool bNew ) { mbJustWidow = bNew; }
    inline void SetEmpty( const bool bNew ) { mbEmpty = bNew; }
    inline void SetFieldFollow( const bool bNew ) { mbFieldFollow = bNew; }
    void Lock() { mbLocked = true; }
    void Unlock() { mbLocked = false; }
    void SetWidow( const bool bNew ) { mbWidow = bNew; }
    void SetJustWidow( const bool bNew ) { mbJustWidow = bNew; }
    void SetEmpty( const bool bNew ) { mbEmpty = bNew; }
    void SetFieldFollow( const bool bNew ) { mbFieldFollow = bNew; }

    bool IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const;

@@ -273,7 +273,7 @@ public:
     * Makes sure that the Frame is not switched (e.g. switched for a
     * character-bound Frame)
     */
    inline bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const
    bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const
            { return GetCursorOfst_( pPos, rPoint, false ); }

    void   PaintExtraData( const SwRect & rRect ) const; /// Page number etc.
@@ -309,22 +309,22 @@ public:
    /// Methods to manage the FollowFrame
    void            SplitFrame( const sal_Int32 nTextPos );
    SwContentFrame *JoinFrame();
    inline sal_Int32  GetOfst() const { return mnOffset; }
    sal_Int32  GetOfst() const { return mnOffset; }
           void        SetOfst_( const sal_Int32 nNewOfst );
    inline void        SetOfst ( const sal_Int32 nNewOfst );
    inline void        ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; }
    void        ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; }
           SwTextFrame   *GetFrameAtPos ( const SwPosition &rPos);
    inline const SwTextFrame *GetFrameAtPos ( const SwPosition &rPos) const;
    SwTextFrame&   GetFrameAtOfst( const sal_Int32 nOfst );
    /// If there's a Follow and we don't contain text ourselves
    inline bool IsEmptyMaster() const
    bool IsEmptyMaster() const
        { return GetFollow() && !GetFollow()->GetOfst(); }

    /// Returns the text portion we want to edit (for inline see underneath)
    const OUString& GetText() const;
    inline SwTextNode *GetTextNode()
    SwTextNode *GetTextNode()
        { return static_cast< SwTextNode* >( SwContentFrame::GetNode()); }
    inline const SwTextNode *GetTextNode() const
    const SwTextNode *GetTextNode() const
        { return static_cast< const SwTextNode* >( SwContentFrame::GetNode()); }

    SwTextFrame(SwTextNode * const, SwFrame* );
@@ -377,26 +377,26 @@ public:
    DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrame)

    // Locking
    inline bool IsLocked()      const { return mbLocked;     }
    bool IsLocked()      const { return mbLocked;     }

    inline bool IsWidow()       const { return mbWidow;      }
    inline bool IsJustWidow()   const { return mbJustWidow;  }
    inline bool IsEmpty()       const { return mbEmpty;      }
    inline bool HasFootnote()        const { return mbFootnote;        }
    inline bool IsInFootnoteConnect()const { return mbInFootnoteConnect;}
    inline bool IsFieldFollow() const { return mbFieldFollow;}
    bool IsWidow()       const { return mbWidow;      }
    bool IsJustWidow()   const { return mbJustWidow;  }
    bool IsEmpty()       const { return mbEmpty;      }
    bool HasFootnote()        const { return mbFootnote;        }
    bool IsInFootnoteConnect()const { return mbInFootnoteConnect;}
    bool IsFieldFollow() const { return mbFieldFollow;}

    inline void SetRepaint() const;
    inline void ResetRepaint() const;
    inline bool HasRepaint() const { return mbRepaint; }
    bool HasRepaint() const { return mbRepaint; }
    inline void SetBlinkPor() const;
    inline void ResetBlinkPor() const;
    inline bool HasBlinkPor() const { return mbHasBlinkPortions; }
    inline void SetAnimation() const
    bool HasBlinkPor() const { return mbHasBlinkPortions; }
    void SetAnimation() const
        { const_cast<SwTextFrame*>(this)->mbHasAnimation = true; }
    inline bool HasAnimation() const { return mbHasAnimation; }
    bool HasAnimation() const { return mbHasAnimation; }

    inline bool IsSwapped() const { return mbIsSwapped; }
    bool IsSwapped() const { return mbIsSwapped; }

    /// Does the Frame have a local footnote (in this Frame or Follow)?
#ifdef DBG_UTIL
@@ -422,7 +422,7 @@ public:
                    const sal_Int32 nLen = COMPLETE_STRING );
    inline SwTwips GetFootnoteFrameHeight() const;
    SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote );
    inline const SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ) const
    const SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ) const
    { return const_cast<SwTextFrame *>(this)->FindFootnoteRef( pFootnote ); }
    void ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadLine );

@@ -455,7 +455,7 @@ public:
    SwTextFrame* GetFormatted( bool bForceQuickFormat = false );

    /// Will be moved soon
    inline void SetFootnote( const bool bNew ) { mbFootnote = bNew; }
    void SetFootnote( const bool bNew ) { mbFootnote = bNew; }

    /// Respect the Follows
    inline bool IsInside( const sal_Int32 nPos ) const;
@@ -463,7 +463,7 @@ public:
    const SwBodyFrame   *FindBodyFrame()   const;

    /// DropCaps and selections
    inline bool GetDropRect( SwRect &rRect ) const
    bool GetDropRect( SwRect &rRect ) const
    { return HasPara() && GetDropRect_( rRect ); }

    static SwCache *GetTextCache() { return pTextCache; }
@@ -471,14 +471,14 @@ public:

    static long GetMinPrtLine() { return nMinPrtLine; }

    inline sal_uInt16 GetCacheIdx() const { return mnCacheIndex; }
    inline void   SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; }
    sal_uInt16 GetCacheIdx() const { return mnCacheIndex; }
    void   SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; }

    /// Removes the Line information from the Cache
    void ClearPara();

    /// Am I a FootnoteFrame, with a number at the start of the paragraph?
    inline bool IsFootnoteNumFrame() const
    bool IsFootnoteNumFrame() const
    { return IsInFootnote() && !GetIndPrev() && IsFootnoteNumFrame_(); }

    /**
@@ -495,7 +495,7 @@ public:
     */
    void CalcAdditionalFirstLineOffset();

    inline SwTwips GetAdditionalFirstLineOffset() const
    SwTwips GetAdditionalFirstLineOffset() const
    {
        return mnAdditionalFirstLineOffset;
    }
@@ -591,25 +591,25 @@ public:
     * Calculates the coordinates of a rectangle when switching from
     * RTL to LTR layout
     */
    inline void SwitchRTLtoLTR( SwRect& rRect ) const { SwitchLTRtoRTL( rRect ); }
    void SwitchRTLtoLTR( SwRect& rRect ) const { SwitchLTRtoRTL( rRect ); }

    /**
     * Calculates the coordinates of a point when switching from
     * RTL to LTR layout
     */
    inline void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); };
    void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); };

    inline bool FollowFormatAllowed() const
    bool FollowFormatAllowed() const
    {
        return mbFollowFormatAllowed;
    }

    inline void AllowFollowFormat()
    void AllowFollowFormat()
    {
        mbFollowFormatAllowed = true;
    }

    inline void ForbidFollowFormat()
    void ForbidFollowFormat()
    {
        mbFollowFormatAllowed = false;
    }
@@ -623,7 +623,7 @@ public:

    SwTwips GetBaseVertOffsetForFly(bool bIgnoreFlysAnchoredAtThisFrame) const;

    inline SwTwips GetHeightOfLastLine() const
    SwTwips GetHeightOfLastLine() const
    {
        return mnHeightOfLastLine;
    }
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 87b7b24..0111324 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -211,7 +211,7 @@ public:

    void InitPagePreviewLayout();

    inline SwPagePreviewLayout* PagePreviewLayout()
    SwPagePreviewLayout* PagePreviewLayout()
    {
        return m_pPagePreviewLayout;
    }
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 67b11e1..d0e38a0 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -201,11 +201,11 @@ public:
    virtual SwWrongList* Clone();
    virtual void CopyFrom( const SwWrongList& rCopy );

    inline WrongListType GetWrongListType() const { return meType; }
    inline sal_Int32 GetBeginInv() const { return nBeginInvalid; }
    inline sal_Int32 GetEndInv() const { return nEndInvalid; }
    WrongListType GetWrongListType() const { return meType; }
    sal_Int32 GetBeginInv() const { return nBeginInvalid; }
    sal_Int32 GetEndInv() const { return nEndInvalid; }
    void SetInvalid( sal_Int32 nBegin, sal_Int32 nEnd );
    inline void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; }
    void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; }
    void Invalidate( sal_Int32 nBegin, sal_Int32 nEnd );
    bool InvalidateWrong();
    enum class FreshState { FRESH, CURSOR, NOTHING };
@@ -227,19 +227,19 @@ public:
    // the other wrong list has to be inserted.
    void JoinList( SwWrongList* pNext, sal_Int32 nInsertPos );

    inline sal_Int32 Len( sal_uInt16 nIdx ) const
    sal_Int32 Len( sal_uInt16 nIdx ) const
    {
        return nIdx < maList.size() ? maList[nIdx].mnLen : 0;
    }

    inline sal_Int32 Pos( sal_uInt16 nIdx ) const
    sal_Int32 Pos( sal_uInt16 nIdx ) const
    {
        return nIdx < maList.size() ? maList[nIdx].mnPos : 0;
    }

    inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); }
    sal_uInt16 Count() const { return (sal_uInt16)maList.size(); }

    inline void Insert( const OUString& rType,
    void Insert( const OUString& rType,
                        css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag,
                        sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere )
    {
@@ -256,14 +256,14 @@ public:
                 css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag,
                 sal_Int32 nNewPos, sal_Int32 nNewLen );

    inline SwWrongList* SubList( sal_uInt16 nIdx ) const
    SwWrongList* SubList( sal_uInt16 nIdx ) const
    {
        return nIdx < maList.size() ? maList[nIdx].mpSubList : nullptr;
    }

    void InsertSubList( sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere, SwWrongList* pSubList );

    inline const SwWrongArea* GetElement( sal_uInt16 nIdx ) const
    const SwWrongArea* GetElement( sal_uInt16 nIdx ) const
    {
        return nIdx < maList.size() ? &maList[nIdx] : nullptr;
    }
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index 434e4bc..99455bb 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -47,10 +47,10 @@ class SwPageNumAndTypeOfAnchors
        std::vector< tEntry* > maObjList;

    public:
        inline SwPageNumAndTypeOfAnchors()
        SwPageNumAndTypeOfAnchors()
        {
        }
        inline ~SwPageNumAndTypeOfAnchors()
        ~SwPageNumAndTypeOfAnchors()
        {
            for ( std::vector< tEntry* >::iterator aIter = maObjList.begin();
                  aIter != maObjList.end(); ++aIter )
@@ -60,7 +60,7 @@ class SwPageNumAndTypeOfAnchors
            maObjList.clear();
        }

        inline void Collect( SwAnchoredObject& _rAnchoredObj )
        void Collect( SwAnchoredObject& _rAnchoredObj )
        {
            tEntry* pNewEntry = new tEntry;
            pNewEntry->mpAnchoredObj = &_rAnchoredObj;
@@ -89,7 +89,7 @@ class SwPageNumAndTypeOfAnchors
            maObjList.push_back( pNewEntry );
        }

        inline SwAnchoredObject* operator[]( sal_uInt32 _nIndex )
        SwAnchoredObject* operator[]( sal_uInt32 _nIndex )
        {
            SwAnchoredObject* bRetObj = nullptr;

@@ -101,7 +101,7 @@ class SwPageNumAndTypeOfAnchors
            return bRetObj;
        }

        inline sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const
        sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const
        {
            sal_uInt32 nRetPgNum = 0L;

@@ -114,7 +114,7 @@ class SwPageNumAndTypeOfAnchors
        }

        // --> #i26945#
        inline bool AnchoredAtMaster( sal_uInt32 _nIndex )
        bool AnchoredAtMaster( sal_uInt32 _nIndex )
        {
            bool bAnchoredAtMaster( true );

@@ -126,7 +126,7 @@ class SwPageNumAndTypeOfAnchors
            return bAnchoredAtMaster;
        }

        inline sal_uInt32 Count() const
        sal_uInt32 Count() const
        {
            return maObjList.size();
        }
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index d9dc3c9..fa6b083 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -52,14 +52,14 @@ private:
    public:
        // Ctor, Dtor
        inline SwAttrStack();
        inline ~SwAttrStack() {
        ~SwAttrStack() {
            if ( nSize > INITIAL_NUM_ATTR ) delete [] pArray; }

        // reset stack
        inline void Reset() { nCount = 0; };
        void Reset() { nCount = 0; };

        // insert on top
        inline void Push( const SwTextAttr& rAttr ) { Insert( rAttr, nCount ); };
        void Push( const SwTextAttr& rAttr ) { Insert( rAttr, nCount ); };
        // insert at specified position, take care for not inserting behind
        // the value returned by Count()
        void Insert( const SwTextAttr& rAttr, const sal_uInt16 nPos );
@@ -71,7 +71,7 @@ private:
        const SwTextAttr* Top() const;

        // number of elements on stack
        inline sal_uInt16 Count() const { return nCount; };
        sal_uInt16 Count() const { return nCount; };

        // returns position of rAttr on Stack if found, otherwise USHRT_MAX
        // can be used for Remove of an attribute
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 5fd1529..3697c64 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -744,9 +744,9 @@ class SwSetToRightMargin
{
    bool bRight;
public:
    inline SwSetToRightMargin() : bRight( false ) { }
    inline ~SwSetToRightMargin() { SwTextCursor::SetRightMargin( bRight ); }
    inline void SetRight( const bool bNew ) { bRight = bNew; }
    SwSetToRightMargin() : bRight( false ) { }
    ~SwSetToRightMargin() { SwTextCursor::SetRightMargin( bRight ); }
    void SetRight( const bool bNew ) { bRight = bNew; }
};

bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips nOffset,
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 18f89ad..c30e6a2 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -60,9 +60,9 @@ class FormatLevel
{
    static sal_uInt16 nLevel;
public:
    inline FormatLevel()  { ++nLevel; }
    inline ~FormatLevel() { --nLevel; }
    static inline sal_uInt16 GetLevel() { return nLevel; }
    FormatLevel()  { ++nLevel; }
    ~FormatLevel() { --nLevel; }
    static sal_uInt16 GetLevel() { return nLevel; }
    static bool LastLevel() { return 10 < nLevel; }
};
sal_uInt16 FormatLevel::nLevel = 0;
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 412e5c6..8dfd0fa 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -70,7 +70,7 @@ class SwExtraPainter
    sal_uInt16 nDivider;
    bool bGoLeft;
    bool bLineNum;
    inline bool IsClipChg() { return aClip.IsChg(); }
    bool IsClipChg() { return aClip.IsChg(); }

    SwExtraPainter(const SwExtraPainter&) = delete;
    SwExtraPainter& operator=(const SwExtraPainter&) = delete;
@@ -79,10 +79,10 @@ public:
    SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh,
        const SwLineNumberInfo &rLnInf, const SwRect &rRct,
        sal_Int16 eHor, bool bLnNm );
    inline SwFont* GetFont() const { return pFnt.get(); }
    inline void IncLineNr() { ++nLineNr; }
    inline bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); }
    inline bool HasDivider() { if( !nDivider ) return false;
    SwFont* GetFont() const { return pFnt.get(); }
    void IncLineNr() { ++nLineNr; }
    bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); }
    bool HasDivider() { if( !nDivider ) return false;
        return !(nLineNr % rLineInf.GetDividerCountBy()); }

    void PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed );
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 4b29b09..952d805 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -37,7 +37,7 @@ class SwTextGuess
                               // a field in the text has been expanded
    sal_uInt16 nBreakWidth;    // width of the broken portion
public:
    inline SwTextGuess(): pHanging( nullptr ), nCutPos(0), nBreakStart(0),
    SwTextGuess(): pHanging( nullptr ), nCutPos(0), nBreakStart(0),
                        nBreakPos(0), nFieldDiff(0), nBreakWidth(0)
        { }

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 720d3fb..c7572fd 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -89,14 +89,14 @@ public:
    // #i24363# tab stops relative to indent - returns the tab stop following nSearchPos or NULL
    const SvxTabStop *GetTabStop( const SwTwips nSearchPos,
                                 const SwTwips nRight ) const;
    inline const SvxLineSpacingItem *GetLineSpacing() const { return pSpace; }
    inline sal_uInt16 GetDefTabStop() const { return nDefTabStop; }
    inline void SetDefTabStop( sal_uInt16 nNew ) const
    const SvxLineSpacingItem *GetLineSpacing() const { return pSpace; }
    sal_uInt16 GetDefTabStop() const { return nDefTabStop; }
    void SetDefTabStop( sal_uInt16 nNew ) const
        { const_cast<SwLineInfo*>(this)->nDefTabStop = nNew; }

    // vertical alignment
    inline SvxParaVertAlignItem::Align GetVertAlign() const { return nVertAlign; }
    inline bool HasSpecialAlign( bool bVert ) const
    SvxParaVertAlignItem::Align GetVertAlign() const { return nVertAlign; }
    bool HasSpecialAlign( bool bVert ) const
        { return bVert ?
                 ( SvxParaVertAlignItem::Align::Baseline  != nVertAlign ) :
                 ( SvxParaVertAlignItem::Align::Baseline  != nVertAlign &&
@@ -104,11 +104,11 @@ public:

    sal_uInt16 NumberOfTabStops() const;

    inline bool IsListTabStopIncluded() const
    bool IsListTabStopIncluded() const
    {
        return bListTabStopIncluded;
    }
    inline long GetListTabStopPosition() const
    long GetListTabStopPosition() const
    {
        return nListTabStopPosition;
    }
@@ -201,55 +201,55 @@ public:
    // rPos will set to the end of the multi-line part.
    SwMultiCreator* GetMultiCreator( sal_Int32 &rPos, SwMultiPortion* pM ) const;

    inline bool OnWin() const { return m_bOnWin; }
    inline void SetOnWin( const bool bNew ) { m_bOnWin = bNew; }
    inline bool NotEOL() const { return m_bNotEOL; }
    inline void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; }
    inline bool URLNotify() const { return m_bURLNotify; }
    inline bool StopUnderflow() const { return m_bStopUnderflow; }
    inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
    inline bool IsFootnoteInside() const { return m_bFootnoteInside; }
    inline void SetFootnoteInside( const bool bNew ) { m_bFootnoteInside = bNew; }
    inline bool IsOtherThanFootnoteInside() const { return m_bOtherThanFootnoteInside; }
    inline void SetOtherThanFootnoteInside( const bool bNew ) { m_bOtherThanFootnoteInside = bNew; }
    inline bool IsMulti() const { return m_bMulti; }
    inline void SetMulti( const bool bNew ) { m_bMulti = bNew; }
    inline bool IsFirstMulti() const { return m_bFirstMulti; }
    inline void SetFirstMulti( const bool bNew ) { m_bFirstMulti = bNew; }
    inline bool IsRuby() const { return m_bRuby; }
    inline void SetRuby( const bool bNew ) { m_bRuby = bNew; }
    inline bool IsHanging() const { return m_bHanging; }
    inline void SetHanging( const bool bNew ) { m_bHanging = bNew; }
    inline bool HasScriptSpace() const { return m_bScriptSpace; }
    inline void SetScriptSpace( const bool bNew ) { m_bScriptSpace = bNew; }
    inline bool HasForbiddenChars() const { return m_bForbiddenChars; }
    inline void SetForbiddenChars( const bool bN ) { m_bForbiddenChars = bN; }
    inline bool SnapToGrid() const { return m_bSnapToGrid; }
    inline void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; }
    inline sal_uInt8 GetDirection() const { return m_nDirection; }
    inline void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; }
    inline bool IsRotated() const { return ( 1 & m_nDirection ); }
    bool OnWin() const { return m_bOnWin; }
    void SetOnWin( const bool bNew ) { m_bOnWin = bNew; }
    bool NotEOL() const { return m_bNotEOL; }
    void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; }
    bool URLNotify() const { return m_bURLNotify; }
    bool StopUnderflow() const { return m_bStopUnderflow; }
    void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
    bool IsFootnoteInside() const { return m_bFootnoteInside; }
    void SetFootnoteInside( const bool bNew ) { m_bFootnoteInside = bNew; }
    bool IsOtherThanFootnoteInside() const { return m_bOtherThanFootnoteInside; }
    void SetOtherThanFootnoteInside( const bool bNew ) { m_bOtherThanFootnoteInside = bNew; }
    bool IsMulti() const { return m_bMulti; }
    void SetMulti( const bool bNew ) { m_bMulti = bNew; }
    bool IsFirstMulti() const { return m_bFirstMulti; }
    void SetFirstMulti( const bool bNew ) { m_bFirstMulti = bNew; }
    bool IsRuby() const { return m_bRuby; }
    void SetRuby( const bool bNew ) { m_bRuby = bNew; }
    bool IsHanging() const { return m_bHanging; }
    void SetHanging( const bool bNew ) { m_bHanging = bNew; }
    bool HasScriptSpace() const { return m_bScriptSpace; }
    void SetScriptSpace( const bool bNew ) { m_bScriptSpace = bNew; }
    bool HasForbiddenChars() const { return m_bForbiddenChars; }
    void SetForbiddenChars( const bool bN ) { m_bForbiddenChars = bN; }
    bool SnapToGrid() const { return m_bSnapToGrid; }
    void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; }
    sal_uInt8 GetDirection() const { return m_nDirection; }
    void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; }
    bool IsRotated() const { return ( 1 & m_nDirection ); }

    inline SwViewShell *GetVsh() { return m_pVsh; }
    inline const SwViewShell *GetVsh() const { return m_pVsh; }
    SwViewShell *GetVsh() { return m_pVsh; }
    const SwViewShell *GetVsh() const { return m_pVsh; }

    inline vcl::RenderContext *GetOut() { return m_pOut; }
    inline const vcl::RenderContext *GetOut() const { return m_pOut; }
    inline void SetOut( OutputDevice* pNewOut ) { m_pOut = pNewOut; }
    vcl::RenderContext *GetOut() { return m_pOut; }
    const vcl::RenderContext *GetOut() const { return m_pOut; }
    void SetOut( OutputDevice* pNewOut ) { m_pOut = pNewOut; }

    inline vcl::RenderContext *GetRefDev() { return m_pRef; }
    inline const vcl::RenderContext *GetRefDev() const { return m_pRef; }
    vcl::RenderContext *GetRefDev() { return m_pRef; }
    const vcl::RenderContext *GetRefDev() const { return m_pRef; }

    inline SwFont *GetFont() { return m_pFnt; }
    inline const SwFont *GetFont() const { return m_pFnt; }
    inline void SetFont( SwFont *pNew ) { m_pFnt = pNew; }
    SwFont *GetFont() { return m_pFnt; }
    const SwFont *GetFont() const { return m_pFnt; }
    void SetFont( SwFont *pNew ) { m_pFnt = pNew; }
    void SelectFont();
    inline void SetUnderFnt( SwUnderlineFont* pNew ) { m_pUnderFnt = pNew; }
    inline SwUnderlineFont* GetUnderFnt() const { return m_pUnderFnt; }
    void SetUnderFnt( SwUnderlineFont* pNew ) { m_pUnderFnt = pNew; }
    SwUnderlineFont* GetUnderFnt() const { return m_pUnderFnt; }

    inline const  SwViewOption &GetOpt() const { return *m_pOpt; }
    inline const OUString &GetText() const { return *m_pText; }
    inline sal_Unicode GetChar( const sal_Int32 nPos ) const {
    const  SwViewOption &GetOpt() const { return *m_pOpt; }
    const OUString &GetText() const { return *m_pText; }
    sal_Unicode GetChar( const sal_Int32 nPos ) const {
        if (m_pText && nPos < m_pText->getLength()) return (*m_pText)[ nPos ];
        return 0;
    }
@@ -280,23 +280,23 @@ public:

    sal_uInt16 GetAscent() const;

    inline sal_Int32 GetIdx() const { return m_nIdx; }
    inline void SetIdx( const sal_Int32 nNew ) { m_nIdx = nNew; }
    inline sal_Int32 GetLen() const { return m_nLen; }
    inline void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; }
    inline void SetText( const OUString &rNew ){ m_pText = &rNew; }
    sal_Int32 GetIdx() const { return m_nIdx; }
    void SetIdx( const sal_Int32 nNew ) { m_nIdx = nNew; }
    sal_Int32 GetLen() const { return m_nLen; }
    void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; }
    void SetText( const OUString &rNew ){ m_pText = &rNew; }

    // No Bullets for the symbol font!
    inline bool IsNoSymbol() const
    bool IsNoSymbol() const
    { return RTL_TEXTENCODING_SYMBOL != m_pFnt->GetCharSet( m_pFnt->GetActual() ); }

    void NoteAnimation() const;

    // Home is where Your heart is...
    inline SwTextFrame *GetTextFrame() { return m_pFrame; }
    inline const SwTextFrame *GetTextFrame() const { return m_pFrame; }
    SwTextFrame *GetTextFrame() { return m_pFrame; }
    const SwTextFrame *GetTextFrame() const { return m_pFrame; }

    inline bool HasHint( sal_Int32 nPos ) const
    bool HasHint( sal_Int32 nPos ) const
        { return HasHint_( m_pFrame->GetTextNode(), nPos ); }
    static bool HasHint_( const SwTextNode* pTextNode, sal_Int32 nPos );

@@ -305,11 +305,11 @@ public:
    // space among compressed kanas.
    // During formatting, the maximum values of compressable portions are
    // stored in m_aMaxWidth and discarded after a line has been formatted.
    inline void SetMaxWidthDiff( const void *nKey, sal_uInt16 nVal )
    void SetMaxWidthDiff( const void *nKey, sal_uInt16 nVal )
    {
        m_aMaxWidth.insert( std::make_pair( reinterpret_cast<sal_uIntPtr>(nKey), nVal ) );
    };
    inline sal_uInt16 GetMaxWidthDiff( const void *nKey )
    sal_uInt16 GetMaxWidthDiff( const void *nKey )
    {
        SwTextPortionMap::iterator it = m_aMaxWidth.find( reinterpret_cast<sal_uIntPtr>(nKey) );

@@ -318,24 +318,24 @@ public:
        else
            return 0;
    };
    inline void ResetMaxWidthDiff()
    void ResetMaxWidthDiff()
    {
        m_aMaxWidth.clear();
    };
    inline bool CompressLine()
    bool CompressLine()
    {
        return !m_aMaxWidth.empty();
    };

    // Feature: Kana Compression

    inline sal_uInt16 GetKanaIdx() const { return m_nKanaIdx; }
    inline void ResetKanaIdx(){ m_nKanaIdx = 0; }
    inline void SetKanaIdx( sal_uInt16 nNew ) { m_nKanaIdx = nNew; }
    inline void IncKanaIdx() { ++m_nKanaIdx; }
    inline void SetKanaComp( std::deque<sal_uInt16> *pNew ){ m_pKanaComp = pNew; }
    inline std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; }
    inline sal_uInt16 GetKanaComp() const
    sal_uInt16 GetKanaIdx() const { return m_nKanaIdx; }
    void ResetKanaIdx(){ m_nKanaIdx = 0; }
    void SetKanaIdx( sal_uInt16 nNew ) { m_nKanaIdx = nNew; }
    void IncKanaIdx() { ++m_nKanaIdx; }
    void SetKanaComp( std::deque<sal_uInt16> *pNew ){ m_pKanaComp = pNew; }
    std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; }
    sal_uInt16 GetKanaComp() const
        { return ( m_pKanaComp && m_nKanaIdx < m_pKanaComp->size() )
                   ? (*m_pKanaComp)[m_nKanaIdx] : 0; }

@@ -390,13 +390,13 @@ public:

    SwTextPaintInfo( SwTextFrame *pFrame, const SwRect &rPaint );

    inline SwTwips X() const { return aPos.X(); }
    inline void X( const long nNew ) { aPos.X() = nNew; }
    inline SwTwips Y() const { return aPos.Y(); }
    inline void Y( const SwTwips nNew ) { aPos.Y() = nNew; }
    SwTwips X() const { return aPos.X(); }
    void X( const long nNew ) { aPos.X() = nNew; }
    SwTwips Y() const { return aPos.Y(); }
    void Y( const SwTwips nNew ) { aPos.Y() = nNew; }

    inline SwTextFly& GetTextFly() { return aTextFly; }
    inline const SwTextFly& GetTextFly() const { return aTextFly; }
    SwTextFly& GetTextFly() { return aTextFly; }
    const SwTextFly& GetTextFly() const { return aTextFly; }
    inline void DrawText( const OUString &rText, const SwLinePortion &rPor,
                          const sal_Int32 nIdx = 0,
                          const sal_Int32 nLen = COMPLETE_STRING,
@@ -427,7 +427,7 @@ public:

    void DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const;

    inline void NotifyURL( const SwLinePortion &rPor ) const
    void NotifyURL( const SwLinePortion &rPor ) const
        { if( URLNotify() ) NotifyURL_( rPor ); }

    /**
@@ -443,33 +443,33 @@ public:

    inline SwTwips GetPaintOfst() const;
    inline void SetPaintOfst( const SwTwips nNew );
    inline const Point &GetPos() const { return aPos; }
    inline void SetPos( const Point &rNew ) { aPos = rNew; }
    const Point &GetPos() const { return aPos; }
    void SetPos( const Point &rNew ) { aPos = rNew; }

    inline const SwRect &GetPaintRect() const { return aPaintRect; }
    const SwRect &GetPaintRect() const { return aPaintRect; }

    // STUFF FOR JUSTIFIED ALIGNMENT

    inline sal_uInt16 GetSpaceIdx() const { return nSpaceIdx; }
    inline void ResetSpaceIdx(){nSpaceIdx = 0; }
    inline void SetSpaceIdx( sal_uInt16 nNew ) { nSpaceIdx = nNew; }
    inline void IncSpaceIdx() { ++nSpaceIdx; }
    inline void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); }
    inline long GetSpaceAdd() const
    sal_uInt16 GetSpaceIdx() const { return nSpaceIdx; }
    void ResetSpaceIdx(){nSpaceIdx = 0; }
    void SetSpaceIdx( sal_uInt16 nNew ) { nSpaceIdx = nNew; }
    void IncSpaceIdx() { ++nSpaceIdx; }
    void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); }
    long GetSpaceAdd() const
        { return ( pSpaceAdd && nSpaceIdx < pSpaceAdd->size() )
                   ? (*pSpaceAdd)[nSpaceIdx] : 0; }

    inline void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; }
    inline std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; }
    void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; }
    std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; }

    inline void SetWrongList( const SwWrongList *pNew ){ pWrongList = pNew; }
    inline const SwWrongList* GetpWrongList() const { return pWrongList; }
    void SetWrongList( const SwWrongList *pNew ){ pWrongList = pNew; }
    const SwWrongList* GetpWrongList() const { return pWrongList; }

    inline void SetGrammarCheckList( const SwWrongList *pNew ){ pGrammarCheckList = pNew; }
    inline const SwWrongList* GetGrammarCheckList() const { return pGrammarCheckList; }
    void SetGrammarCheckList( const SwWrongList *pNew ){ pGrammarCheckList = pNew; }
    const SwWrongList* GetGrammarCheckList() const { return pGrammarCheckList; }

    inline void SetSmartTags( const SwWrongList *pNew ){ pSmartTags = pNew; }
    inline const SwWrongList* GetSmartTags() const { return pSmartTags; }
    void SetSmartTags( const SwWrongList *pNew ){ pSmartTags = pNew; }
    const SwWrongList* GetSmartTags() const { return pSmartTags; }
};

class SwTextFormatInfo : public SwTextPaintInfo
@@ -542,112 +542,112 @@ public:
    SwTextFormatInfo( const SwTextFormatInfo& rInf, SwLineLayout& rLay,
        SwTwips nActWidth );

    inline sal_uInt16 Width() const { return m_nWidth; }
    inline void Width( const sal_uInt16 nNew ) { m_nWidth = nNew; }
    sal_uInt16 Width() const { return m_nWidth; }
    void Width( const sal_uInt16 nNew ) { m_nWidth = nNew; }
           void Init();

    // Returns the first changed position of the paragraph
    inline sal_Int32 GetReformatStart() const;

    // Margins
    inline SwTwips Left() const { return m_nLeft; }
    inline void Left( const SwTwips nNew ) { m_nLeft = nNew; }
    inline SwTwips Right() const { return m_nRight; }
    inline void Right( const SwTwips nNew ) { m_nRight = nNew; }
    inline SwTwips First() const { return m_nFirst; }
    inline void First( const SwTwips nNew ) { m_nFirst = nNew; }
    inline sal_uInt16 RealWidth() const { return m_nRealWidth; }
    inline void RealWidth( const sal_uInt16 nNew ) { m_nRealWidth = nNew; }
    inline sal_uInt16 ForcedLeftMargin() const { return m_nForcedLeftMargin; }
    inline void ForcedLeftMargin( const sal_uInt16 nN ) { m_nForcedLeftMargin = nN; }
    SwTwips Left() const { return m_nLeft; }
    void Left( const SwTwips nNew ) { m_nLeft = nNew; }
    SwTwips Right() const { return m_nRight; }
    void Right( const SwTwips nNew ) { m_nRight = nNew; }
    SwTwips First() const { return m_nFirst; }
    void First( const SwTwips nNew ) { m_nFirst = nNew; }
    sal_uInt16 RealWidth() const { return m_nRealWidth; }
    void RealWidth( const sal_uInt16 nNew ) { m_nRealWidth = nNew; }
    sal_uInt16 ForcedLeftMargin() const { return m_nForcedLeftMargin; }
    void ForcedLeftMargin( const sal_uInt16 nN ) { m_nForcedLeftMargin = nN; }

    inline sal_uInt8 &MaxHyph() { return m_nMaxHyph; }
    inline const sal_uInt8 &MaxHyph() const { return m_nMaxHyph; }
    sal_uInt8 &MaxHyph() { return m_nMaxHyph; }
    const sal_uInt8 &MaxHyph() const { return m_nMaxHyph; }

    inline SwLineLayout *GetRoot() { return m_pRoot; }
    inline const SwLineLayout *GetRoot() const { return m_pRoot; }
    SwLineLayout *GetRoot() { return m_pRoot; }
    const SwLineLayout *GetRoot() const { return m_pRoot; }

    inline void SetRoot( SwLineLayout *pNew ) { m_pRoot = pNew; }
    inline SwLinePortion *GetLast() { return m_pLast; }
    inline void SetLast( SwLinePortion *pNewLast ) { m_pLast = pNewLast; }
    inline bool IsFull() const { return m_bFull; }
    inline void SetFull( const bool bNew ) { m_bFull = bNew; }
    inline bool IsHyphForbud() const
    void SetRoot( SwLineLayout *pNew ) { m_pRoot = pNew; }
    SwLinePortion *GetLast() { return m_pLast; }
    void SetLast( SwLinePortion *pNewLast ) { m_pLast = pNewLast; }
    bool IsFull() const { return m_bFull; }
    void SetFull( const bool bNew ) { m_bFull = bNew; }
    bool IsHyphForbud() const
        { return m_pFly ? m_bNoMidHyph : m_bNoEndHyph; }
    inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid )
    void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid )
        { m_bNoEndHyph = (m_nMaxHyph && bEnd >= m_nMaxHyph);
          m_bNoMidHyph = (m_nMaxHyph && bMid >= m_nMaxHyph); }
    inline bool IsIgnoreFly() const { return m_bIgnoreFly; }
    inline void SetIgnoreFly( const bool bNew ) { m_bIgnoreFly = bNew; }
    inline bool IsFakeLineStart() const { return m_bFakeLineStart; }
    inline void SetFakeLineStart( const bool bNew ) { m_bFakeLineStart = bNew; }
    inline bool IsStop() const { return m_bStop; }
    inline void SetStop( const bool bNew ) { m_bStop = bNew; }
    inline SwLinePortion *GetRest() { return m_pRest; }
    inline void SetRest( SwLinePortion *pNewRest ) { m_pRest = pNewRest; }
    inline bool IsNewLine() const { return m_bNewLine; }
    inline void SetNewLine( const bool bNew ) { m_bNewLine = bNew; }
    inline bool IsShift() const { return m_bShift; }
    inline void SetShift( const bool bNew ) { m_bShift = bNew; }
    inline bool IsInterHyph() const { return m_bInterHyph; }
    inline bool IsUnderflow() const { return m_bUnderflow; }
    inline void ClrUnderflow() { m_bUnderflow = false; }
    inline bool IsDropInit() const { return m_bDropInit; }
    inline void SetDropInit( const bool bNew ) { m_bDropInit = bNew; }
    inline bool IsQuick() const { return m_bQuick; }
    inline bool IsTest() const { return m_bTestFormat; }
    bool IsIgnoreFly() const { return m_bIgnoreFly; }
    void SetIgnoreFly( const bool bNew ) { m_bIgnoreFly = bNew; }
    bool IsFakeLineStart() const { return m_bFakeLineStart; }
    void SetFakeLineStart( const bool bNew ) { m_bFakeLineStart = bNew; }
    bool IsStop() const { return m_bStop; }
    void SetStop( const bool bNew ) { m_bStop = bNew; }
    SwLinePortion *GetRest() { return m_pRest; }
    void SetRest( SwLinePortion *pNewRest ) { m_pRest = pNewRest; }
    bool IsNewLine() const { return m_bNewLine; }
    void SetNewLine( const bool bNew ) { m_bNewLine = bNew; }
    bool IsShift() const { return m_bShift; }
    void SetShift( const bool bNew ) { m_bShift = bNew; }
    bool IsInterHyph() const { return m_bInterHyph; }
    bool IsUnderflow() const { return m_bUnderflow; }
    void ClrUnderflow() { m_bUnderflow = false; }
    bool IsDropInit() const { return m_bDropInit; }
    void SetDropInit( const bool bNew ) { m_bDropInit = bNew; }
    bool IsQuick() const { return m_bQuick; }
    bool IsTest() const { return m_bTestFormat; }

    inline sal_Int32 GetLineStart() const { return m_nLineStart; }
    inline void SetLineStart( const sal_Int32 nNew ) { m_nLineStart = nNew; }
    sal_Int32 GetLineStart() const { return m_nLineStart; }
    void SetLineStart( const sal_Int32 nNew ) { m_nLineStart = nNew; }

    // these are used during fly calculation
    inline sal_uInt16 GetLineHeight() const { return m_nLineHeight; }
    inline void SetLineHeight( const sal_uInt16 nNew ) { m_nLineHeight = nNew; }
    inline sal_uInt16 GetLineNetHeight() const { return m_nLineNetHeight; }
    inline void SetLineNetHeight( const sal_uInt16 nNew ) { m_nLineNetHeight = nNew; }
    sal_uInt16 GetLineHeight() const { return m_nLineHeight; }
    void SetLineHeight( const sal_uInt16 nNew ) { m_nLineHeight = nNew; }
    sal_uInt16 GetLineNetHeight() const { return m_nLineNetHeight; }
    void SetLineNetHeight( const sal_uInt16 nNew ) { m_nLineNetHeight = nNew; }

    inline const SwLinePortion *GetUnderflow() const { return m_pUnderflow; }
    inline SwLinePortion *GetUnderflow() { return m_pUnderflow; }
    inline void SetUnderflow( SwLinePortion *pNew )
    const SwLinePortion *GetUnderflow() const { return m_pUnderflow; }
    SwLinePortion *GetUnderflow() { return m_pUnderflow; }
    void SetUnderflow( SwLinePortion *pNew )
           { m_pUnderflow = pNew; m_bUnderflow = true; }
    inline sal_Int32 GetSoftHyphPos() const { return m_nSoftHyphPos; }
    inline void SetSoftHyphPos( const sal_Int32 nNew ) { m_nSoftHyphPos = nNew; }
    sal_Int32 GetSoftHyphPos() const { return m_nSoftHyphPos; }
    void SetSoftHyphPos( const sal_Int32 nNew ) { m_nSoftHyphPos = nNew; }

    inline void SetParaFootnote();

    // FlyFrames
    inline SwFlyPortion *GetFly() { return m_pFly; }
    inline void SetFly( SwFlyPortion *pNew ) { m_pFly = pNew; }
    SwFlyPortion *GetFly() { return m_pFly; }
    void SetFly( SwFlyPortion *pNew ) { m_pFly = pNew; }

    inline const SwAttrSet& GetCharAttr() const;

    // Tabs
    inline SwTabPortion *GetLastTab() { return m_pLastTab; }
    inline void SetLastTab( SwTabPortion *pNew ) { m_pLastTab = pNew; }
    inline sal_Unicode GetTabDecimal() const { return m_cTabDecimal; }
    inline void SetTabDecimal( const sal_Unicode cNew ) { m_cTabDecimal = cNew;}
    SwTabPortion *GetLastTab() { return m_pLastTab; }
    void SetLastTab( SwTabPortion *pNew ) { m_pLastTab = pNew; }
    sal_Unicode GetTabDecimal() const { return m_cTabDecimal; }
    void SetTabDecimal( const sal_Unicode cNew ) { m_cTabDecimal = cNew;}

    inline void ClearHookChar() { m_cHookChar = 0; }
    inline void SetHookChar( const sal_Unicode cNew ) { m_cHookChar = cNew; }
    inline sal_Unicode GetHookChar() const { return m_cHookChar; }
    void ClearHookChar() { m_cHookChar = 0; }
    void SetHookChar( const sal_Unicode cNew ) { m_cHookChar = cNew; }
    sal_Unicode GetHookChar() const { return m_cHookChar; }

    // Done-Flags
    inline bool IsFootnoteDone() const { return m_bFootnoteDone; }
    inline void SetFootnoteDone( const bool bNew ) { m_bFootnoteDone = bNew; }
    inline bool IsErgoDone() const { return m_bErgoDone; }
    inline void SetErgoDone( const bool bNew ) { m_bErgoDone = bNew; }
    inline bool IsNumDone() const { return m_bNumDone; }
    inline void SetNumDone( const bool bNew ) { m_bNumDone = bNew; }
    inline bool IsArrowDone() const { return m_bArrowDone; }
    inline void SetArrowDone( const bool bNew ) { m_bArrowDone = bNew; }
    bool IsFootnoteDone() const { return m_bFootnoteDone; }
    void SetFootnoteDone( const bool bNew ) { m_bFootnoteDone = bNew; }
    bool IsErgoDone() const { return m_bErgoDone; }
    void SetErgoDone( const bool bNew ) { m_bErgoDone = bNew; }
    bool IsNumDone() const { return m_bNumDone; }
    void SetNumDone( const bool bNew ) { m_bNumDone = bNew; }
    bool IsArrowDone() const { return m_bArrowDone; }
    void SetArrowDone( const bool bNew ) { m_bArrowDone = bNew; }

    // For SwTextPortion::Hyphenate
    bool ChgHyph( const bool bNew );

    // Should the hyphenate helper be discarded?
    bool IsHyphenate() const;
    inline sal_Int32 GetUnderScorePos() const { return m_nUnderScorePos; }
    inline void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; }
    sal_Int32 GetUnderScorePos() const { return m_nUnderScorePos; }
    void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; }

    // Calls HyphenateWord() of Hyphenator
    css::uno::Reference< css::linguistic2::XHyphenatedWord >
@@ -667,8 +667,8 @@ public:
    // Return: Position; sets cHookChar if necessary
    sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd );

    inline void SetTabOverflow( bool bOverflow ) { m_bTabOverflow = bOverflow; }
    inline bool IsTabOverflow() { return m_bTabOverflow; }
    void SetTabOverflow( bool bOverflow ) { m_bTabOverflow = bOverflow; }
    bool IsTabOverflow() { return m_bTabOverflow; }

};

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 32c5035..3f82067 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -813,7 +813,7 @@ void SwTextFormatter::CalcAscent( SwTextFormatInfo &rInf, SwLinePortion *pPor )
class SwMetaPortion : public SwTextPortion
{
public:
    inline  SwMetaPortion() { SetWhichPor( POR_META ); }
    SwMetaPortion() { SetWhichPor( POR_META ); }
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
//    OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index efa2673..a47b9078 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -51,11 +51,11 @@ public:
    // surrounding SwBidiPortion
    void PaintMultiPortion( const SwRect &rPaint, SwMultiPortion& rMulti,
                            const SwMultiPortion* pEnvPor = nullptr );
    inline void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; }
    inline bool IsPaintDrop() const { return bPaintDrop; }
    inline SwTextPaintInfo &GetInfo()
    void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; }
    bool IsPaintDrop() const { return bPaintDrop; }
    SwTextPaintInfo &GetInfo()
        { return static_cast<SwTextPaintInfo&>(SwTextIter::GetInfo()); }
    inline const SwTextPaintInfo &GetInfo() const
    const SwTextPaintInfo &GetInfo() const
        { return static_cast<const SwTextPaintInfo&>(SwTextIter::GetInfo()); }
};

diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 97a119d..3501ffd 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -81,23 +81,23 @@ public:
    {
        CtorInitTextIter(pTextFrame, pTextInf);
    }
    inline const SwLineLayout *GetCurr() const { return m_pCurr; } // NEVER 0!
    inline const SwLineLayout *GetNext() const { return m_pCurr->GetNext(); }
    const SwLineLayout *GetCurr() const { return m_pCurr; } // NEVER 0!
    const SwLineLayout *GetNext() const { return m_pCurr->GetNext(); }
           const SwLineLayout *GetPrev();
    inline sal_Int32 GetLength() const { return m_pCurr->GetLen(); }
    inline sal_uInt16 GetLineNr() const { return m_nLineNr; }
    inline sal_Int32 GetStart() const { return m_nStart; }
    inline sal_Int32 GetEnd() const { return GetStart() + GetLength(); }
    inline SwTwips Y() const { return m_nY; }
    sal_Int32 GetLength() const { return m_pCurr->GetLen(); }
    sal_uInt16 GetLineNr() const { return m_nLineNr; }
    sal_Int32 GetStart() const { return m_nStart; }
    sal_Int32 GetEnd() const { return GetStart() + GetLength(); }
    SwTwips Y() const { return m_nY; }

    inline SwTwips RegStart() const { return m_nRegStart; }
    inline sal_uInt16 RegDiff() const { return m_nRegDiff; }
    inline bool IsRegisterOn() const { return m_bRegisterOn; }
    SwTwips RegStart() const { return m_nRegStart; }
    sal_uInt16 RegDiff() const { return m_nRegDiff; }
    bool IsRegisterOn() const { return m_bRegisterOn; }

    inline SwTextInfo &GetInfo() { return *m_pInf; }
    inline const SwTextInfo &GetInfo() const { return *m_pInf; }
    SwTextInfo &GetInfo() { return *m_pInf; }
    const SwTextInfo &GetInfo() const { return *m_pInf; }

    inline void Top() { Init(); }
    void Top() { Init(); }
    void Bottom();
    const SwLineLayout *Next();
    const SwLineLayout *Prev();
@@ -114,26 +114,26 @@ public:
    // Truncates all after pCurr
    void TruncLines( bool bNoteFollow = false );

    inline sal_uInt16 GetLineHeight() const { return m_pCurr->GetRealHeight(); }
    sal_uInt16 GetLineHeight() const { return m_pCurr->GetRealHeight(); }
    void CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) const;

    // Lots of trouble for querying pCurr == pPara
    inline bool IsFirstTextLine() const
    bool IsFirstTextLine() const
    { return m_nStart == GetInfo().GetTextStart() &&
        !( m_pCurr->IsDummy() && GetNextLine() ); }

    // Replacement for the old IsFirstLine()
    inline bool IsParaLine() const
    bool IsParaLine() const
        { return m_pCurr == m_pInf->GetParaPortion(); }

    const SwLineInfo &GetLineInfo() const { return m_aLineInf; }
    inline SwTwips GetFirstPos() const { return m_nFrameStart; }
    SwTwips GetFirstPos() const { return m_nFrameStart; }
    inline bool SeekAndChg( SwTextSizeInfo &rInf );
    inline bool SeekAndChgBefore( SwTextSizeInfo &rInf );
    inline bool SeekStartAndChg( SwTextSizeInfo &rInf, const bool bPara=false );

    inline SwTextFrame *GetTextFrame() { return m_pFrame; }
    inline const SwTextFrame *GetTextFrame() const { return m_pFrame; }
    SwTextFrame *GetTextFrame() { return m_pFrame; }
    const SwTextFrame *GetTextFrame() const { return m_pFrame; }

    // Counts consecutive hyphens in order to be within the boundary given by MaxHyphens
    void CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const;
@@ -155,7 +155,7 @@ private:

protected:
    // For FormatQuoVadis
    inline void Right( const SwTwips nNew ) { nRight = nNew; }
    void Right( const SwTwips nNew ) { nRight = nNew; }

    void CtorInitTextMargin( SwTextFrame *pFrame, SwTextSizeInfo *pInf );
    explicit SwTextMargin(SwTextNode* pTextNode)
@@ -179,34 +179,34 @@ public:
    }
    inline SwTwips GetLeftMargin() const;
    inline SwTwips Left() const;
    inline SwTwips Right() const { return nRight; }
    inline SwTwips FirstLeft() const { return nFirst; }
    inline SwTwips CurrWidth() const { return m_pCurr->PrtWidth(); }
    SwTwips Right() const { return nRight; }
    SwTwips FirstLeft() const { return nFirst; }
    SwTwips CurrWidth() const { return m_pCurr->PrtWidth(); }
           SwTwips GetLineStart() const;
    inline SwTwips GetLineEnd() const { return GetLineStart() + CurrWidth(); }
    inline Point GetTopLeft() const { return Point( GetLineStart(), Y() ); }
    inline bool IsOneBlock() const { return m_bOneBlock; }
    inline bool IsLastBlock() const { return m_bLastBlock; }
    inline bool IsLastCenter() const { return m_bLastCenter; }
    inline sal_uInt16 GetAdjust() const { return nAdjust; }
    inline sal_uInt16 GetLineWidth() const
    SwTwips GetLineEnd() const { return GetLineStart() + CurrWidth(); }
    Point GetTopLeft() const { return Point( GetLineStart(), Y() ); }
    bool IsOneBlock() const { return m_bOneBlock; }
    bool IsLastBlock() const { return m_bLastBlock; }
    bool IsLastCenter() const { return m_bLastCenter; }
    sal_uInt16 GetAdjust() const { return nAdjust; }
    sal_uInt16 GetLineWidth() const
           { return sal_uInt16( Right() - GetLeftMargin() + 1 ); }
    inline SwTwips GetLeftMin() const { return nFirst < nLeft ? nFirst : nLeft; }
    inline bool HasNegFirst() const { return nFirst < nLeft; }
    SwTwips GetLeftMin() const { return nFirst < nLeft ? nFirst : nLeft; }
    bool HasNegFirst() const { return nFirst < nLeft; }

    // #i91133#
    inline SwTwips GetTabLeft() const
    SwTwips GetTabLeft() const
    {
        return mnTabLeft;
    }
    // DropCaps
    inline sal_uInt16 GetDropLines() const { return nDropLines; }
    inline void SetDropLines( const sal_uInt16 nNew ) { nDropLines = nNew; }
    inline sal_uInt16 GetDropLeft() const { return nDropLeft; }
    inline sal_uInt16 GetDropHeight() const { return nDropHeight; }
    inline void SetDropHeight( const sal_uInt16 nNew ) { nDropHeight = nNew; }
    inline sal_uInt16 GetDropDescent() const { return nDropDescent; }
    inline void SetDropDescent( const sal_uInt16 nNew ) { nDropDescent = nNew; }
    sal_uInt16 GetDropLines() const { return nDropLines; }
    void SetDropLines( const sal_uInt16 nNew ) { nDropLines = nNew; }
    sal_uInt16 GetDropLeft() const { return nDropLeft; }
    sal_uInt16 GetDropHeight() const { return nDropHeight; }
    void SetDropHeight( const sal_uInt16 nNew ) { nDropHeight = nNew; }
    sal_uInt16 GetDropDescent() const { return nDropDescent; }
    void SetDropDescent( const sal_uInt16 nNew ) { nDropDescent = nNew; }
    void DropInit();

    // Returns the TextPos for start and end of the current line without whitespace
@@ -214,9 +214,9 @@ public:
    sal_Int32 GetTextStart() const;
    sal_Int32 GetTextEnd() const;

    inline SwTextSizeInfo &GetInfo()
    SwTextSizeInfo &GetInfo()
        { return static_cast<SwTextSizeInfo&>(SwTextIter::GetInfo()); }
    inline const SwTextSizeInfo &GetInfo() const
    const SwTextSizeInfo &GetInfo() const
        { return static_cast<const SwTextSizeInfo&>(SwTextIter::GetInfo()); }

};
@@ -248,7 +248,7 @@ public:
    void CalcAdjLine( SwLineLayout *pCurr );

    // For adjusting afterwards
    inline void GetAdjusted() const
    void GetAdjusted() const
    {
        if( m_pCurr->IsFormatAdj() )
            const_cast<SwTextAdjuster*>(this)->CalcAdjLine( m_pCurr );
@@ -292,8 +292,8 @@ public:
                           sal_uInt16 nPorHeight = 0, sal_uInt16 nAscent = 0,
                           const bool bAutoToCentered = false ) const;

    static inline void SetRightMargin( const bool bNew ){ bRightMargin = bNew; }
    static inline bool IsRightMargin() { return bRightMargin; }
    static void SetRightMargin( const bool bNew ){ bRightMargin = bNew; }
    static bool IsRightMargin() { return bRightMargin; }
};

// Change current output device to printer, this has to be done before
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 05ff5a6..030a9b5 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -45,12 +45,12 @@ public:
            : pFollow( nullptr ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ), m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {};
    ~SwDropPortionPart();

    inline SwDropPortionPart* GetFollow() const { return pFollow; };
    inline void SetFollow( SwDropPortionPart* pNew ) { pFollow = pNew; };
    inline SwFont& GetFont() const { return *pFnt; }
    inline sal_Int32 GetLen() const { return nLen; }
    inline sal_uInt16 GetWidth() const { return nWidth; }
    inline void SetWidth( sal_uInt16 nNew )  { nWidth = nNew; }
    SwDropPortionPart* GetFollow() const { return pFollow; };
    void SetFollow( SwDropPortionPart* pNew ) { pFollow = pNew; };
    SwFont& GetFont() const { return *pFnt; }
    sal_Int32 GetLen() const { return nLen; }
    sal_uInt16 GetWidth() const { return nWidth; }
    void SetWidth( sal_uInt16 nNew )  { nWidth = nNew; }

    bool GetJoinBorderWithPrev() const { return m_bJoinBorderWithPrev; }
    bool GetJoinBorderWithNext() const { return m_bJoinBorderWithNext; }
@@ -85,18 +85,18 @@ public:
    virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
    virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override;

    inline sal_uInt16 GetLines() const { return nLines; }
    inline sal_uInt16 GetDistance() const { return nDistance; }
    inline sal_uInt16 GetDropHeight() const { return nDropHeight; }
    inline sal_uInt16 GetDropDescent() const { return nDropDescent; }
    inline sal_uInt16 GetDropLeft() const { return Width() + nFix; }
    sal_uInt16 GetLines() const { return nLines; }
    sal_uInt16 GetDistance() const { return nDistance; }
    sal_uInt16 GetDropHeight() const { return nDropHeight; }
    sal_uInt16 GetDropDescent() const { return nDropDescent; }
    sal_uInt16 GetDropLeft() const { return Width() + nFix; }

    inline SwDropPortionPart* GetPart() const { return pPart; }
    inline void SetPart( SwDropPortionPart* pNew ) { pPart = pNew; }
    SwDropPortionPart* GetPart() const { return pPart; }
    void SetPart( SwDropPortionPart* pNew ) { pPart = pNew; }

    inline void SetY( short nNew )  { nY = nNew; }
    void SetY( short nNew )  { nY = nNew; }

    inline SwFont* GetFnt() const { return pPart ? &pPart->GetFont() : nullptr; }
    SwFont* GetFnt() const { return pPart ? &pPart->GetFont() : nullptr; }

    static void DeleteDropCapCache();

diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 60b1017..26888365 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -25,7 +25,7 @@
class SwExpandPortion : public SwTextPortion
{
public:
    inline  SwExpandPortion() { SetWhichPor( POR_EXP ); }
    SwExpandPortion() { SetWhichPor( POR_EXP ); }
    virtual bool Format( SwTextFormatInfo &rInf ) override;
    virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override;
    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
@@ -43,7 +43,7 @@ class SwBlankPortion : public SwExpandPortion
    sal_Unicode cChar;
    bool bMulti;        // For multiportion brackets
public:
    inline  SwBlankPortion( sal_Unicode cCh, bool bMult = false )
    SwBlankPortion( sal_Unicode cCh, bool bMult = false )
        : cChar( cCh ), bMulti( bMult )
        { cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }

diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 740c2d9..3f229e3 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -48,9 +48,9 @@ protected:
    const bool bPlaceHolder : 1;
    bool m_bNoLength : 1;       // HACK for meta suffix (no CH_TXTATR)

    inline void SetFont( SwFont *pNew ) { pFnt = pNew; }
    inline bool IsNoLength() const  { return m_bNoLength; }
    inline void SetNoLength()       { m_bNoLength = true; }
    void SetFont( SwFont *pNew ) { pFnt = pNew; }
    bool IsNoLength() const  { return m_bNoLength; }
    void SetNoLength()       { m_bNoLength = true; }

public:
    SwFieldPortion( const SwFieldPortion& rField );
@@ -60,9 +60,9 @@ public:
    sal_uInt16 m_nAttrFieldType;
    void TakeNextOffset( const SwFieldPortion* pField );
    void CheckScript( const SwTextSizeInfo &rInf );
    inline bool HasFont() const { return nullptr != pFnt; }
    bool HasFont() const { return nullptr != pFnt; }
    // #i89179# - made public
    inline const SwFont *GetFont() const { return pFnt; }
    const SwFont *GetFont() const { return pFnt; }

    const OUString& GetExp() const { return aExpand; }
    virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
@@ -74,23 +74,23 @@ public:

    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;

    inline bool IsFollow() const { return bFollow; }
    inline void SetFollow( bool bNew ) { bFollow = bNew; }
    bool IsFollow() const { return bFollow; }
    void SetFollow( bool bNew ) { bFollow = bNew; }

    inline bool IsLeft() const { return bLeft; }
    inline void SetLeft( bool bNew ) { bLeft = bNew; }
    bool IsLeft() const { return bLeft; }
    void SetLeft( bool bNew ) { bLeft = bNew; }

    inline bool IsHide() const { return bHide; }
    inline void SetHide( bool bNew ) { bHide = bNew; }
    bool IsHide() const { return bHide; }
    void SetHide( bool bNew ) { bHide = bNew; }

    inline bool IsCenter() const { return bCenter; }
    inline void SetCenter( bool bNew ) { bCenter = bNew; }
    bool IsCenter() const { return bCenter; }
    void SetCenter( bool bNew ) { bCenter = bNew; }

    inline bool HasFollow() const { return bHasFollow; }
    inline void SetHasFollow( bool bNew ) { bHasFollow = bNew; }
    bool HasFollow() const { return bHasFollow; }
    void SetHasFollow( bool bNew ) { bHasFollow = bNew; }

    inline sal_Int32 GetNextOffset() const { return nNextOffset; }
    inline void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; }
    sal_Int32 GetNextOffset() const { return nNextOffset; }
    void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; }

    // Field cloner for SplitGlue
    virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
@@ -110,7 +110,7 @@ public:
class SwHiddenPortion : public SwFieldPortion
{
public:
    inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = nullptr )
    SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = nullptr )
         : SwFieldPortion( rExpand, pFntL )
        { SetLen(1); SetWhichPor( POR_HIDDEN ); }
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
@@ -185,14 +185,14 @@ public:

    void StopAnimation( OutputDevice* pOut );

    inline bool IsAnimated() const { return bAnimated; }
    inline void SetAnimated( bool bNew ) { bAnimated = bNew; }
    inline void SetRelPos( SwTwips nNew ) { nYPos = nNew; }
    inline void SetId( long nNew ) const
    bool IsAnimated() const { return bAnimated; }
    void SetAnimated( bool bNew ) { bAnimated = bNew; }
    void SetRelPos( SwTwips nNew ) { nYPos = nNew; }
    void SetId( long nNew ) const
        { const_cast<SwGrfNumPortion*>(this)->nId = nNew; }
    inline SwTwips GetRelPos() const { return nYPos; }
    inline SwTwips GetGrfHeight() const { return nGrfHeight; }
    inline sal_Int16 GetOrient() const { return eOrient; }
    SwTwips GetRelPos() const { return nYPos; }
    SwTwips GetGrfHeight() const { return nGrfHeight; }
    sal_Int16 GetOrient() const { return eOrient; }

    OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 5e617a4..8456806 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -35,8 +35,8 @@ class SwFlyPortion : public SwFixPortion
public:
    explicit SwFlyPortion( const SwRect &rFlyRect )
        : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
    inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
    inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
    sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
    void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    virtual bool Format( SwTextFormatInfo &rInf ) override;
    OUTPUT_OPERATOR_OVERRIDE
@@ -53,11 +53,11 @@ class SwFlyCntPortion : public SwLinePortion

public:
    SwFlyCntPortion();
    inline const Point& GetRefPoint() const { return m_aRef; }
    inline bool IsMax() const { return m_bMax; }
    inline sw::LineAlign GetAlign() const { return m_eAlign; }
    inline void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; }
    inline void SetMax(bool bMax) { m_bMax = bMax; }
    const Point& GetRefPoint() const { return m_aRef; }
    bool IsMax() const { return m_bMax; }
    sw::LineAlign GetAlign() const { return m_eAlign; }
    void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; }
    void SetMax(bool bMax) { m_bMax = bMax; }
    void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags);
    virtual bool Format(SwTextFormatInfo& rInf) override;
    OUTPUT_OPERATOR_OVERRIDE
@@ -72,7 +72,7 @@ namespace sw
        public:
            FlyContentPortion(SwFlyInContentFrame* pFly);
            static FlyContentPortion* Create(const SwTextFrame& rFrame, SwFlyInContentFrame* pFly, const Point& rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags);
            inline SwFlyInContentFrame* GetFlyFrame() { return m_pFly; }
            SwFlyInContentFrame* GetFlyFrame() { return m_pFly; }
            void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); };
            virtual void Paint(const SwTextPaintInfo& rInf) const override;
            virtual ~FlyContentPortion() override;
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index a76b02d..396f2b3 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -34,8 +34,8 @@ public:
    void Join( SwGluePortion *pVictim );

    inline short GetPrtGlue() const;
    inline sal_uInt16 GetFixWidth() const { return nFixWidth; }
    inline void SetFixWidth( const sal_uInt16 nNew ) { nFixWidth = nNew; }
    sal_uInt16 GetFixWidth() const { return nFixWidth; }
    void SetFixWidth( const sal_uInt16 nNew ) { nFixWidth = nNew; }
    void MoveGlue( SwGluePortion *pTarget, const short nPrtGlue );
    inline void MoveAllGlue( SwGluePortion *pTarget );
    inline void MoveHalfGlue( SwGluePortion *pTarget );
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index aecf452..212018c 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -68,7 +68,7 @@ public:
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    virtual bool Format( SwTextFormatInfo &rInf ) override;
    virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
    inline void SetExpand( const bool bNew ) { bExpand = bNew; }
    void SetExpand( const bool bNew ) { bExpand = bNew; }
    bool IsExpand() const { return bExpand; }

    virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index eb7c2bd..a95145b 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -38,19 +38,19 @@ class SwCharRange
{
    sal_Int32 nStart, nLen;
public:
    inline SwCharRange( const sal_Int32 nInitStart = 0,
    SwCharRange( const sal_Int32 nInitStart = 0,
        const sal_Int32 nInitLen = 0): nStart( nInitStart ), nLen(nInitLen) {}
    inline sal_Int32 &Start() { return nStart; }
    inline const sal_Int32 &Start() const { return nStart; }
    inline void LeftMove( sal_Int32 nNew )
    sal_Int32 &Start() { return nStart; }
    const sal_Int32 &Start() const { return nStart; }
    void LeftMove( sal_Int32 nNew )
            { if ( nNew < nStart ) { nLen += nStart-nNew; nStart = nNew; } }
    inline sal_Int32 &Len() { return nLen; }
    inline const sal_Int32 &Len() const { return nLen; }
    inline bool operator<(const SwCharRange &rRange) const
    sal_Int32 &Len() { return nLen; }
    const sal_Int32 &Len() const { return nLen; }
    bool operator<(const SwCharRange &rRange) const
                { return nStart < rRange.nStart; }
    inline bool operator>(const SwCharRange &rRange) const
    bool operator>(const SwCharRange &rRange) const
                { return nStart + nLen > rRange.nStart + rRange.nLen; }
    inline bool operator!=(const SwCharRange &rRange) const
    bool operator!=(const SwCharRange &rRange) const
                { return *this < rRange || *this > rRange; }
    SwCharRange &operator+=(const SwCharRange &rRange);
};
@@ -107,82 +107,82 @@ public:

    // Flags
    void ResetFlags();
    inline void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; }
    inline bool IsFormatAdj() const { return m_bFormatAdj; }
    inline void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; }
    inline bool IsEndHyph() const { return m_bEndHyph; }
    inline void SetMidHyph( const bool bNew ) { m_bMidHyph = bNew; }
    inline bool IsMidHyph() const { return m_bMidHyph; }
    inline void SetFly( const bool bNew ) { m_bFly = bNew; }
    inline bool IsFly() const { return m_bFly; }
    inline void SetRest( const bool bNew ) { m_bRest = bNew; }
    inline bool IsRest() const { return m_bRest; }
    inline void SetBlinking( const bool bNew = true ) { m_bBlinking = bNew; }
    inline bool IsBlinking() const { return m_bBlinking; }
    inline void SetContent( const bool bNew = true ) { m_bContent = bNew; }
    inline bool HasContent() const { return m_bContent; }
    inline void SetRedline( const bool bNew = true ) { m_bRedline = bNew; }
    inline bool HasRedline() const { return m_bRedline; }
    inline void SetForcedLeftMargin() { m_bForcedLeftMargin = true; }
    inline bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; }
    inline void SetHanging( const bool bNew = true ) { m_bHanging = bNew; }
    inline bool IsHanging() const { return m_bHanging; }
    inline void SetUnderscore( const bool bNew = true ) { m_bUnderscore = bNew; }
    inline bool HasUnderscore() const { return m_bUnderscore; }
    void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; }
    bool IsFormatAdj() const { return m_bFormatAdj; }
    void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; }
    bool IsEndHyph() const { return m_bEndHyph; }
    void SetMidHyph( const bool bNew ) { m_bMidHyph = bNew; }
    bool IsMidHyph() const { return m_bMidHyph; }
    void SetFly( const bool bNew ) { m_bFly = bNew; }
    bool IsFly() const { return m_bFly; }
    void SetRest( const bool bNew ) { m_bRest = bNew; }
    bool IsRest() const { return m_bRest; }
    void SetBlinking( const bool bNew = true ) { m_bBlinking = bNew; }
    bool IsBlinking() const { return m_bBlinking; }
    void SetContent( const bool bNew = true ) { m_bContent = bNew; }
    bool HasContent() const { return m_bContent; }
    void SetRedline( const bool bNew = true ) { m_bRedline = bNew; }
    bool HasRedline() const { return m_bRedline; }
    void SetForcedLeftMargin() { m_bForcedLeftMargin = true; }
    bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; }
    void SetHanging( const bool bNew = true ) { m_bHanging = bNew; }
    bool IsHanging() const { return m_bHanging; }
    void SetUnderscore( const bool bNew = true ) { m_bUnderscore = bNew; }
    bool HasUnderscore() const { return m_bUnderscore; }

    // Respecting empty dummy lines
    inline void SetDummy( const bool bNew ) { m_bDummy = bNew; }
    inline bool IsDummy() const { return m_bDummy; }
    void SetDummy( const bool bNew ) { m_bDummy = bNew; }
    bool IsDummy() const { return m_bDummy; }

    inline void SetClipping( const bool bNew ) { m_bClipping = bNew; }
    inline bool IsClipping() const { return m_bClipping; }
    void SetClipping( const bool bNew ) { m_bClipping = bNew; }
    bool IsClipping() const { return m_bClipping; }

    SwLineLayout();
    virtual ~SwLineLayout() override;

    inline SwLineLayout *GetNext() { return m_pNext; }
    inline const SwLineLayout *GetNext() const { return m_pNext; }
    inline void SetNext( SwLineLayout *pNew ) { m_pNext = pNew; }
    SwLineLayout *GetNext() { return m_pNext; }
    const SwLineLayout *GetNext() const { return m_pNext; }
    void SetNext( SwLineLayout *pNew ) { m_pNext = pNew; }

    void Init( SwLinePortion *pNextPortion = nullptr);

    // Collects the data for the line
    void CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf );

    inline void SetRealHeight( sal_uInt16 nNew ) { m_nRealHeight = nNew; }
    inline sal_uInt16 GetRealHeight() const { return m_nRealHeight; }
    void SetRealHeight( sal_uInt16 nNew ) { m_nRealHeight = nNew; }
    sal_uInt16 GetRealHeight() const { return m_nRealHeight; }

    // Creates the glue chain for short lines
    SwMarginPortion *CalcLeftMargin();

    inline SwTwips GetHangingMargin() const
    SwTwips GetHangingMargin() const
        { return GetHangingMargin_(); }

    // For special treatment for empty lines
    virtual bool Format( SwTextFormatInfo &rInf ) override;

    // Stuff for justified alignment
    inline bool IsSpaceAdd() { return m_pLLSpaceAdd != nullptr; }
    bool IsSpaceAdd() { return m_pLLSpaceAdd != nullptr; }
    void InitSpaceAdd();     // Creates pLLSpaceAdd if necessary
    void CreateSpaceAdd( const long nInit = 0 );
    inline void FinishSpaceAdd() { delete m_pLLSpaceAdd; m_pLLSpaceAdd = nullptr; }
    inline sal_uInt16 GetLLSpaceAddCount() const { return sal::static_int_cast< sal_uInt16 >(m_pLLSpaceAdd->size()); }
    inline void SetLLSpaceAdd( long nNew, sal_uInt16 nIdx )
    void FinishSpaceAdd() { delete m_pLLSpaceAdd; m_pLLSpaceAdd = nullptr; }
    sal_uInt16 GetLLSpaceAddCount() const { return sal::static_int_cast< sal_uInt16 >(m_pLLSpaceAdd->size()); }
    void SetLLSpaceAdd( long nNew, sal_uInt16 nIdx )
    {
        if ( nIdx == GetLLSpaceAddCount() )
            m_pLLSpaceAdd->push_back( nNew );
        else
            (*m_pLLSpaceAdd)[ nIdx ] = nNew;
    }
    inline long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[ nIdx ]; }
    inline void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase( m_pLLSpaceAdd->begin() ); }
    inline std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd; }
    long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[ nIdx ]; }
    void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase( m_pLLSpaceAdd->begin() ); }
    std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd; }

    // Stuff for Kana compression
    inline void SetKanaComp( std::deque<sal_uInt16>* pNew ){ m_pKanaComp = pNew; }
    inline void FinishKanaComp() { delete m_pKanaComp; m_pKanaComp = nullptr; }
    inline std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; }
    inline std::deque<sal_uInt16>& GetKanaComp() { return *m_pKanaComp; }
    void SetKanaComp( std::deque<sal_uInt16>* pNew ){ m_pKanaComp = pNew; }
    void FinishKanaComp() { delete m_pKanaComp; m_pKanaComp = nullptr; }
    std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; }
    std::deque<sal_uInt16>& GetKanaComp() { return *m_pKanaComp; }

    /** determine ascent and descent for positioning of as-character anchored
        object
@@ -262,14 +262,14 @@ public:
    inline void ResetPreps();

    // Get/Set methods
    inline SwRepaint& GetRepaint() { return m_aRepaint; }
    inline const SwRepaint& GetRepaint() const { return m_aRepaint; }
    inline SwCharRange& GetReformat() { return m_aReformat; }
    inline const SwCharRange& GetReformat() const { return m_aReformat; }
    inline long& GetDelta() { return m_nDelta; }
    inline const long& GetDelta() const { return m_nDelta; }
    inline SwScriptInfo& GetScriptInfo() { return m_aScriptInfo; }
    inline const SwScriptInfo& GetScriptInfo() const { return m_aScriptInfo; }
    SwRepaint& GetRepaint() { return m_aRepaint; }
    const SwRepaint& GetRepaint() const { return m_aRepaint; }
    SwCharRange& GetReformat() { return m_aReformat; }
    const SwCharRange& GetReformat() const { return m_aReformat; }
    long& GetDelta() { return m_nDelta; }
    const long& GetDelta() const { return m_nDelta; }
    SwScriptInfo& GetScriptInfo() { return m_aScriptInfo; }
    const SwScriptInfo& GetScriptInfo() const { return m_aScriptInfo; }

    // For SwTextFrame::Format: returns the paragraph's current length
    sal_Int32 GetParLen() const;
@@ -278,27 +278,27 @@ public:
    bool UpdateQuoVadis( const OUString &rQuo );

    // Flags
    inline void SetFly() { m_bFlys = true; }
    inline bool HasFly() const { return m_bFlys; }
    void SetFly() { m_bFlys = true; }
    bool HasFly() const { return m_bFlys; }

    // Preps
    inline void SetPrep() { m_bPrep = true; }
    inline bool IsPrep() const { return m_bPrep; }
    inline void SetPrepWidows() { m_bPrepWidows = true; }
    inline bool IsPrepWidows() const { return m_bPrepWidows; }
    inline void SetPrepMustFit( const bool bNew ) { m_bPrepMustFit = bNew; }
    inline bool IsPrepMustFit() const { return m_bPrepMustFit; }
    inline void SetPrepAdjust() { m_bPrepAdjust = true; }
    inline bool IsPrepAdjust() const { return m_bPrepAdjust; }
    inline void SetFollowField( const bool bNew ) { m_bFollowField = bNew; }
    inline bool IsFollowField() const { return m_bFollowField; }
    inline void SetFixLineHeight() { m_bFixLineHeight = true; }
    inline bool IsFixLineHeight() const { return m_bFixLineHeight; }
    void SetPrep() { m_bPrep = true; }
    bool IsPrep() const { return m_bPrep; }
    void SetPrepWidows() { m_bPrepWidows = true; }
    bool IsPrepWidows() const { return m_bPrepWidows; }
    void SetPrepMustFit( const bool bNew ) { m_bPrepMustFit = bNew; }
    bool IsPrepMustFit() const { return m_bPrepMustFit; }
    void SetPrepAdjust() { m_bPrepAdjust = true; }
    bool IsPrepAdjust() const { return m_bPrepAdjust; }
    void SetFollowField( const bool bNew ) { m_bFollowField = bNew; }
    bool IsFollowField() const { return m_bFollowField; }
    void SetFixLineHeight() { m_bFixLineHeight = true; }
    bool IsFixLineHeight() const { return m_bFixLineHeight; }

    inline void SetFootnoteNum( const bool bNew ) { m_bFootnoteNum = bNew; }
    inline bool IsFootnoteNum() const { return m_bFootnoteNum; }
    inline void SetMargin( const bool bNew = true ) { m_bMargin = bNew; }
    inline bool IsMargin() const { return m_bMargin; }
    void SetFootnoteNum( const bool bNew ) { m_bFootnoteNum = bNew; }
    bool IsFootnoteNum() const { return m_bFootnoteNum; }
    void SetMargin( const bool bNew = true ) { m_bMargin = bNew; }
    bool IsMargin() const { return m_bMargin; }

    // Set nErgo in the QuoVadisPortion
    void SetErgoSumNum( const OUString &rErgo );
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 008b5c0..c95c052 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -78,18 +78,18 @@ public:
           virtual ~SwLinePortion();

    // Access methods
    inline SwLinePortion *GetPortion() const { return pPortion; }
    SwLinePortion *GetPortion() const { return pPortion; }
    inline SwLinePortion &operator=(const SwLinePortion &rPortion);
    inline sal_Int32 GetLen() const { return nLineLength; }
    inline void SetLen( const sal_Int32 nLen ) { nLineLength = nLen; }
    inline void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; }
    inline sal_uInt16 &GetAscent() { return nAscent; }
    inline sal_uInt16 GetAscent() const { return nAscent; }
    inline void SetAscent( const sal_uInt16 nNewAsc ) { nAscent = nNewAsc; }
    inline void  PrtWidth( sal_uInt16 nNewWidth ) { Width( nNewWidth ); }
    inline sal_uInt16 PrtWidth() const { return Width(); }
    inline void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); }
    inline void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); }
    sal_Int32 GetLen() const { return nLineLength; }
    void SetLen( const sal_Int32 nLen ) { nLineLength = nLen; }
    void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; }
    sal_uInt16 &GetAscent() { return nAscent; }
    sal_uInt16 GetAscent() const { return nAscent; }
    void SetAscent( const sal_uInt16 nNewAsc ) { nAscent = nNewAsc; }
    void  PrtWidth( sal_uInt16 nNewWidth ) { Width( nNewWidth ); }
    sal_uInt16 PrtWidth() const { return Width(); }
    void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); }
    void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); }

    // Insert methods
    virtual SwLinePortion *Insert( SwLinePortion *pPortion );
@@ -100,49 +100,49 @@ public:
    // Returns 0, if there's no payload
    virtual SwLinePortion *Compress();

    inline void SetWhichPor( const sal_uInt16 nNew )    { nWhichPor = nNew; }
    inline sal_uInt16 GetWhichPor( ) const        { return nWhichPor; }
    void SetWhichPor( const sal_uInt16 nNew )    { nWhichPor = nNew; }
    sal_uInt16 GetWhichPor( ) const        { return nWhichPor; }

// Group queries
    inline bool InTextGrp() const { return (nWhichPor & PORGRP_TXT) != 0; }
    inline bool InGlueGrp() const { return (nWhichPor & PORGRP_GLUE) != 0; }
    inline bool InTabGrp() const { return (nWhichPor & PORGRP_TAB) != 0; }
    inline bool InHyphGrp() const { return (nWhichPor & PORGRP_HYPH) != 0; }
    inline bool InNumberGrp() const { return (nWhichPor & PORGRP_NUMBER) != 0; }
    inline bool InFixGrp() const { return (nWhichPor & PORGRP_FIX) != 0; }
    inline bool InFieldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; }
    inline bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; }
    inline bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; }
    inline bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; }
    inline bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; }
    inline bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); }
    bool InTextGrp() const { return (nWhichPor & PORGRP_TXT) != 0; }
    bool InGlueGrp() const { return (nWhichPor & PORGRP_GLUE) != 0; }
    bool InTabGrp() const { return (nWhichPor & PORGRP_TAB) != 0; }
    bool InHyphGrp() const { return (nWhichPor & PORGRP_HYPH) != 0; }
    bool InNumberGrp() const { return (nWhichPor & PORGRP_NUMBER) != 0; }
    bool InFixGrp() const { return (nWhichPor & PORGRP_FIX) != 0; }
    bool InFieldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; }
    bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; }
    bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; }
    bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; }
    bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; }
    bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); }
// Individual queries
    inline bool IsGrfNumPortion() const { return nWhichPor == POR_GRFNUM; }
    inline bool IsFlyCntPortion() const { return nWhichPor == POR_FLYCNT; }
    inline bool IsBlankPortion() const { return nWhichPor == POR_BLANK; }
    inline bool IsBreakPortion() const { return nWhichPor == POR_BRK; }
    inline bool IsErgoSumPortion() const { return nWhichPor == POR_ERGOSUM; }
    inline bool IsQuoVadisPortion() const { return nWhichPor == POR_QUOVADIS; }
    inline bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; }
    inline bool IsTabRightPortion() const { return nWhichPor == POR_TABRIGHT; }
    inline bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; }
    inline bool IsFootnotePortion() const { return nWhichPor == POR_FTN; }
    inline bool IsDropPortion() const { return nWhichPor == POR_DROP; }
    inline bool IsLayPortion() const { return nWhichPor == POR_LAY; }
    inline bool IsParaPortion() const { return nWhichPor == POR_PARA; }
    inline bool IsMarginPortion() const { return nWhichPor == POR_MARGIN; }
    inline bool IsFlyPortion() const { return nWhichPor == POR_FLY; }
    inline bool IsHolePortion() const { return nWhichPor == POR_HOLE; }
    inline bool IsSoftHyphPortion() const { return nWhichPor == POR_SOFTHYPH; }
    inline bool IsPostItsPortion() const { return nWhichPor == POR_POSTITS; }
    inline bool IsCombinedPortion() const { return nWhichPor == POR_COMBINED; }
    inline bool IsTextPortion() const { return nWhichPor == POR_TXT; }
    inline bool IsHangingPortion() const { return nWhichPor == POR_HNG; }
    inline bool IsKernPortion() const { return nWhichPor == POR_KERN; }
    inline bool IsArrowPortion() const { return nWhichPor == POR_ARROW; }
    inline bool IsMultiPortion() const { return nWhichPor == POR_MULTI; }
    inline bool IsNumberPortion() const { return nWhichPor == POR_NUMBER; } // #i23726#
    inline bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; }
    bool IsGrfNumPortion() const { return nWhichPor == POR_GRFNUM; }
    bool IsFlyCntPortion() const { return nWhichPor == POR_FLYCNT; }
    bool IsBlankPortion() const { return nWhichPor == POR_BLANK; }
    bool IsBreakPortion() const { return nWhichPor == POR_BRK; }
    bool IsErgoSumPortion() const { return nWhichPor == POR_ERGOSUM; }
    bool IsQuoVadisPortion() const { return nWhichPor == POR_QUOVADIS; }
    bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; }
    bool IsTabRightPortion() const { return nWhichPor == POR_TABRIGHT; }
    bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; }
    bool IsFootnotePortion() const { return nWhichPor == POR_FTN; }
    bool IsDropPortion() const { return nWhichPor == POR_DROP; }
    bool IsLayPortion() const { return nWhichPor == POR_LAY; }
    bool IsParaPortion() const { return nWhichPor == POR_PARA; }
    bool IsMarginPortion() const { return nWhichPor == POR_MARGIN; }
    bool IsFlyPortion() const { return nWhichPor == POR_FLY; }
    bool IsHolePortion() const { return nWhichPor == POR_HOLE; }
    bool IsSoftHyphPortion() const { return nWhichPor == POR_SOFTHYPH; }
    bool IsPostItsPortion() const { return nWhichPor == POR_POSTITS; }
    bool IsCombinedPortion() const { return nWhichPor == POR_COMBINED; }
    bool IsTextPortion() const { return nWhichPor == POR_TXT; }
    bool IsHangingPortion() const { return nWhichPor == POR_HNG; }
    bool IsKernPortion() const { return nWhichPor == POR_KERN; }
    bool IsArrowPortion() const { return nWhichPor == POR_ARROW; }
    bool IsMultiPortion() const { return nWhichPor == POR_MULTI; }
    bool IsNumberPortion() const { return nWhichPor == POR_NUMBER; } // #i23726#
    bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; }

    // Positioning
    SwLinePortion *FindPrevPortion( const SwLinePortion *pRoot );
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 52fdf93..94458d9 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1179,7 +1179,7 @@ public:
    SwSpaceManipulator( SwTextPaintInfo& rInf, SwMultiPortion& rMult );
    ~SwSpaceManipulator();
    void SecondLine();
    inline long GetSpaceAdd() const { return nSpaceAdd; }
    long GetSpaceAdd() const { return nSpaceAdd; }
};

SwSpaceManipulator::SwSpaceManipulator( SwTextPaintInfo& rInf,
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index ea29037..105d454 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -113,17 +113,17 @@ public:
    const SwLineLayout& GetRoot() const { return aRoot; }
    SwLineLayout& GetRoot() { return aRoot; }

    inline bool HasTabulator() const { return bTab1 || bTab2; }
    inline bool IsFormatted() const { return bFormatted; }
    inline void SetFormatted() { bFormatted = true; }
    inline bool IsFollowField() const { return bFollowField; }
    inline void SetFollowField() { bFollowField = true; }
    inline bool HasFlyInContent() const { return bFlyInContent; }
    inline void SetFlyInContent( bool bNew ) { bFlyInContent = bNew; }
    inline bool IsDouble() const { return bDouble; }
    inline bool IsRuby() const { return bRuby; }
    inline bool IsBidi() const { return bBidi; }
    inline bool OnTop() const { return bTop; }
    bool HasTabulator() const { return bTab1 || bTab2; }
    bool IsFormatted() const { return bFormatted; }
    void SetFormatted() { bFormatted = true; }
    bool IsFollowField() const { return bFollowField; }
    void SetFollowField() { bFollowField = true; }
    bool HasFlyInContent() const { return bFlyInContent; }
    void SetFlyInContent( bool bNew ) { bFlyInContent = bNew; }
    bool IsDouble() const { return bDouble; }
    bool IsRuby() const { return bRuby; }
    bool IsBidi() const { return bBidi; }
    bool OnTop() const { return bTop; }
    void ActualizeTabulator();

    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
@@ -134,9 +134,9 @@ public:
    void CalcSize( SwTextFormatter& rLine, SwTextFormatInfo &rInf );

    inline bool HasBrackets() const;
    inline bool HasRotation() const { return 0 != (1 & nDirection); }
    inline bool IsRevers() const { return 0 != (2 & nDirection); }
    inline sal_uInt8 GetDirection() const { return nDirection; }
    bool HasRotation() const { return 0 != (1 & nDirection); }
    bool IsRevers() const { return 0 != (2 & nDirection); }
    sal_uInt8 GetDirection() const { return nDirection; }

    // Accessibility: pass information about this portion to the PortionHandler
    virtual void HandlePortion( SwPortionHandler& rPH ) const override;
@@ -155,22 +155,22 @@ public:
    SwDoubleLinePortion( const SwMultiCreator& rCreate, sal_Int32 nEnd );
    virtual ~SwDoubleLinePortion() override;

    inline SwBracket* GetBrackets() const { return pBracket.get(); }
    SwBracket* GetBrackets() const { return pBracket.get(); }
    void SetBrackets( const SwDoubleLinePortion& rDouble );
    void PaintBracket( SwTextPaintInfo& rInf, long nSpaceAdd, bool bOpen ) const;
    void FormatBrackets( SwTextFormatInfo &rInf, SwTwips& nMaxWidth );
    inline sal_uInt16 PreWidth() const { return pBracket->nPreWidth; };
    inline sal_uInt16 PostWidth() const { return pBracket->nPostWidth; }
    inline void ClearBrackets()
    sal_uInt16 PreWidth() const { return pBracket->nPreWidth; };
    sal_uInt16 PostWidth() const { return pBracket->nPostWidth; }
    void ClearBrackets()
        { pBracket->nPreWidth = pBracket->nPostWidth=0; Width( 0 ); }
    inline sal_uInt16 BracketWidth(){ return PreWidth() + PostWidth(); }
    sal_uInt16 BracketWidth(){ return PreWidth() + PostWidth(); }

    void CalcBlanks( SwTextFormatInfo &rInf );
    static void ResetSpaceAdd( SwLineLayout* pCurr );
    inline SwTwips GetLineDiff() const { return nLineDiff; }
    inline sal_Int32 GetSpaceCnt() const
    SwTwips GetLineDiff() const { return nLineDiff; }
    sal_Int32 GetSpaceCnt() const
        { return ( nLineDiff < 0 ) ? nBlank2 : nBlank1; }
    inline sal_Int32 GetSmallerSpaceCnt() const
    sal_Int32 GetSmallerSpaceCnt() const
        { return ( nLineDiff < 0 ) ? nBlank1 : nBlank2; }

    virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override;
@@ -191,10 +191,10 @@ public:
                   const bool* pForceRubyPos );

    void CalcRubyOffset();
    inline void Adjust( SwTextFormatInfo &rInf )
    void Adjust( SwTextFormatInfo &rInf )
        { if(nAdjustment && GetRoot().GetNext()) Adjust_(rInf); }
    inline sal_uInt16 GetAdjustment() const { return nAdjustment; }
    inline sal_Int32 GetRubyOffset() const { return nRubyOffset; }
    sal_uInt16 GetAdjustment() const { return nAdjustment; }
    sal_Int32 GetRubyOffset() const { return nRubyOffset; }
};

class SwRotatedPortion : public SwMultiPortion
@@ -213,7 +213,7 @@ class SwBidiPortion : public SwMultiPortion
public:
    SwBidiPortion( sal_Int32 nEnd, sal_uInt8 nLv );

    inline sal_uInt8 GetLevel() const { return nLevel; }
    sal_uInt8 GetLevel() const { return nLevel; }
    // Get number of blanks for justified alignment
    sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf ) const;
    // Calculates extra spacing based on number of blanks
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 593acb0..37cc772 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -24,7 +24,7 @@
class SwRefPortion : public SwTextPortion
{
public:
    inline  SwRefPortion(){ SetWhichPor( POR_REF ); }
    SwRefPortion(){ SetWhichPor( POR_REF ); }
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index e58f068..9c421d4 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -86,8 +86,8 @@ public:
    explicit SwArrowPortion( const SwTextPaintInfo &rInf );
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    virtual SwLinePortion *Compress() override;
    inline bool IsLeft() const { return bLeft; }
    inline const Point& GetPos() const { return aPos; }
    bool IsLeft() const { return bLeft; }
    const Point& GetPos() const { return aPos; }
    OUTPUT_OPERATOR_OVERRIDE
};

diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 55f00ae..65022a4 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -35,8 +35,8 @@ public:
    virtual bool Format( SwTextFormatInfo &rInf ) override;
    virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
    bool PostFormat( SwTextFormatInfo &rInf );
    inline  bool IsFilled() const { return 0 != cFill; }
    inline  sal_uInt16 GetTabPos() const { return nTabPos; }
    bool IsFilled() const { return 0 != cFill; }
    sal_uInt16 GetTabPos() const { return nTabPos; }

    // Accessibility: pass information about this portion to the PortionHandler
    virtual void HandlePortion( SwPortionHandler& rPH ) const override;
@@ -47,7 +47,7 @@ public:
class SwTabLeftPortion : public SwTabPortion
{
public:
    inline SwTabLeftPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar, bool bAutoTab = true )
    SwTabLeftPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar, bool bAutoTab = true )
         : SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
    { SetWhichPor( POR_TABLEFT ); }
    OUTPUT_OPERATOR_OVERRIDE
@@ -56,7 +56,7 @@ public:
class SwTabRightPortion : public SwTabPortion
{
public:
    inline SwTabRightPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar )
    SwTabRightPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar )
         : SwTabPortion( nTabPosVal, cFillChar )
    { SetWhichPor( POR_TABRIGHT ); }
    OUTPUT_OPERATOR_OVERRIDE
@@ -65,7 +65,7 @@ public:
class SwTabCenterPortion : public SwTabPortion
{
public:
    inline SwTabCenterPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar )
    SwTabCenterPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar )
         : SwTabPortion( nTabPosVal, cFillChar )
    { SetWhichPor( POR_TABCENTER ); }
    OUTPUT_OPERATOR_OVERRIDE
@@ -83,20 +83,20 @@ class SwTabDecimalPortion : public SwTabPortion
    sal_uInt16 mnWidthOfPortionsUpTpDecimalPosition;

public:
    inline SwTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab,
    SwTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab,
                                const sal_Unicode cFillChar )
         : SwTabPortion( nTabPosVal, cFillChar ),
           mcTab(cTab),
           mnWidthOfPortionsUpTpDecimalPosition( USHRT_MAX )
    { SetWhichPor( POR_TABDECIMAL ); }

    inline sal_Unicode GetTabDecimal() const { return mcTab; }
    sal_Unicode GetTabDecimal() const { return mcTab; }

    inline void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew )
    void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew )
    {
        mnWidthOfPortionsUpTpDecimalPosition = nNew;
    }
    inline sal_uInt16 GetWidthOfPortionsUpToDecimalPosition() const
    sal_uInt16 GetWidthOfPortionsUpToDecimalPosition() const
    {
        return mnWidthOfPortionsUpTpDecimalPosition;
    }
@@ -107,7 +107,7 @@ public:
class SwAutoTabDecimalPortion : public SwTabDecimalPortion
{
public:
    inline SwAutoTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab,
    SwAutoTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab,
                                    const sal_Unicode cFillChar )
         : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
    { SetLen( 0 ); }
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 3d4937e..cb3ebc3 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -25,7 +25,7 @@
class SwToxPortion : public SwTextPortion
{
public:
    inline  SwToxPortion(){ SetWhichPor( POR_TOX ); }
    SwToxPortion(){ SetWhichPor( POR_TOX ); }
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 26d7970..f795f36 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -33,7 +33,7 @@ class SwTextPortion : public SwLinePortion
    bool Format_( SwTextFormatInfo &rInf );

public:
    inline SwTextPortion(){ SetWhichPor( POR_TXT ); }
    SwTextPortion(){ SetWhichPor( POR_TXT ); }
    static SwTextPortion * CopyLinePortion(const SwLinePortion &rPortion);
    virtual void Paint( const SwTextPaintInfo &rInf ) const override;
    virtual bool Format( SwTextFormatInfo &rInf ) override;
@@ -87,7 +87,7 @@ public:
class SwFieldMarkPortion : public SwTextPortion
{
    public:
        inline SwFieldMarkPortion() : SwTextPortion()
        SwFieldMarkPortion() : SwTextPortion()
            { }
        virtual void Paint( const SwTextPaintInfo &rInf ) const override;
        virtual bool Format( SwTextFormatInfo &rInf ) override;
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 1de12a16..556c3af 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -87,29 +87,29 @@ public:
        sal_Int32 nRedlPos, bool bShw, const std::vector<ExtTextInputAttr> *pArr = nullptr,
        sal_Int32 nExtStart = COMPLETE_STRING );
    ~SwRedlineItr();
    inline bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); }
    inline void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); }
    bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); }
    void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); }
    void ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg );
    inline short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) {
    short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) {
        if( bShow || pExt ) return Seek_( rFnt, nNew, nOld );
        return 0;
    }
    inline void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING;
    void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING;
                          if( pExt ) pExt->Reset(); }
    inline sal_Int32 GetNextRedln( sal_Int32 nNext ) {
    sal_Int32 GetNextRedln( sal_Int32 nNext ) {
        if( bShow || pExt ) return GetNextRedln_( nNext );
        return nNext;
    }
    inline bool ChkSpecialUnderline() const
    bool ChkSpecialUnderline() const
        { return IsOn() && ChkSpecialUnderline_(); }
    bool CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd );
    inline bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew )
    bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew )
        { return pExt->Leave(rFnt, nNew ); }
    inline bool ExtOn() {
    bool ExtOn() {
        if( pExt ) return pExt->IsOn();
        return false;
    }
    inline void UpdateExtFont( SwFont &rFnt ) {
    void UpdateExtFont( SwFont &rFnt ) {
        OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" );
        pExt->UpdateFont( rFnt ); }
};
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 2acc3de..77d199c 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -37,10 +37,10 @@ public:
    SwTextLine( SwTextFrame *pFrame, SwParaPortion *pNew = nullptr );
    virtual ~SwTextLine() override;

    inline       SwParaPortion *GetPara()       { return pLine.get(); }
    inline const SwParaPortion *GetPara() const { return pLine.get(); }
    SwParaPortion *GetPara()       { return pLine.get(); }
    const SwParaPortion *GetPara() const { return pLine.get(); }

    inline void SetPara( SwParaPortion *pNew, bool bDelete ) { if (!bDelete) pLine.release(); pLine.reset( pNew ); }
    void SetPara( SwParaPortion *pNew, bool bDelete ) { if (!bDelete) pLine.release(); pLine.reset( pNew ); }
};

class SwTextLineAccess : public SwCacheAccess
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index d520edc..5408517 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -41,11 +41,11 @@ public:
    }

    ~SwSaveClip();
    inline void ChgClip( const SwRect &rRect, const SwTextFrame* pFrame = nullptr,
    void ChgClip( const SwRect &rRect, const SwTextFrame* pFrame = nullptr,
                         bool bEnlargeRect = false)
             { if( pOut ) ChgClip_( rRect, pFrame, bEnlargeRect ); }
    inline bool IsOn()  const { return bOn; }
    inline bool IsChg() const { return bChg; }
    bool IsOn()  const { return bOn; }
    bool IsChg() const { return bChg; }
};


diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 1063f63..56326a1 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -37,7 +37,7 @@ public:
    bool IsBreakNow( SwTextMargin &rLine );
    bool IsKeepAlways() const { return m_bKeep; }

    inline void SetKeep( const bool bNew ) { m_bKeep = bNew; }
    void SetKeep( const bool bNew ) { m_bKeep = bNew; }

    bool IsInside( SwTextMargin &rLine ) const;

diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 0afe25a..5586243 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -99,10 +99,10 @@ protected:
public:
    virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) = 0;
    virtual void Do() = 0;
    inline OutputDevice& GetOut() { return rInf.GetOut(); }
    inline SwDrawTextInfo& GetInf() { return rInf; }
    inline SwCapitalInfo* GetCapInf() const { return pCapInf; }
    inline void SetCapInf( SwCapitalInfo& rNew ) { pCapInf = &rNew; }
    OutputDevice& GetOut() { return rInf.GetOut(); }
    SwDrawTextInfo& GetInf() { return rInf; }
    SwCapitalInfo* GetCapInf() const { return pCapInf; }
    void SetCapInf( SwCapitalInfo& rNew ) { pCapInf = &rNew; }
};

class SwDoGetCapitalSize : public SwDoCapitals
@@ -327,7 +327,7 @@ public:
    virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override;
    virtual void Do() override;

    inline sal_Int32 GetCursor(){ return nCursor; }
    sal_Int32 GetCursor(){ return nCursor; }
};

void SwDoCapitalCursorOfst::Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont )
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index f28dc1b..5196686 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -46,7 +46,7 @@ struct Cell
            bIsEmpty(true)
    {}

    inline bool empty() const { return bIsEmpty; }
    bool empty() const { return bIsEmpty; }
};

struct CellRange
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 2d9e4c6..15eb57a 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1002,13 +1002,13 @@ namespace
    {
        typedef SwXTextFrame core_frame_t;
        typedef XTextFrame uno_frame_t;
        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        {
            uno::Reference<text::XTextFrame> const xRet(
                SwXTextFrame::CreateXTextFrame(*rFrameFormat.GetDoc(), &rFrameFormat));
            return uno::makeAny(xRet);
        }
        static inline bool filter(const SwNode* const pNode) { return !pNode->IsNoTextNode(); };
        static bool filter(const SwNode* const pNode) { return !pNode->IsNoTextNode(); };
    };

    template<>
@@ -1016,13 +1016,13 @@ namespace
    {
        typedef SwXTextGraphicObject core_frame_t;
        typedef XTextContent uno_frame_t;
        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        {
            uno::Reference<text::XTextContent> const xRet(
                SwXTextGraphicObject::CreateXTextGraphicObject(*rFrameFormat.GetDoc(), &rFrameFormat));
            return uno::makeAny(xRet);
        }
        static inline bool filter(const SwNode* const pNode) { return pNode->IsGrfNode(); };
        static bool filter(const SwNode* const pNode) { return pNode->IsGrfNode(); };
    };

    template<>
@@ -1030,13 +1030,13 @@ namespace
    {
        typedef SwXTextEmbeddedObject core_frame_t;
        typedef XEmbeddedObjectSupplier uno_frame_t;
        static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        static uno::Any wrapFrame(SwFrameFormat & rFrameFormat)
        {
            uno::Reference<text::XTextContent> const xRet(
                SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rFrameFormat.GetDoc(), &rFrameFormat));
            return uno::makeAny(xRet);
        }
        static inline bool filter(const SwNode* const pNode) { return pNode->IsOLENode(); };
        static bool filter(const SwNode* const pNode) { return pNode->IsOLENode(); };
    };

    template<FlyCntType T>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 0b3bbc2..b661fa4 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -226,7 +226,7 @@ public:
    }

    // #i28701#
    inline SwFormatWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
    SwFormatWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
                                        const bool _bCreate = false )
    {
        if ( _bCreate && !pWrapInfluenceOnObjPos )
@@ -237,7 +237,7 @@ public:
        }
        return pWrapInfluenceOnObjPos;
    }
    inline void RemoveWrapInfluenceOnObjPos()
    void RemoveWrapInfluenceOnObjPos()
    {
        DELETEZ(pWrapInfluenceOnObjPos);
    }
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 9dd6756..9d7d9a8 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -295,17 +295,17 @@ public:

    inline HTMLTableCell *GetCell( sal_uInt16 nCell ) const;

    inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
    inline SvxAdjust GetAdjust() const { return eAdjust; }
    void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
    SvxAdjust GetAdjust() const { return eAdjust; }

    inline void SetVertOri( sal_Int16 eV) { eVertOri = eV; }
    inline sal_Int16 GetVertOri() const { return eVertOri; }
    void SetVertOri( sal_Int16 eV) { eVertOri = eV; }
    sal_Int16 GetVertOri() const { return eVertOri; }

    void SetBGBrush( SvxBrushItem *pBrush ) { pBGBrush = pBrush; }
    const SvxBrushItem *GetBGBrush() const { return pBGBrush; }

    inline void SetEndOfGroup() { bIsEndOfGroup = true; }
    inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
    void SetEndOfGroup() { bIsEndOfGroup = true; }
    bool IsEndOfGroup() const { return bIsEndOfGroup; }

    void IncEmptyRows() { nEmptyRows++; }
    sal_uInt16 GetEmptyRows() const { return nEmptyRows; }
@@ -341,14 +341,14 @@ public:

    inline void SetWidth( sal_uInt16 nWidth, bool bRelWidth);

    inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
    inline SvxAdjust GetAdjust() const { return eAdjust; }
    void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
    SvxAdjust GetAdjust() const { return eAdjust; }

    inline void SetVertOri( sal_Int16 eV) { eVertOri = eV; }
    inline sal_Int16 GetVertOri() const { return eVertOri; }
    void SetVertOri( sal_Int16 eV) { eVertOri = eV; }
    sal_Int16 GetVertOri() const { return eVertOri; }

    inline void SetEndOfGroup() { bIsEndOfGroup = true; }
    inline bool IsEndOfGroup() const { return bIsEndOfGroup; }
    void SetEndOfGroup() { bIsEndOfGroup = true; }
    bool IsEndOfGroup() const { return bIsEndOfGroup; }

    inline void SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine,
                           sal_Int16 eVertOri );
@@ -576,7 +576,7 @@ public:
                    sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0,
                    sal_uInt16 nAbsRightSpace=0, sal_uInt16 nInhAbsSpace=0 );

    inline bool IsNewDoc() const { return m_pParser->IsNewDoc(); }
    bool IsNewDoc() const { return m_pParser->IsNewDoc(); }

    void SetHasParentSection( bool bSet ) { m_bHasParentSection = bSet; }
    bool HasParentSection() const { return m_bHasParentSection; }
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index cb16c4c..0ebe99f 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -286,12 +286,12 @@ public:

    inline void SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, short nIndent );

    inline bool IsLRSpaceChanged() const { return bLRSpaceChanged; }
    bool IsLRSpaceChanged() const { return bLRSpaceChanged; }
    inline void GetMargins( sal_uInt16& nLeft, sal_uInt16& nRight,
                            short &nIndent ) const;

    inline void SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower );
    inline bool IsULSpaceChanged() const { return bULSpaceChanged; }
    bool IsULSpaceChanged() const { return bULSpaceChanged; }
    inline void GetULSpace( sal_uInt16& rUpper, sal_uInt16& rLower ) const;

    bool HasAttrs() const { return !aAttrs.empty(); }
@@ -496,7 +496,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient

    // Attribute am Dok setzen
    void SetAttr_( bool bChkEnd, bool bBeforeTable, HTMLAttrs *pPostIts );
    inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false,
    void SetAttr( bool bChkEnd = true, bool bBeforeTable = false,
                         HTMLAttrs *pPostIts = nullptr )
    {
        if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrames.empty() )
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 0eb4016..aa4f13a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1889,7 +1889,7 @@ bool MSWordExportBase::GetAnnotationMarks( const SwTextNode& rNd, sal_Int32 nStt
class CompareMarksEnd : public std::binary_function < const IMark *, const IMark *, bool >
{
public:
    inline bool operator() ( const IMark * pOneB, const IMark * pTwoB ) const
    bool operator() ( const IMark * pOneB, const IMark * pTwoB ) const
    {
        const sal_Int32 nOEnd = pOneB->GetMarkEnd().nContent.GetIndex();
        const sal_Int32 nTEnd = pTwoB->GetMarkEnd().nContent.GetIndex();
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 2bc8e10..f5dc04e 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -55,7 +55,7 @@ class SwXMLTableContext : public XMLTextTableContext
    struct ColumnWidthInfo {
        sal_uInt16 width;      //!< Column width (absolute or relative).
        bool   isRelative; //!< True for a relative width, false for absolute.
        inline ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth), isRelative(isRel) {};
        ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth), isRelative(isRel) {};
    };
    std::vector<ColumnWidthInfo> m_aColumnWidths;
    std::vector<OUString> *m_pColumnDefaultCellStyleNames;
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index f9d1b18..523a51c 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -68,7 +68,7 @@ public:
    virtual bool FillItemSet(SfxItemSet* rSet) override;
    virtual void Reset(const SfxItemSet* rSet) override;

    inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; }
    void SetPrt(Printer* pPrinter) { pPrt = pPrinter; }
};

#endif
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 027edf3..08d6583 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -62,7 +62,7 @@ public:
            void FillItem(SwLabItem& rItem);
    virtual bool FillItemSet(SfxItemSet* rSet) override;
    virtual void Reset(const SfxItemSet* rSet) override;
    inline Printer* GetPrt() { return pPrinter; }
    Printer* GetPrt() { return pPrinter; }
};

#endif
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 153524a..2c720b2 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -77,8 +77,8 @@ public:
    void    SetToBusinessCard();

    void InitDatabaseBox();
    inline void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; }
    inline SwDBManager* GetDBManager() const { return pDBManager; }
    void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; }
    SwDBManager* GetDBManager() const { return pDBManager; }
};

class SwOneExampleFrame;
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index a7e665b4..548cd5d 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -63,7 +63,7 @@ protected:
    void                SavePos( const ListBox* pLst1);
    void                RestorePos( ListBox* pLst1 );
    void                EnableInsert(bool bEnable);
    inline bool         IsFieldEdit() const   { return m_bFieldEdit; }
    bool         IsFieldEdit() const   { return m_bFieldEdit; }

    // insert field
    void                InsertField(  sal_uInt16 nTypeId,
@@ -84,7 +84,7 @@ public:

    virtual void        ActivatePage() override;

    inline SwFieldMgr&    GetFieldMgr()         { return m_aMgr; }
    SwFieldMgr&    GetFieldMgr()         { return m_aMgr; }
    void                SetWrtShell( SwWrtShell* m_pWrtShell );
    void                EditNewField( bool bOnlyActivate = false );
    virtual sal_uInt16      GetGroup() = 0;
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 55fecd4..cc15504 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -48,7 +48,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
                                                               const Color& aColorAnchor );
        static void DestroyAnchorOverlayObject( AnchorOverlayObject* pAnchor );

        inline const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; }
        const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; }
        const basegfx::B2DPoint& GetThirdPosition() const { return maThirdPosition; }
        const basegfx::B2DPoint& GetFourthPosition() const { return maFourthPosition; }
        const basegfx::B2DPoint& GetFifthPosition() const { return maFifthPosition; }
@@ -71,12 +71,12 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
        void SetSeventhPosition( const basegfx::B2DPoint& rNew );

        void setLineSolid( const bool bNew );
        inline bool getLineSolid() const { return mbLineSolid; }
        bool getLineSolid() const { return mbLineSolid; }

        inline void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; };
        void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; };

        void SetAnchorState( const AnchorState aState );
        inline AnchorState GetAnchorState() const { return mAnchorState; }
        AnchorState GetAnchorState() const { return mAnchorState; }

    protected:
        /*                        6------------7
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 1d797c9..941980b 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -52,7 +52,7 @@ namespace sw
            virtual ~OverlayRanges() override;

            // data read access
            inline const std::vector< basegfx::B2DRange >& getRanges() const
            const std::vector< basegfx::B2DRange >& getRanges() const
            {
                return maRanges;
            }
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index fb796b9..d8a55e9 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -50,7 +50,7 @@ private:

public:
        void SetShadowState(ShadowState aState);
        inline ShadowState GetShadowState() {return mShadowState;}
        ShadowState GetShadowState() {return mShadowState;}

        void SetPosition( const basegfx::B2DPoint& rPoint1,
                          const basegfx::B2DPoint& rPoint2 );
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 52133ed..04bb840 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -56,9 +56,9 @@ protected:
    SwWrtShell&         GetShell();
    SwWrtShell*         GetShellPtr();

    inline SwView&      GetView()                       { return rView; }
    inline void         SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
    inline bool         AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; }
    SwView&      GetView()                       { return rView; }
    void         SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; }
    bool         AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; }

    DECL_LINK(    InsertDBTextHdl, void*, void );

diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index b1fa6fd..8b03143 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.hxx
@@ -47,43 +47,43 @@ public:
    InsCaptionOpt(const InsCaptionOpt&);
    ~InsCaptionOpt();

    inline bool&            UseCaption()                    { return bUseCaption; }
    inline bool             UseCaption() const              { return bUseCaption; }
    bool&            UseCaption()                    { return bUseCaption; }
    bool             UseCaption() const              { return bUseCaption; }

    inline SwCapObjType     GetObjType() const              { return eObjType; }
    SwCapObjType     GetObjType() const              { return eObjType; }

    inline const SvGlobalName&  GetOleId() const                { return aOleId; }
    const SvGlobalName&  GetOleId() const                { return aOleId; }

    inline const OUString&  GetCategory() const             { return sCategory; }
    inline void             SetCategory(const OUString& rCat) { sCategory = rCat; }
    const OUString&  GetCategory() const             { return sCategory; }
    void             SetCategory(const OUString& rCat) { sCategory = rCat; }

    inline sal_uInt16           GetNumType() const              { return nNumType; }
    inline void             SetNumType(const sal_uInt16 nNT)    { nNumType = nNT; }
    sal_uInt16           GetNumType() const              { return nNumType; }
    void             SetNumType(const sal_uInt16 nNT)    { nNumType = nNT; }

    const OUString&  GetNumSeparator() const { return sNumberSeparator; }
    void                    SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;}

    inline const OUString&  GetCaption() const              { return sCaption; }
    inline void             SetCaption(const OUString& rCap)  { sCaption = rCap; }
    const OUString&  GetCaption() const              { return sCaption; }
    void             SetCaption(const OUString& rCap)  { sCaption = rCap; }

    inline sal_uInt16           GetPos() const                  { return nPos; }
    inline void             SetPos(const sal_uInt16 nP)         { nPos = nP; }
    sal_uInt16           GetPos() const                  { return nPos; }
    void             SetPos(const sal_uInt16 nP)         { nPos = nP; }

    inline sal_uInt16           GetLevel() const                { return nLevel; }
    inline void             SetLevel(const sal_uInt16 nLvl)     { nLevel = nLvl; }
    sal_uInt16           GetLevel() const                { return nLevel; }
    void             SetLevel(const sal_uInt16 nLvl)     { nLevel = nLvl; }

    inline const OUString&  GetSeparator() const                { return sSeparator; }
    inline void             SetSeparator(const OUString& rSep)    { sSeparator = rSep; }
    const OUString&  GetSeparator() const                { return sSeparator; }
    void             SetSeparator(const OUString& rSep)    { sSeparator = rSep; }

    const OUString&         GetCharacterStyle() const { return sCharacterStyle; }
    void                    SetCharacterStyle(const OUString& rStyle)
                                    { sCharacterStyle = rStyle; }

    inline bool&            IgnoreSeqOpts()                 { return bIgnoreSeqOpts; }
    inline bool             IgnoreSeqOpts() const           { return bIgnoreSeqOpts; }
    bool&            IgnoreSeqOpts()                 { return bIgnoreSeqOpts; }
    bool             IgnoreSeqOpts() const           { return bIgnoreSeqOpts; }

    inline bool&            CopyAttributes()                { return bCopyAttributes; }
    inline bool             CopyAttributes() const          { return bCopyAttributes; }
    bool&            CopyAttributes()                { return bCopyAttributes; }
    bool             CopyAttributes() const          { return bCopyAttributes; }

    InsCaptionOpt&          operator= ( const InsCaptionOpt& rOpt );
};
diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx
index 7f0b46e..0ff0823 100644
--- a/sw/source/uibase/inc/chldwrap.hxx
+++ b/sw/source/uibase/inc/chldwrap.hxx
@@ -38,8 +38,8 @@ protected:
public:
    virtual bool    ReInitDlg(SwDocShell *pDocSh);

    inline SwDocShell*  GetOldDocShell()                    { return m_pDocSh; }
    inline void         SetOldDocShell(SwDocShell *pDcSh)   { m_pDocSh = pDcSh; }
    SwDocShell*  GetOldDocShell()                    { return m_pDocSh; }
    void         SetOldDocShell(SwDocShell *pDcSh)   { m_pDocSh = pDcSh; }
};

#endif
diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx
index 9ba4450..b369700 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.hxx
@@ -46,8 +46,8 @@ public:

    void         SetDrawPointer();
    void         EnterSelectMode(const MouseEvent& rMEvt);
    inline bool  IsInsertForm() const { return m_bInsForm; }
    inline bool  IsCreateObj() const { return m_bCreateObj; }
    bool  IsInsertForm() const { return m_bInsForm; }
    bool  IsCreateObj() const { return m_bCreateObj; }

    // mouse- & key events; return value=true: event was edited
    virtual bool KeyInput(const KeyEvent& rKEvt);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 7c666ba..1a965f0 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -225,8 +225,8 @@ public:
    void            SetObjectSelect( bool bVal )    { m_bObjectSelect = bVal; }
    bool            IsObjectSelect() const          { return m_bObjectSelect; }

    inline SdrObjKind   GetSdrDrawMode() const { return m_eDrawMode; }
    inline void         SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); }
    SdrObjKind   GetSdrDrawMode() const { return m_eDrawMode; }
    void         SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); }
    void                StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect );

    bool            IsFrameAction() const             { return m_bInsFrame; }
@@ -262,8 +262,8 @@ public:

    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;

    static inline long GetDDStartPosX() { return m_nDDStartPosX; }
    static inline long GetDDStartPosY() { return m_nDDStartPosY; }
    static long GetDDStartPosX() { return m_nDDStartPosX; }
    static long GetDDStartPosY() { return m_nDDStartPosY; }

    static void InitStaticData();
    static void FinitStaticData();
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 55c5490..f110115 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -118,8 +118,8 @@ public:
    void                DelAttr(sal_uInt16 nId);

    // reach out the set
    inline const SfxItemSet &GetAttrSet() const { return m_aSet; }
    inline       SfxItemSet &GetAttrSet()       { return m_aSet; }
    const SfxItemSet &GetAttrSet() const { return m_aSet; }
    SfxItemSet &GetAttrSet()       { return m_aSet; }
    void                     SetAttrSet(const SfxItemSet& rSet);

    inline const SwFormatVertOrient &GetVertOrient() const;
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 6563bb3..fe4a3a1 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -197,7 +197,7 @@ public:
    void            SetNewFrame(bool bNewFrame) { m_bNew      = bNewFrame; }
    void            SetFormatUsed(bool bFormat);
    void            SetFrameType(const OUString &rType) { m_sDlgType  = rType; }
    inline bool     IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; }
    bool     IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; }
    void            EnableVerticalPositioning( bool bEnable );
};

diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 8dfe824..349fba6 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -126,7 +126,7 @@ public:
    virtual ~SwMailMergeDlg() override;
    virtual void dispose() override;

    inline DBManagerOptions GetMergeType() { return nMergeType; }
    DBManagerOptions GetMergeType() { return nMergeType; }

    bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); }
    bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); }
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 68e2423..27cdbc1 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -52,14 +52,14 @@ public:

    void            Clear();

    inline void     SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; }
    void     SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; }

    void            SetFormatType(const short nFormatType);
    inline short    GetFormatType() const { return nCurrFormatType; }
    short    GetFormatType() const { return nCurrFormatType; }
    void            SetDefFormat(const sal_uLong nDefFormat);
    sal_uLong           GetFormat() const;

    inline LanguageType GetCurLanguage() const { return eCurLanguage;}
    LanguageType GetCurLanguage() const { return eCurLanguage;}
    void                SetLanguage(LanguageType eSet)  { eCurLanguage = eSet;}

    void            SetAutomaticLanguage(bool bSet){bUseAutomaticLanguage = bSet;}
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index a4022db..aaf3515 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -303,8 +303,8 @@ public:
    SwMarkPreview(vcl::Window* pParent, WinBits nWinBits);
    virtual ~SwMarkPreview() override;

    inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
    inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
    void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
    void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
    virtual Size GetOptimalSize() const override;
};

diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 80edefd..0c3445f 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -232,9 +232,9 @@ private:
    static void InitInterface_Impl();

public:
    inline SwViewShell* GetViewShell() const
    SwViewShell* GetViewShell() const
    { return m_pViewWin->GetViewShell(); }
    inline void RepaintCoreRect( const SwRect& rRect )
    void RepaintCoreRect( const SwRect& rRect )
    { m_pViewWin->RepaintCoreRect( rRect ); }

    void DocSzChgd(const Size& rNewSize);
@@ -271,12 +271,12 @@ public:

    // Inline method to request values of new members
    // <mbResetFormDesignMode> and <mbFormDesignModeToReset>
    inline bool ResetFormDesignMode() const
    bool ResetFormDesignMode() const
    {
        return mbResetFormDesignMode;
    }

    inline bool FormDesignModeToReset() const
    bool FormDesignModeToReset() const
    {
        return mbFormDesignModeToReset;
    }
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 3328920..08104b3 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -51,7 +51,7 @@ struct SwRedlineDataParent
    SvTreeListEntry*            pTLBParent; // corresponding TreeListBox entry
    OUString                    sComment;   // redline comment

    inline bool operator< ( const SwRedlineDataParent& rObj ) const
    bool operator< ( const SwRedlineDataParent& rObj ) const
                        { return (pData && pData->GetSeqNo() <  rObj.pData->GetSeqNo()); }
};

@@ -123,8 +123,8 @@ public:

    DECL_LINK( FilterChangedHdl, SvxTPFilter*, void );

    inline SvxAcceptChgCtr& GetChgCtrl()        { return *m_aTabPagesCTRL.get(); }
    inline bool     HasRedlineAutoFormat() const   { return m_bRedlnAutoFormat; }
    SvxAcceptChgCtr& GetChgCtrl()        { return *m_aTabPagesCTRL.get(); }
    bool     HasRedlineAutoFormat() const   { return m_bRedlnAutoFormat; }

    void            Init(SwRedlineTable::size_type nStart = 0);
    void            CallAcceptReject( bool bSelect, bool bAccept );
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index e26e576..c47056c 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -164,9 +164,9 @@ public:
    SfxMedium*              CreateMedium();
    void                    InitRequest( const SfxRequest& rRequest );

    inline SfxRequest*      GetRequest() const { return m_pRequest; }
    inline sal_Int16        GetParam() const { return m_nParam; }
    inline void             SetParam( sal_Int16 nParam ) { m_nParam = nParam; }
    SfxRequest*      GetRequest() const { return m_pRequest; }
    sal_Int16        GetParam() const { return m_nParam; }
    void             SetParam( sal_Int16 nParam ) { m_nParam = nParam; }
};
#endif

diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 254a9a6..00e2682 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -103,9 +103,9 @@ public:
    virtual void    Reset(const SfxItemSet *rSet) override;

    static const sal_uInt16* GetRanges() { return m_aWrapPageRg; }
    inline void     SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; }
    inline void     SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; }
    inline void     SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; }
    void     SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; }
    void     SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; }
    void     SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; }
};

#endif
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index a58fa57..7399043 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -42,13 +42,13 @@ class ShellMoveCursor
    SwWrtShell* pSh;
    bool bAct;
public:
    inline ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel )
    ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel )
    {
        bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrameType(nullptr,false) & FrameTypeFlags::FLY_ANY);
        ( pSh = pWrtSh )->MoveCursor( bSel );
        pWrtSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_HYPERLINK_GETLINK);
    }
    inline ~ShellMoveCursor()
    ~ShellMoveCursor()
    {
        if( bAct )
        {
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index e57eae2..6171bdd 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -165,7 +165,7 @@ public:
    */
    void    disposing();

    inline ::toolkit::AccessibilityClient& getAccessibleFactory()
    ::toolkit::AccessibilityClient& getAccessibleFactory()
    {
        return maAccFactory;
    }
@@ -174,17 +174,17 @@ public:

    /** returns the container of registered XWindowListener2 listeners
    */
    inline ::comphelper::OInterfaceContainerHelper2&   getWindow2Listeners()       { return maWindow2Listeners; }
    inline ::comphelper::OInterfaceContainerHelper2&   getDockableWindowListeners(){ return maDockableWindowListeners; }
    inline EventListenerMultiplexer&            getEventListeners()         { return maEventListeners; }
    inline FocusListenerMultiplexer&            getFocusListeners()         { return maFocusListeners; }
    inline WindowListenerMultiplexer&           getWindowListeners()        { return maWindowListeners; }
    inline KeyListenerMultiplexer&              getKeyListeners()           { return maKeyListeners; }
    inline MouseListenerMultiplexer&            getMouseListeners()         { return maMouseListeners; }
    inline MouseMotionListenerMultiplexer&      getMouseMotionListeners()   { return maMouseMotionListeners; }
    inline PaintListenerMultiplexer&            getPaintListeners()         { return maPaintListeners; }
    inline VclContainerListenerMultiplexer&     getContainerListeners()     { return maContainerListeners; }
    inline TopWindowListenerMultiplexer&        getTopWindowListeners()     { return maTopWindowListeners; }
    ::comphelper::OInterfaceContainerHelper2&   getWindow2Listeners()       { return maWindow2Listeners; }
    ::comphelper::OInterfaceContainerHelper2&   getDockableWindowListeners(){ return maDockableWindowListeners; }
    EventListenerMultiplexer&            getEventListeners()         { return maEventListeners; }
    FocusListenerMultiplexer&            getFocusListeners()         { return maFocusListeners; }
    WindowListenerMultiplexer&           getWindowListeners()        { return maWindowListeners; }
    KeyListenerMultiplexer&              getKeyListeners()           { return maKeyListeners; }
    MouseListenerMultiplexer&            getMouseListeners()         { return maMouseListeners; }
    MouseMotionListenerMultiplexer&      getMouseMotionListeners()   { return maMouseMotionListeners; }
    PaintListenerMultiplexer&            getPaintListeners()         { return maPaintListeners; }
    VclContainerListenerMultiplexer&     getContainerListeners()     { return maContainerListeners; }
    TopWindowListenerMultiplexer&        getTopWindowListeners()     { return maTopWindowListeners; }

private:
    DECL_LINK( OnProcessCallbacks, void*, void );
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 53597f5..84e450e 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -143,7 +143,7 @@ private:
    */
    ::sal_Int32 impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const;

    inline bool impl_isSorted_nothrow() const
    bool impl_isSorted_nothrow() const
    {
        return m_currentSortColumn >= 0;
    }
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index f918ae7..2e298255 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -57,8 +57,8 @@ public:
    {
    }

    inline const OUString&                   getName() const { return msName; }
    inline const uno::Reference< awt::XControl >&   getControl() const { return mxControl; }
    const OUString&                   getName() const { return msName; }
    const uno::Reference< awt::XControl >&   getControl() const { return mxControl; }
};

class UnoControlHolderList
@@ -87,7 +87,7 @@ public:

    /** determines whether or not the list is empty
    */
    inline bool         empty() const { return maControls.empty(); }
    bool         empty() const { return maControls.empty(); }

    /** retrieves all controls currently in the list
    */
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 2ea27d5d..790a2fd 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -296,11 +296,11 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )

struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,OUString,bool>
{
    inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const
    bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const
    {
        return lhs.aName.compareTo(rhs.aName) < 0;
    }
    inline bool operator()(const ImplPropertyInfo& lhs,const OUString& rhs)  const
    bool operator()(const ImplPropertyInfo& lhs,const OUString& rhs)  const
    {
        return lhs.aName.compareTo(rhs) < 0;
    }
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 7c4827c..29e3751 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -406,7 +406,7 @@ struct ImpContent

struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpContent, bool>
{
    inline bool operator() (const ImpContent& lhs, const ImpContent& rhs) const
    bool operator() (const ImpContent& lhs, const ImpContent& rhs) const
    {
        return lhs.nTypeAndId < rhs.nTypeAndId;
    }
diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx
index 75b17b5..69b4306 100644
--- a/ucb/source/inc/regexp.hxx
+++ b/ucb/source/inc/regexp.hxx
@@ -37,10 +37,10 @@ public:

    inline bool operator ==(Regexp const & rOther) const;

    inline bool isDefault() const
    bool isDefault() const
    { return m_eKind == KIND_PREFIX && m_aPrefix.isEmpty(); }

    inline Kind getKind() const { return m_eKind; }
    Kind getKind() const { return m_eKind; }

    bool matches(OUString const & rString) const;

diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index f8f5450..e9475f8 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -39,7 +39,7 @@ template< typename Val >
class RegexpMapEntry
{
public:
    inline RegexpMapEntry(OUString const & rTheRegexp,
    RegexpMapEntry(OUString const & rTheRegexp,
                          Val * pTheValue):
        m_aRegexp(rTheRegexp), m_pValue(pTheValue) {}

@@ -61,7 +61,7 @@ struct Entry
    Regexp m_aRegexp;
    Val m_aValue;

    inline Entry(Regexp const & rTheRegexp, Val const & rTheValue):
    Entry(Regexp const & rTheRegexp, Val const & rTheValue):
        m_aRegexp(rTheRegexp), m_aValue(rTheValue) {}
};

diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 5371869..2a427c6 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -196,7 +196,7 @@ namespace fileaccess

            ~MyProperty();
            inline const bool& SAL_CALL IsNative() const;
            inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; }
            const OUString& SAL_CALL getPropertyName() const { return PropertyName; }
            inline const sal_Int32& SAL_CALL getHandle() const;
            inline const css::uno::Type& SAL_CALL getType() const;
            inline const css::uno::Any& SAL_CALL getValue() const;
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 58839c8..52891f3 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -54,7 +54,7 @@ namespace webdav_ucp
class DAVSession
{
public:
    inline void acquire()
    void acquire()
    {
        osl_atomic_increment( &m_nRefCount );
    }
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index e126394..892347e 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -104,7 +104,7 @@ struct PropertyValue
    Reference< XArray >         xArray;             // getArray
    Any                         aObject;            // getObject

    inline PropertyValue()
    PropertyValue()
        : nPropsSet( PropsSet::NONE ), nOrigValue( PropsSet::NONE ),
          bBoolean(false),
          nByte(0),
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index b7c6b9a..32bb546 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -156,7 +156,7 @@ struct VbaApplicationBase_Impl final
    VbaTimerHashMap m_aTimerHash;
    bool mbVisible;

    inline VbaApplicationBase_Impl() : mbVisible( true ) {}
    VbaApplicationBase_Impl() : mbVisible( true ) {}

    ~VbaApplicationBase_Impl()
    {
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index b180fb7..9c0772c 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -257,7 +257,7 @@ ScVbaCommandBarControls::getServiceNames()
class VbaDummyIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAccess >
{
public:
    inline VbaDummyIndexAccess() {}
    VbaDummyIndexAccess() {}
    // XIndexAccess
    virtual ::sal_Int32 SAL_CALL getCount(  ) override
        { return 0; }
diff --git a/vcl/inc/ResampleKernel.hxx b/vcl/inc/ResampleKernel.hxx
index 9088c7a..1d40b4d 100644
--- a/vcl/inc/ResampleKernel.hxx
+++ b/vcl/inc/ResampleKernel.hxx
@@ -47,7 +47,7 @@ public:
        return (-3.0 <= x && x < 3.0) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0;
    }

    static inline double SincFilter(double x)
    static double SincFilter(double x)
    {
        if (x == 0.0)
        {
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index bc411a5..84a9a6c 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -336,8 +336,8 @@ public:
    DrawTextFlags   ImplGetTextStyle() const;

    /// pb: #106948# explicit mirroring for calc
    inline void     EnableMirroring()       { mbMirroring = true; }
    inline bool     IsMirroring() const { return mbMirroring; }
    void     EnableMirroring()       { mbMirroring = true; }
    bool     IsMirroring() const { return mbMirroring; }

    bool GetEdgeBlending() const { return mbEdgeBlending; }
    void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
@@ -463,8 +463,8 @@ public:
    void SetEdgeBlending(bool bNew);

    /// pb: #106948# explicit mirroring for calc
    inline void     EnableMirroring()   { maLBWindow->EnableMirroring(); }
    inline void     SetDropTraget(const css::uno::Reference< css::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
    void     EnableMirroring()   { maLBWindow->EnableMirroring(); }
    void     SetDropTraget(const css::uno::Reference< css::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
};

class ImplListBoxFloatingWindow : public FloatingWindow
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index fd4eb97..3a06b2a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -78,7 +78,7 @@ private:

    inline bool GetTextureRect(const SalTwoRect& rPosAry, bool bInverted, GLfloat& x1, GLfloat& x2, GLfloat& y1, GLfloat& y2) const;

    inline bool IsValid() const
    bool IsValid() const
    {
        return (mpImpl && mpImpl->mnTexture != 0);
    }
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index 8123f4c..9fb13d5 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -82,14 +82,14 @@ s     * ICU "poor man's RTTI", returns a UClassID for the actual class.
     *
     * @stable ICU 2.2
     */
    virtual inline UClassID getDynamicClassID() const override { return getStaticClassID(); }
    virtual UClassID getDynamicClassID() const override { return getStaticClassID(); }

    /**
     * ICU "poor man's RTTI", returns a UClassID for this class.
     *
     * @stable ICU 2.2
     */
    static inline UClassID getStaticClassID() { return static_cast<UClassID>(const_cast<char *>(&fgClassID)); }
    static UClassID getStaticClassID() { return static_cast<UClassID>(const_cast<char *>(&fgClassID)); }

private:

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index f5d458e..b752f28 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -421,7 +421,7 @@ public:
        , mnX(0)
    {}

    inline void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB)
    void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB)
    {
        // calculate to which index we will write
        long nScanlineIndex = mnX / mnColorsPerByte;
@@ -435,7 +435,7 @@ public:
        mnX++;
    }

    inline void nextLine(sal_uInt8* pScanline)
    void nextLine(sal_uInt8* pScanline)
    {
        mnX = 0;
        mpCurrentScanline = pScanline;
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 2350df2..8f2cf84e 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -201,8 +201,8 @@ public:
                    ImplVectMap( long nWidth, long nHeight );
                    ~ImplVectMap();

    inline long     Width() const { return mnWidth; }
    inline long     Height() const { return mnHeight; }
    long     Width() const { return mnWidth; }
    long     Height() const { return mnHeight; }

    inline void     Set( long nY, long nX, sal_uInt8 cVal );
    inline sal_uInt8        Get( long nY, long nX ) const;
diff --git a/vcl/source/gdi/scrptrun.cxx b/vcl/source/gdi/scrptrun.cxx
index d6557d7..eeb225d 100644
--- a/vcl/source/gdi/scrptrun.cxx
+++ b/vcl/source/gdi/scrptrun.cxx
@@ -102,7 +102,7 @@ struct PairIndices
        ma30[0x1b] = 33;
    }

    inline int32_t getPairIndex(UChar32 ch) const
    int32_t getPairIndex(UChar32 ch) const
    {
        if (ch < 0xff)
            return ma00[ch];
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 330a20d..d63c397 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -84,7 +84,7 @@ public:

    // use this method to avoid adding the properties for the table
    // but in the provided properties map.
    inline void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; };
    void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; };

    virtual bool sprm(Sprm & rSprm) override;
    bool attribute(Id nName, Value & val);
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 8fa0f40..6ced273 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -62,7 +62,7 @@ public:
    PageBordersHandler( );
    virtual ~PageBordersHandler( ) override;

    inline sal_Int32 GetDisplayOffset( )
    sal_Int32 GetDisplayOffset( )
    {
        return ( m_nOffset << 5 ) + m_nDisplay;
    };
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index 4007651..7197c13 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -46,12 +46,12 @@ public:

    bool sprm(Sprm & sprm);

    inline void SetTableManager( TableManager* pTableManager )
    void SetTableManager( TableManager* pTableManager )
    {
        m_pTableManager = pTableManager;
    };

    inline void SetProperties( PropertyMapPtr pProperties )
    void SetProperties( PropertyMapPtr pProperties )
    {
        m_pCurrentProperties = pProperties;
    };
@@ -60,7 +60,7 @@ public:

private:

    inline void cellProps( TablePropertyMapPtr pProps )
    void cellProps( TablePropertyMapPtr pProps )
    {
        if ( m_pTableManager )
            m_pTableManager->cellProps( pProps );
@@ -68,7 +68,7 @@ private:
            m_pCurrentProperties->InsertProps(pProps);
    };

    inline void insertRowProps( TablePropertyMapPtr pProps )
    void insertRowProps( TablePropertyMapPtr pProps )
    {
        if ( m_pTableManager )
            m_pTableManager->insertRowProps( pProps );
@@ -76,7 +76,7 @@ private:
            m_pCurrentProperties->InsertProps(pProps);
    };

    inline void insertTableProps( TablePropertyMapPtr pProps )
    void insertTableProps( TablePropertyMapPtr pProps )
    {
        if ( m_pTableManager )
            m_pTableManager->insertTableProps( pProps );
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 5d38727..920a565 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -69,7 +69,7 @@ public:
    virtual ~TblStylePrHandler( ) override;

    const PropertyMapPtr&       getProperties() { return m_pProperties; };
    inline TblStyleType         getType() { return m_nType; };
    TblStyleType         getType() { return m_nType; };
    OUString getTypeString();
    void appendInteropGrabBag(const OUString& aKey, const OUString& aValue);
    css::beans::PropertyValue getInteropGrabBag(const OUString& aName);
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 924e0d2..cbc61f5 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -157,7 +157,7 @@ public:
    const css::uno::Any& getValue( sal_Int16 nIndex,
                        const css::uno::Reference<css::beans::XMultiPropertySet> & );

    inline void resetValues() { pValues = nullptr; }
    void resetValues() { pValues = nullptr; }
};


diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index f5b99a3..a3edc2e 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -29,7 +29,7 @@ struct StyleNameKey_Impl
    sal_uInt16 m_nFamily;
    OUString m_aName;

    inline StyleNameKey_Impl( sal_uInt16 nFamily,
    StyleNameKey_Impl( sal_uInt16 nFamily,
                               const OUString& rName ) :
        m_nFamily( nFamily ),
        m_aName( rName )
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 5d2e5c2..106545c 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -149,10 +149,10 @@ public:

protected:
    /// get helper
    inline XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; }
    XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; }

    const OUString& GetServiceName() { return sServiceName; }
    inline void SetServiceName(const OUString& sStr) { sServiceName = sStr; }
    void SetServiceName(const OUString& sStr) { sServiceName = sStr; }

    OUString const & GetContent();

diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index bfe9903..b5e1d6dc 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -73,12 +73,12 @@ public:
        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet);

    /// is value a string (rather than double)?
    inline bool IsStringValue() { return bStringType; }
    bool IsStringValue() { return bStringType; }

    /// has format been read?
    inline bool IsFormatOK() { return bFormatOK; }
    bool IsFormatOK() { return bFormatOK; }

    inline void SetDefault(const OUString& sStr) { sDefault = sStr; }
    void SetDefault(const OUString& sStr) { sDefault = sStr; }
};


@@ -169,7 +169,7 @@ protected:

    // various accessor methods:
    const OUString& GetName()       { return sName; }
    inline bool IsStringValue()     { return aValueHelper.IsStringValue();}
    bool IsStringValue()     { return aValueHelper.IsStringValue();}
};


diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index f9cffea..5b70383 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -94,7 +94,7 @@ class   OUStringComparison
{
public:
    /// Compare two strings.  Returns true if the first is before the second.
    inline  bool    operator()  (const OUString & a, const OUString & b) const
    bool    operator()  (const OUString & a, const OUString & b) const
    {
        return (a.compareTo (b) < 0);
    }
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 44b067b..b530058 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1421,7 +1421,7 @@ namespace xmloff
        const sal_Int32 m_nHandle;
        explicit EqualHandle( sal_Int32 _nHandle ) : m_nHandle( _nHandle ) { }

        inline bool operator()( const PropertyValue& _rProp )
        bool operator()( const PropertyValue& _rProp )
        {
            return _rProp.Handle == m_nHandle;
        }
@@ -1474,7 +1474,7 @@ namespace xmloff
        const OUString & m_sName;
        explicit EqualName( const OUString& _rName ) : m_sName( _rName ) { }

        inline bool operator()( const PropertyValue& _rProp )
        bool operator()( const PropertyValue& _rProp )
        {
            return _rProp.Name == m_sName;
        }
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index c41ebfd..fcfab79 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -211,7 +211,7 @@ namespace xmloff
            @param _nId
                the id of the attribute. Has to be one of the DA_* constants.
        */
        static inline sal_uInt16 getDatabaseAttributeNamespace(DAFlags )
        static sal_uInt16 getDatabaseAttributeNamespace(DAFlags )
        {
            // nothing special here
            return XML_NAMESPACE_FORM;
@@ -233,7 +233,7 @@ namespace xmloff
            @param _nId
                the id of the attribute. Has to be one of the BA_* constants.
        */
        static inline sal_uInt16 getBindingAttributeNamespace(BAFlags )
        static sal_uInt16 getBindingAttributeNamespace(BAFlags )
        {
            // nothing special here
            return XML_NAMESPACE_FORM;
@@ -255,7 +255,7 @@ namespace xmloff
            @param _nId
                the id of the attribute
        */
        static inline sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes )
        static sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes )
        { // nothing special here
          return XML_NAMESPACE_FORM;
        }
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 06e4b50..f811426 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -88,7 +88,7 @@ namespace
    public:
        explicit StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { }

        inline bool operator()( const OUString& _rCompare )
        bool operator()( const OUString& _rCompare )
        {
            return ( _rCompare == m_sReference );
        }
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index d3387a8..d54c970 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -95,8 +95,8 @@ namespace xmloff
            const OUString& _rReferringControls);

        // OFormLayerXMLImport_Impl
        inline OAttribute2Property&         getAttributeMap()   { return m_aAttributeMetaData; }
        inline SvXMLImport&                 getGlobalContext()  { return m_rImporter; }
        OAttribute2Property&         getAttributeMap()   { return m_aAttributeMetaData; }
        SvXMLImport&                 getGlobalContext()  { return m_rImporter; }
        const SvXMLStyleContext*            getStyleElement(const OUString& _rStyleName) const;
        void                                enterEventContext();
        void                                leaveEventContext();
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index d25e768..ff2efad 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -238,7 +238,7 @@ namespace xmloff

            <p>If _bAddType is set, an additional xlink:type="simple" attribute is also added.</p>
        */
        inline void exportTargetLocationAttribute(bool _bAddType) { exportRelativeTargetLocation(PROPERTY_TARGETURL,CCAFlags::TargetLocation,_bAddType); }
        void exportTargetLocationAttribute(bool _bAddType) { exportRelativeTargetLocation(PROPERTY_TARGETURL,CCAFlags::TargetLocation,_bAddType); }

        /** add the form:image attribute to the export context.

@@ -246,7 +246,7 @@ namespace xmloff

            <p>The property needs a special handling because the URL's need to be made relative</p>
        */
        inline void exportImageDataAttribute() { exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCAFlags::ImageData,false); }
        void exportImageDataAttribute() { exportRelativeTargetLocation(PROPERTY_IMAGEURL,CCAFlags::ImageData,false); }

        /** flag the style properties as 'already exported'

diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 23d2b4c6..8cb8159 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -123,18 +123,18 @@ namespace xmloff
        */
        void        enableTrackAttributes() { m_bTrackAttributes = true; }

        inline void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp)
        void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp)
        {
            m_aValues.push_back(_rProp);
        }

        inline void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue )
        void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue )
        {
            m_aValues.push_back( css::beans::PropertyValue(
                _rName, -1, _rValue, css::beans::PropertyState_DIRECT_VALUE ) );
        }

        inline void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp)
        void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp)
        {
            m_aGenericValues.push_back(_rProp);
        }
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index ba9aef6..ccb171c1 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -222,23 +222,23 @@ public:
    sal_Int32 GetLevel() const { return nLevel; }
    Sequence<beans::PropertyValue> GetProperties();

    inline void SetPosAndSpaceMode( sal_Int16 eValue )
    void SetPosAndSpaceMode( sal_Int16 eValue )
    {
        ePosAndSpaceMode = eValue;
    }
    inline void SetLabelFollowedBy( sal_Int16 eValue )
    void SetLabelFollowedBy( sal_Int16 eValue )
    {
        eLabelFollowedBy = eValue;
    }
    inline void SetListtabStopPosition( sal_Int32 nValue )
    void SetListtabStopPosition( sal_Int32 nValue )
    {
        nListtabStopPosition = nValue;
    }
    inline void SetFirstLineIndent( sal_Int32 nValue )
    void SetFirstLineIndent( sal_Int32 nValue )
    {
        nFirstLineIndent = nValue;
    }
    inline void SetIndentAt( sal_Int32 nValue )
    void SetIndentAt( sal_Int32 nValue )
    {
        nIndentAt = nValue;
    }
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index 7b60c03..d7f403a 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -134,8 +134,8 @@ public:

protected:

    inline SvXMLExport& GetExport() { return rExport; }
    inline XMLTextParagraphExport& GetParaExport() { return rParaExport; }
    SvXMLExport& GetExport() { return rExport; }
    XMLTextParagraphExport& GetParaExport() { return rParaExport; }

    // export methods for section and index start:

diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index 6f9e500..dcf49f2 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -56,11 +56,11 @@ public:
    bool HasStartValue() const { return -1 != nStartValue; }
    sal_Int16 GetStartValue() const { return nStartValue; }

    inline bool HasNumRulesOverride() const
    bool HasNumRulesOverride() const
    {
        return mxNumRulesOverride.is();
    }
    inline const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const
    const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const
    {
        return mxNumRulesOverride;
    }
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 6ec6bd1..26394e1 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -70,50 +70,50 @@ public:
              const bool bExportTextNumberElement );
    inline void Reset();

    inline const OUString& GetNumRulesName() const
    const OUString& GetNumRulesName() const
    {
        return msNumRulesName;
    }
    inline sal_Int16 GetListLevelStartValue() const
    sal_Int16 GetListLevelStartValue() const
    {
        return mnListLevelStartValue;
    }

    inline const OUString& GetListId() const
    const OUString& GetListId() const
    {
        return msListId;
    }

    inline sal_Int16 GetLevel() const
    sal_Int16 GetLevel() const
    {
        return mnListLevel;
    }

    inline bool HasStartValue() const
    bool HasStartValue() const
    {
        return mnListStartValue != -1;
    }
    inline sal_uInt32 GetStartValue() const
    sal_uInt32 GetStartValue() const
    {
        return mnListStartValue;
    }

    inline bool IsNumbered() const
    bool IsNumbered() const
    {
        return mbIsNumbered;
    }
    inline bool IsRestart() const
    bool IsRestart() const
    {
        return mbIsRestart;
    }

    bool BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const;

    inline bool IsContinueingPreviousSubTree() const
    bool IsContinueingPreviousSubTree() const
    {
        return mbContinueingPreviousSubTree;
    }
    inline const OUString& ListLabelString() const
    const OUString& ListLabelString() const
    {
        return msListLabelString;
    }
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index f7016db..606709c 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -31,18 +31,18 @@ struct NameKey_Impl
    sal_uInt16 m_nPrefix;
    OUString m_aLocalName;

    inline NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) :
    NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) :
        m_nPrefix( nPrfx ),
        m_aLocalName( rLclNm )
    {
    }

    inline NameKey_Impl() :
    NameKey_Impl() :
        m_nPrefix( XML_NAMESPACE_UNKNOWN )
    {
    }

    inline void SetLocalName( ::xmloff::token::XMLTokenEnum eLclNm )
    void SetLocalName( ::xmloff::token::XMLTokenEnum eLclNm )
    {
        m_aLocalName = ::xmloff::token::GetXMLToken( eLclNm );
    }
@@ -75,7 +75,7 @@ struct TransformerAction_Impl
    sal_uInt32 m_nParam2;
    sal_uInt32 m_nParam3;

    inline TransformerAction_Impl() :
    TransformerAction_Impl() :
        m_nActionType( XML_TACTION_EOT ),
        m_nParam1( 0 ),
        m_nParam2( 0 ),
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index ad0257f..e34427c 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -182,8 +182,8 @@ public:
    const XMLTransformerContext *GetAncestorContext( sal_uInt32 i ) const;

    // C++
    inline void SetClass( const OUString& r ) { m_aClass = r; }
    inline const OUString& GetClass() const { return m_aClass; }
    void SetClass( const OUString& r ) { m_aClass = r; }
    const OUString& GetClass() const { return m_aClass; }

    bool isWriter() const;

diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index a05f5df..5ac0831 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -63,7 +63,7 @@ struct PrefixEntry
{
    ::std::vector< sal_Int32 > m_Uids;

    inline PrefixEntry()
    PrefixEntry()
        { m_Uids.reserve( 4 ); }
};

@@ -75,7 +75,7 @@ struct ElementEntry
    Reference< xml::input::XElement > m_xElement;
    ::std::vector< OUString > m_prefixes;

    inline ElementEntry()
    ElementEntry()
        { m_prefixes.reserve( 2 ); }
};

diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 8dc886c..661f356 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -120,16 +120,16 @@ public:
    void readDefaults( bool supportPrintable = true, bool supportVisible = true );
    void readStringAttr(
        OUString const & rPropName, OUString const & rAttrName );
    inline void readDoubleAttr(
    void readDoubleAttr(
        OUString const & rPropName, OUString const & rAttrName )
        { read<double>( rPropName, rAttrName ); }
    inline void readLongAttr(
    void readLongAttr(
        OUString const & rPropName, OUString const & rAttrName,
        bool forceAttribute = false )
        { read<sal_Int32>( rPropName, rAttrName, forceAttribute ); }
    void readHexLongAttr(
        OUString const & rPropName, OUString const & rAttrName );
    inline void readShortAttr(
    void readShortAttr(
        OUString const & rPropName, OUString const & rAttrName )
        { read<sal_Int32>( rPropName, rAttrName ); }
    inline void readBoolAttr(
@@ -165,7 +165,7 @@ public:
        OUString const & rPropName, OUString const & rAttrName );
    void readDataAwareAttr(
        OUString const & rAttrName );
    inline void addBoolAttr(
    void addBoolAttr(
        OUString const & rAttrName, bool bValue )
        { addAttribute( rAttrName, OUString::boolean(bValue) ); }
    void addNumberFormatAttr(
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 5a025dc..99350b7 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -131,7 +131,7 @@ public:

    sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;

    inline bool isEventElement(
    bool isEventElement(
        sal_Int32 nUid, OUString const & rLocalName )
    {
        return ((XMLNS_SCRIPT_UID == nUid && (rLocalName == "event" || rLocalName == "listener-event" )) ||
@@ -144,12 +144,12 @@ public:
    css::uno::Reference< css::xml::input::XElement > getStyle(
        OUString const & rStyleId ) const;

    inline css::uno::Reference< css::uno::XComponentContext >
    css::uno::Reference< css::uno::XComponentContext >
    const & getComponentContext()  { return _xContext; }
    css::uno::Reference< css::util::XNumberFormatsSupplier >
    const & getNumberFormatsSupplier();

    inline DialogImport(
    DialogImport(
        css::uno::Reference<css::uno::XComponentContext> const & xContext,
        css::uno::Reference<css::container::XNameContainer>
        const & xDialogModel,
@@ -166,7 +166,7 @@ public:
        , XMLNS_SCRIPT_UID( 0 )
        { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
                      _xContext.is() ); }
    inline DialogImport( const DialogImport& rOther ) :
    DialogImport( const DialogImport& rOther ) :
        ::cppu::WeakImplHelper< css::xml::input::XRoot >()
        , _xContext( rOther._xContext )
        , _xSupplier( rOther._xSupplier )
@@ -243,7 +243,7 @@ public:
        sal_Int32 nUid, OUString const & rLocalName,
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;

    inline StylesElement(
    StylesElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -329,7 +329,7 @@ public:
        sal_Int32 nUid, OUString const & rLocalName,
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;

    inline MenuPopupElement(
    MenuPopupElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -373,7 +373,7 @@ protected:
    const OUString _aId;

public:
    inline ImportContext(
    ImportContext(
        DialogImport * pImport,
        css::uno::Reference< css::beans::XPropertySet > const & xControlModel_,
        OUString const & id )
@@ -465,7 +465,7 @@ public:
class ControlImportContext : public ImportContext
{
public:
    inline ControlImportContext(
    ControlImportContext(
        DialogImport * pImport,
        OUString const & rId, OUString const & rControlName )
        : ImportContext(
@@ -474,7 +474,7 @@ public:
                pImport->_xDialogModelFactory->createInstance( rControlName ),
                css::uno::UNO_QUERY_THROW ), rId )
        {}
    inline ControlImportContext(
    ControlImportContext(
        DialogImport * pImport,
        const css::uno::Reference< css::beans::XPropertySet >& xProps, OUString const & rControlName )
        : ImportContext(
@@ -485,7 +485,7 @@ public:

    /// @throws css::xml::sax::SAXException
    /// @throws css::uno::RuntimeException
    inline void finish()
    void finish()
    {
        try
        {
@@ -511,7 +511,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline WindowElement(
    WindowElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        DialogImport * pImport )
@@ -525,7 +525,7 @@ class EventElement
public:
    virtual void SAL_CALL endElement() override;

    inline EventElement(
    EventElement(
        sal_Int32 nUid, OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -558,7 +558,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline ButtonElement(
    ButtonElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -576,7 +576,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline CheckBoxElement(
    CheckBoxElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -595,7 +595,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline ComboBoxElement(
    ComboBoxElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -614,7 +614,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline MenuListElement(
    MenuListElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -631,7 +631,7 @@ public:
        sal_Int32 nUid, OUString const & rLocalName,
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;

    inline RadioElement(
    RadioElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -650,7 +650,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    void SAL_CALL endElement() override;

    inline RadioGroupElement(
    RadioGroupElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -670,7 +670,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline TitledBoxElement(
    TitledBoxElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -688,7 +688,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline TextElement(
    TextElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -705,7 +705,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline FixedHyperLinkElement(
    FixedHyperLinkElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -723,7 +723,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline TextFieldElement(
    TextFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -741,7 +741,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline ImageControlElement(
    ImageControlElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -759,7 +759,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline FileControlElement(
    FileControlElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -777,7 +777,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline TreeControlElement(
    TreeControlElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -795,7 +795,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline CurrencyFieldElement(
    CurrencyFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -813,7 +813,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline DateFieldElement(
    DateFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -831,7 +831,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline NumericFieldElement(
    NumericFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -849,7 +849,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline TimeFieldElement(
    TimeFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -867,7 +867,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline PatternFieldElement(
    PatternFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -885,7 +885,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline FormattedFieldElement(
    FormattedFieldElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -903,7 +903,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline FixedLineElement(
    FixedLineElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -921,7 +921,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline ScrollBarElement(
    ScrollBarElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -939,7 +939,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline SpinButtonElement(
    SpinButtonElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -957,7 +957,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline MultiPage(
    MultiPage(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -980,7 +980,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline Frame(
    Frame(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -1000,7 +1000,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline Page(
    Page(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
@@ -1022,7 +1022,7 @@ public:
        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
    virtual void SAL_CALL endElement() override;

    inline ProgressBarElement(
    ProgressBarElement(
        OUString const & rLocalName,
        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
        ElementBase * pParent, DialogImport * pImport )
diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index 0c3d177..b5bd77f 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -68,7 +68,7 @@ public:
    virtual ~MacroSecurity() override;
    virtual void dispose() override;

    inline void EnableReset(bool _bEnable = true)
    void EnableReset(bool _bEnable = true)
    {
        m_pResetBtn->Enable ( _bEnable );
    }