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/svx | |
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/svx')
-rw-r--r-- | include/svx/AccessibleShape.hxx | 2 | ||||
-rw-r--r-- | include/svx/algitem.hxx | 4 | ||||
-rw-r--r-- | include/svx/charmap.hxx | 4 | ||||
-rw-r--r-- | include/svx/framelink.hxx | 36 | ||||
-rw-r--r-- | include/svx/frmdirlbox.hxx | 2 | ||||
-rw-r--r-- | include/svx/frmsel.hxx | 2 | ||||
-rw-r--r-- | include/svx/grfcrop.hxx | 2 | ||||
-rw-r--r-- | include/svx/orienthelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/postattr.hxx | 8 | ||||
-rw-r--r-- | include/svx/svdocapt.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdoedge.hxx | 18 | ||||
-rw-r--r-- | include/svx/swframeexample.hxx | 14 | ||||
-rw-r--r-- | include/svx/xmlexchg.hxx | 6 |
13 files changed, 51 insertions, 51 deletions
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 0c40da37bd6e..08c6150d74e6 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -347,7 +347,7 @@ public: @param _nIndex The new index in parent. */ - inline void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; } + void setIndexInParent(sal_Int32 _nIndex) { m_nIndexInParent = _nIndex; } protected: /// Children manager. May be empty if there are no children. diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 57378da738c7..05feaab75582 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -51,7 +51,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) + SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) { SetValue( rOrientation.GetValue() ); return *this; @@ -99,7 +99,7 @@ public: sal_Int16 GetBottomMargin() const {return nBottomMargin; } void SetBottomMargin(sal_Int16 nBottom); - inline SvxMarginItem& operator=(const SvxMarginItem& rMargin) + SvxMarginItem& operator=(const SvxMarginItem& rMargin) { nLeftMargin = rMargin.nLeftMargin; nTopMargin = rMargin.nTopMargin; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index eb1fd88c8ba6..36ece5e8cc7a 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -64,8 +64,8 @@ public: void SelectIndex( int index, bool bFocus = false ); void OutputIndex( int index ); void DeSelect(); - inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } - inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } + bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } + sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } static sal_uInt16 GetRowPos(sal_uInt16 _nPos); static sal_uInt16 GetColumnPos(sal_uInt16 _nPos); diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index ab5e4728c89a..7520faf6ca21 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -117,20 +117,20 @@ public: /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0 ); - inline RefMode GetRefMode() const { return meRefMode; } - inline const Color& GetColorPrim() const { return maColorPrim; } - inline const Color& GetColorSecn() const { return maColorSecn; } - inline const Color& GetColorGap() const { return maColorGap; } - inline bool UseGapColor() const { return mbUseGapColor; } - inline double Prim() const { return mfPrim; } - inline double Dist() const { return mfDist; } - inline double Secn() const { return mfSecn; } + RefMode GetRefMode() const { return meRefMode; } + const Color& GetColorPrim() const { return maColorPrim; } + const Color& GetColorSecn() const { return maColorSecn; } + const Color& GetColorGap() const { return maColorGap; } + bool UseGapColor() const { return mbUseGapColor; } + double Prim() const { return mfPrim; } + double Dist() const { return mfDist; } + double Secn() const { return mfSecn; } double PatternScale() const { return mfPatternScale;} void SetPatternScale( double fScale ); - inline editeng::SvxBorderStyle Type() const { return mnType; } + editeng::SvxBorderStyle Type() const { return mnType; } /** Returns the total width of this frame style. */ - inline double GetWidth() const { return mfPrim + mfDist + mfSecn; } + double GetWidth() const { return mfPrim + mfDist + mfSecn; } /** Sets the frame style to invisible state. */ void Clear(); @@ -145,12 +145,12 @@ public: void Set( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); /** Sets a new reference point handling mode, does not modify other settings. */ - inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } + void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; } /** Sets a new color, does not modify other settings. */ - inline void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } - inline void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } + void SetColorPrim( const Color& rColor ) { maColorPrim = rColor; } + void SetColorSecn( const Color& rColor ) { maColorSecn = rColor; } /** Sets whether to use dotted style for single hair lines. */ - inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } + void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); @@ -187,15 +187,15 @@ class SAL_WARN_UNUSED DiagStyle : public Style { public: /** Constructs an invisible diagonal frame style. */ - inline explicit DiagStyle() : mfAngle( 0.0 ) {} + explicit DiagStyle() : mfAngle( 0.0 ) {} /** Constructs a diagonal frame style passed style and angle. */ - inline explicit DiagStyle( const Style& rStyle, double fAngle ) : + explicit DiagStyle( const Style& rStyle, double fAngle ) : Style( rStyle ), mfAngle( fAngle ) {} - inline double GetAngle() const { return mfAngle; } + double GetAngle() const { return mfAngle; } /** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */ - inline DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); } + DiagStyle Mirror() const { return DiagStyle( Style::Mirror(), mfAngle ); } private: double mfAngle; /// Angle between this and hor. or vert. border. diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 8fec54cc2571..18989a121ca4 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -53,7 +53,7 @@ public: SvxFrameDirection GetSelectEntryValue() const; /** Saves the currently selected frame direction. */ - inline void SaveValue() { meSaveValue = GetSelectEntryValue(); } + void SaveValue() { meSaveValue = GetSelectEntryValue(); } private: SvxFrameDirection meSaveValue; /// Saved value for later comparison. diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 2a153301e015..cbe6f7186bea 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -143,7 +143,7 @@ public: /** Selects or deselects all frame borders. */ void SelectAllBorders( bool bSelect ); /** Deselects all frame borders. */ - inline void DeselectAllBorders() { SelectAllBorders( false ); } + void DeselectAllBorders() { SelectAllBorders( false ); } /** Selects or deselects all visible frame borders (ignores hidden and "don't care" borders). */ void SelectAllVisibleBorders(); diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index bbae2350ba66..0526b4409070 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -60,7 +60,7 @@ public: sal_Int32 GetTop() const { return nTop; } sal_Int32 GetBottom() const { return nBottom; } - inline SvxGrfCrop& operator=( const SvxGrfCrop& rCrop ) + SvxGrfCrop& operator=( const SvxGrfCrop& rCrop ) { nLeft = rCrop.GetLeft(); nTop = rCrop.GetTop(); nRight = rCrop.GetRight(); nBottom = rCrop.GetBottom(); diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index baf56b67b583..f3d16bc9d614 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -75,7 +75,7 @@ public: /** Shows or hides the dial control and all dependent windows. */ void Show( bool bShow ); /** Hides the dial control and all dependent windows. */ - inline void Hide() { Show( false ); } + void Hide() { Show( false ); } /** Sets the "stacked" check box to the passed state and updates dependent controls. */ void SetStackedState( TriState eState ); diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 7f9a374cf009..ea3230211ac0 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) + SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) { SetValue( rAuthor.GetValue() ); return *this; @@ -75,7 +75,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) + SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) { SetValue( rDate.GetValue() ); return *this; @@ -106,7 +106,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) + SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) { SetValue( rText.GetValue() ); return *this; @@ -129,7 +129,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - inline SvxPostItIdItem& operator=( const SvxPostItIdItem& rId ) + SvxPostItIdItem& operator=( const SvxPostItIdItem& rId ) { SetValue( rId.GetValue() ); return *this; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index b4aa64ade87f..bd0034030258 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -140,7 +140,7 @@ public: // Add own implementation for TRSetBaseGeometry to handle TailPos over changes virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; - inline const Point& GetFixedTailPos() const {return maFixedTailPos;} + const Point& GetFixedTailPos() const {return maFixedTailPos;} // geometry access ::basegfx::B2DPolygon getTailPolygon() const; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index adda37c3d9e6..15e476e33e89 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -57,15 +57,15 @@ public: void ResetVars(); bool TakeGluePoint(SdrGluePoint& rGP) const; - inline void SetBestConnection( bool rB ) { bBestConn = rB; }; - inline void SetBestVertex( bool rB ) { bBestVertex = rB; }; - inline void SetAutoVertex( bool rB ) { bAutoVertex = rB; }; - inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; - - inline bool IsBestConnection() const { return bBestConn; }; - inline bool IsAutoVertex() const { return bAutoVertex; }; - inline sal_uInt16 GetConnectorId() const { return nConId; }; - inline SdrObject* GetObject() const { return pObj; } + void SetBestConnection( bool rB ) { bBestConn = rB; }; + void SetBestVertex( bool rB ) { bBestVertex = rB; }; + void SetAutoVertex( bool rB ) { bAutoVertex = rB; }; + void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; + + bool IsBestConnection() const { return bBestConn; }; + bool IsAutoVertex() const { return bAutoVertex; }; + sal_uInt16 GetConnectorId() const { return nConId; }; + SdrObject* GetObject() const { return pObj; } }; diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 6ac7f6b31af5..8b17f6290da4 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -74,16 +74,16 @@ public: SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle); - inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } + void SetWrap(sal_uInt16 nW) { nWrap = nW; } - inline void SetHAlign(short nH) { nHAlign = nH; } - inline void SetHoriRel(short nR) { nHRel = nR; } + void SetHAlign(short nH) { nHAlign = nH; } + void SetHoriRel(short nR) { nHRel = nR; } - inline void SetVAlign(short nV) { nVAlign = nV; } - inline void SetVertRel(short nR) { nVRel = nR; } + void SetVAlign(short nV) { nVAlign = nV; } + void SetVertRel(short nR) { nVRel = nR; } - inline void SetTransparent(bool bT) { bTrans = bT; } - inline void SetAnchor(short nA) { nAnchor = nA; } + void SetTransparent(bool bT) { bTrans = bT; } + void SetAnchor(short nA) { nAnchor = nA; } void SetRelPos(const Point& rP); }; diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 89ff80132568..6d2c0bfc1bae 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -48,9 +48,9 @@ namespace svx OUString szServiceName; css::uno::Reference< css::beans::XPropertySet > xPropSet; - inline OXFormsDescriptor() {} - inline OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; } - inline OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) { + OXFormsDescriptor() {} + OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; } + OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) { szName = rhs.szName; szServiceName = rhs.szServiceName; xPropSet = rhs.xPropSet; |