diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /include/filter | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/dffpropset.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 14 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 4 | ||||
-rw-r--r-- | include/filter/msfilter/msvbahelper.hxx | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 7a8ff2938cf7..6e7ca4a415a6 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.hxx @@ -55,7 +55,7 @@ class MSFILTER_DLLPUBLIC DffPropSet explicit DffPropSet(); ~DffPropSet(); - inline bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); }; + bool IsProperty( sal_uInt32 nRecType ) const { return ( mpPropSetEntries[ nRecType & 0x3ff ].aFlags.bSet ); }; bool IsHardAttribute( sal_uInt32 nId ) const; sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault ) const; /** Returns a boolean property by its real identifier. */ diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 531cced1bba9..5a2f1d3bd676 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -963,9 +963,9 @@ public: sal_uInt32 GetLastShapeId( sal_uInt32 nDrawingId ) const; /** Sets the flag indicating that the DGGCONTAINER exists. */ - inline void SetDggContainer() { mbHasDggCont = true; } + void SetDggContainer() { mbHasDggCont = true; } /** Sets the flag indicating that the DGGCONTAINER exists. */ - inline bool HasDggContainer() const { return mbHasDggCont; } + bool HasDggContainer() const { return mbHasDggCont; } /** Returns the total size of the DGG atom (including header). */ sal_uInt32 GetDggAtomSize() const; /** Writes the complete DGG atom to the passed stream (overwrites existing data!). */ @@ -981,7 +981,7 @@ public: SvStream* QueryPictureStream(); /** Returns the picture stream if existing (queried), otherwise null. */ - inline SvStream* GetPictureStream() { return mpPicStrm; } + SvStream* GetPictureStream() { return mpPicStrm; } private: /** Derived classes may implement to create a new stream used to store the @@ -999,7 +999,7 @@ private: { sal_uInt32 mnDrawingId; /// Identifier of drawing this cluster belongs to (one-based index into maDrawingInfos). sal_uInt32 mnNextShapeId; /// Next free shape identifier in this cluster. - inline explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {} + explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {} }; typedef ::std::vector< ClusterEntry > ClusterTable; @@ -1008,7 +1008,7 @@ private: sal_uInt32 mnClusterId; /// Currently used cluster (one-based index into maClusterTable). sal_uInt32 mnShapeCount; /// Current number of shapes in this drawing. sal_uInt32 mnLastShapeId; /// Last shape identifier generated for this drawing. - inline explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {} + explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {} }; typedef ::std::vector< DrawingInfo > DrawingInfoVector; @@ -1054,7 +1054,7 @@ public: /** Creates and returns a new shape identifier, updates the internal shape counters and registers the identifier in the DGG cluster table. */ - inline sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } + sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); } /** Returns the graphic provider from the global object that has been passed to the constructor. @@ -1064,7 +1064,7 @@ public: /** Called if a picture shall be written and no picture stream is set at class ImplEESdrWriter. */ - inline SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); } + SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); } /// Inserts internal data into the EscherStream, this process /// may and has to be executed only once diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 5ea99506b084..f7c993db0fc3 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -681,10 +681,10 @@ public: const Rectangle& rClientRect, const Rectangle& rGlobalChildRect ); - inline const SvxMSDffShapeInfos_ById* GetShapeInfos() const + const SvxMSDffShapeInfos_ById* GetShapeInfos() const { return m_xShapeInfosById.get(); } - inline SvxMSDffShapeOrders* GetShapeOrders() const + SvxMSDffShapeOrders* GetShapeOrders() const { return m_pShapeOrders; } void StoreShapeOrder(sal_uLong nId, diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 002ee4dfa50e..57136bf6366f 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -54,7 +54,7 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo OUString msResolvedMacro; bool mbFound; - inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {} + explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {} }; MSFILTER_DLLPUBLIC OUString makeMacroURL( const OUString& sMacroName ); |