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/editeng | |
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/editeng')
43 files changed, 114 insertions, 114 deletions
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 2af8a546c4b5..04a04ff36ee3 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -71,18 +71,18 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; - inline void SetOneWord( const SvxAdjust eType ) + void SetOneWord( const SvxAdjust eType ) { bOneBlock = eType == SVX_ADJUST_BLOCK; } - inline void SetLastBlock( const SvxAdjust eType ) + void SetLastBlock( const SvxAdjust eType ) { bLastBlock = eType == SVX_ADJUST_BLOCK; bLastCenter = eType == SVX_ADJUST_CENTER; } - inline void SetAdjust( const SvxAdjust eType ) + void SetAdjust( const SvxAdjust eType ) { bLeft = eType == SVX_ADJUST_LEFT; bRight = eType == SVX_ADJUST_RIGHT; @@ -90,7 +90,7 @@ public: bBlock = eType == SVX_ADJUST_BLOCK; } - inline SvxAdjust GetLastBlock() const + SvxAdjust GetLastBlock() const { SvxAdjust eRet = SVX_ADJUST_LEFT; @@ -101,7 +101,7 @@ public: return eRet; } - inline SvxAdjust GetOneWord() const + SvxAdjust GetOneWord() const { SvxAdjust eRet = SVX_ADJUST_LEFT; @@ -110,7 +110,7 @@ public: return eRet; } - inline SvxAdjust GetAdjust() const + SvxAdjust GetAdjust() const { SvxAdjust eRet = SVX_ADJUST_LEFT; diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 5704b35c845d..06b47f657190 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -49,7 +49,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) + SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) { SetValue( rAutoKern.GetValue() ); return *this; diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 4cdd649e934e..fe034a02f5b5 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { + SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { SetValue(rBlink.GetValue()); return *this; } diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index a63d4a19dfe3..984bd389d7e4 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -212,10 +212,10 @@ public: bool IsTable() const { return mbEnableHor && mbEnableVer; } void SetTable( bool bNew ) { mbEnableHor = mbEnableVer = bNew; } - inline bool IsHorEnabled() const { return mbEnableHor; } - inline void EnableHor( bool bEnable ) { mbEnableHor = bEnable; } - inline bool IsVerEnabled() const { return mbEnableVer; } - inline void EnableVer( bool bEnable ) { mbEnableVer = bEnable; } + bool IsHorEnabled() const { return mbEnableHor; } + void EnableHor( bool bEnable ) { mbEnableHor = bEnable; } + bool IsVerEnabled() const { return mbEnableVer; } + void EnableVer( bool bEnable ) { mbEnableVer = bEnable; } bool IsDist() const { return bDist; } void SetDist( bool bNew ) { bDist = bNew; } diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index daa1faaba68a..7f53bcbe0c1f 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -40,7 +40,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { + SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { SetValue(rHidden.GetValue()); return *this; } diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index c87aa57e2f14..6da13c4ee9bd 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -56,7 +56,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) + SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index 2ab87f22aaa5..95e86c3a01aa 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -57,7 +57,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) + SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) { SetValue( rItem.GetValue() ); SetFitToLine( rItem.IsFitToLine() ); diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index 32761e429a69..3c0539031b2a 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -54,7 +54,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) + SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 82dc4a6de32b..7223c2b9a944 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -48,9 +48,9 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - inline rtl_TextEncoding GetCharSet() const { return eFrom; } + rtl_TextEncoding GetCharSet() const { return eFrom; } - inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) + SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) { SetValue( rColor.GetValue() ); eFrom = rColor.GetCharSet(); diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index d1a38a051dee..4977b11694a0 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -52,7 +52,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetValueCount() const override; - inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) + SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) { SetValue( rMap.GetValue() ); return *this; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index d68282de5146..55bf50a8f4d1 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -57,7 +57,7 @@ public: virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; virtual SvStream& Store(SvStream& rStream, sal_uInt16 nVersion) const override; - inline SvxColorItem& operator=(const SvxColorItem& rColor) + SvxColorItem& operator=(const SvxColorItem& rColor) { SetValue(rColor.GetValue()); return *this; diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 13f4083d3afb..c7865967373a 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -46,7 +46,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxContourItem& operator=(const SvxContourItem& rCont) + SvxContourItem& operator=(const SvxContourItem& rCont) { SetValue(rCont.GetValue()); return *this; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 6bf4d4250ffe..b09654d946e2 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) + SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) { SetValue( rCross.GetValue() ); return *this; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 0f5942162a11..fe9d92a915e9 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -55,7 +55,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) + SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 427950d41062..1e8585a0f116 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -65,7 +65,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - inline void SetEscapement( const SvxEscapement eNew ) + void SetEscapement( const SvxEscapement eNew ) { if( SvxEscapement::Off == eNew ) { @@ -84,15 +84,15 @@ public: nProp = DFLT_ESC_PROP; } } - inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); } + SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); } - inline short &GetEsc() { return nEsc; } - inline short GetEsc() const { return nEsc; } + short &GetEsc() { return nEsc; } + short GetEsc() const { return nEsc; } - inline sal_uInt8 &GetProportionalHeight() { return nProp; } - inline sal_uInt8 GetProportionalHeight() const { return nProp; } + sal_uInt8 &GetProportionalHeight() { return nProp; } + sal_uInt8 GetProportionalHeight() const { return nProp; } - inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc) + SvxEscapementItem& operator=(const SvxEscapementItem& rEsc) { nEsc = rEsc.GetEsc(); nProp = rEsc.GetProportionalHeight(); diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 552f7807b13a..ac021bcca0b3 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -64,7 +64,7 @@ public: virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) + SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); nHeight = rSize.nHeight; diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 2d7f2f42184e..47233b7a3c26 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -45,7 +45,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxForbiddenRuleItem& operator=( + SvxForbiddenRuleItem& operator=( const SvxForbiddenRuleItem& rItem ) { SetValue( rItem.GetValue() ); diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 7cc444c42d10..c1b6b36134fb 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -54,7 +54,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) + SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index a79de4b2b495..00e146913360 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -55,7 +55,7 @@ public: virtual void ScaleMetrics( long nMult, long nDiv ) override; virtual bool HasMetrics() const override; - inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) + SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) { SetWidthValue( rItem.GetWidth() ); SetProp( rItem.GetProp() ); diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index b68c2881bdec..ebb6ab406171 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -44,7 +44,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxHangingPunctuationItem& operator=( + SvxHangingPunctuationItem& operator=( const SvxHangingPunctuationItem& rItem ) { SetValue( rItem.GetValue() ); diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index b37c2544cb99..3a46267d754d 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -60,22 +60,22 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - inline void SetHyphen( const bool bNew ) { bHyphen = bNew; } - inline bool IsHyphen() const { return bHyphen; } + void SetHyphen( const bool bNew ) { bHyphen = bNew; } + bool IsHyphen() const { return bHyphen; } - inline void SetPageEnd( const bool bNew ) { bPageEnd = bNew; } - inline bool IsPageEnd() const { return bPageEnd; } + void SetPageEnd( const bool bNew ) { bPageEnd = bNew; } + bool IsPageEnd() const { return bPageEnd; } - inline sal_uInt8 &GetMinLead() { return nMinLead; } - inline sal_uInt8 GetMinLead() const { return nMinLead; } + sal_uInt8 &GetMinLead() { return nMinLead; } + sal_uInt8 GetMinLead() const { return nMinLead; } - inline sal_uInt8 &GetMinTrail() { return nMinTrail; } - inline sal_uInt8 GetMinTrail() const { return nMinTrail; } + sal_uInt8 &GetMinTrail() { return nMinTrail; } + sal_uInt8 GetMinTrail() const { return nMinTrail; } - inline sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; } - inline sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; } + sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; } + sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; } - inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew ) + SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew ) { bHyphen = rNew.IsHyphen(); bPageEnd = rNew.IsPageEnd(); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index e246bb5b73ba..1a384c2b76b6 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -49,7 +49,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) + SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { SetValue( rHorJustify.GetValue() ); return *this; @@ -81,7 +81,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override; - inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) + SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { SetValue( rVerJustify.GetValue() ); return *this; diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index a32657cdc15c..d5eca73b3104 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -53,7 +53,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { + SvxKerningItem& operator=(const SvxKerningItem& rKern) { SetValue( rKern.GetValue() ); return *this; } diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index a3a1823ecba0..e2ae3e8b8186 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -51,7 +51,7 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; virtual sal_uInt16 GetValueCount() const override; - inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) + SvxLanguageItem& operator=(const SvxLanguageItem& rLang) { SetValue( rLang.GetValue() ); return *this; diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 856f2d8eb70e..28a9e09336e1 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -41,7 +41,7 @@ public: const IntlWrapper * pIntlWrapper = nullptr ) const override; - inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) + SvxLineColorItem& operator=(const SvxLineColorItem& rColor) { return static_cast<SvxLineColorItem&>(SvxColorItem:: operator=(static_cast<const SvxColorItem&>(rColor))); } diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 084fcb263f2e..eea64a7d0ec3 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -95,31 +95,31 @@ public: inline void SetRight( const long nR, const sal_uInt16 nProp = 100 ); // Query/direct setting of the absolute values - inline long GetLeft() const { return nLeftMargin; } - inline long GetRight() const { return nRightMargin;} - inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; } - inline void SetRightValue( const long nR ) { nRightMargin = nR; } - inline bool IsAutoFirst() const { return bAutoFirst; } - inline void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; } - - inline bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; } - inline bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; } - inline void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; } - inline void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; } - inline sal_uInt16 GetPropLeft() const { return nPropLeftMargin; } - inline sal_uInt16 GetPropRight() const { return nPropRightMargin;} + long GetLeft() const { return nLeftMargin; } + long GetRight() const { return nRightMargin;} + void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; } + void SetRightValue( const long nR ) { nRightMargin = nR; } + bool IsAutoFirst() const { return bAutoFirst; } + void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; } + + bool IsExplicitZeroMarginValRight() const { return bExplicitZeroMarginValRight; } + bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; } + void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; } + void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; } + sal_uInt16 GetPropLeft() const { return nPropLeftMargin; } + sal_uInt16 GetPropRight() const { return nPropRightMargin;} // The UI/text interface: inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 ); - inline long GetTextLeft() const { return nTxtLeft; } + long GetTextLeft() const { return nTxtLeft; } inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 ); - inline short GetTextFirstLineOfst() const { return nFirstLineOfst; } - inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp ) + short GetTextFirstLineOfst() const { return nFirstLineOfst; } + void SetPropTextFirstLineOfst( const sal_uInt16 nProp ) { nPropFirstLineOfst = nProp; } - inline sal_uInt16 GetPropTextFirstLineOfst() const + sal_uInt16 GetPropTextFirstLineOfst() const { return nPropFirstLineOfst; } - inline void SetTextFirstLineOfstValue( const short nValue ) + void SetTextFirstLineOfstValue( const short nValue ) { nFirstLineOfst = nValue; } void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 75d600afeb30..2c5c6ffcc33c 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -65,16 +65,16 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; // Methods to query and edit. InterlineSpace is added to the height. - inline short GetInterLineSpace() const { return nInterLineSpace; } - inline void SetInterLineSpace( const short nSpace ) + short GetInterLineSpace() const { return nInterLineSpace; } + void SetInterLineSpace( const short nSpace ) { nInterLineSpace = nSpace; eInterLineSpaceRule = SvxInterLineSpaceRule::Fix; } // Determines the absolute or minimum row height. - inline sal_uInt16 GetLineHeight() const { return nLineHeight; } - inline void SetLineHeight( const sal_uInt16 nHeight ) + sal_uInt16 GetLineHeight() const { return nLineHeight; } + void SetLineHeight( const sal_uInt16 nHeight ) { nLineHeight = nHeight; eLineSpaceRule = SvxLineSpaceRule::Min; @@ -82,17 +82,17 @@ public: // To increase or decrease the row height. sal_uInt16 GetPropLineSpace() const { return nPropLineSpace; } - inline void SetPropLineSpace( const sal_uInt8 nProp ) + void SetPropLineSpace( const sal_uInt8 nProp ) { nPropLineSpace = nProp; eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } - inline void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; } - inline SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; } + void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; } + SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; } - inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } - inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } + void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } + SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index 3c5109b43c06..fe7a33678c49 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) + SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) { SetValue( rNHH.GetValue() ); return *this; diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index fda14d94c15d..fb6a836ab318 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -39,7 +39,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) + SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) { SetValue( rLB.GetValue() ); return *this; diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 4e6f7d95c679..b5faa4829842 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -79,13 +79,13 @@ public: virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const override; virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const override; - inline sal_uInt8 &GetMinLead() { return nMinLead; } - inline sal_uInt8 GetMinLead() const { return nMinLead; } + sal_uInt8 &GetMinLead() { return nMinLead; } + sal_uInt8 GetMinLead() const { return nMinLead; } - inline sal_uInt8 &GetMinTrail() { return nMinTrail; } - inline sal_uInt8 GetMinTrail() const { return nMinTrail; } + sal_uInt8 &GetMinTrail() { return nMinTrail; } + sal_uInt8 GetMinTrail() const { return nMinTrail; } - inline SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew ) + SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew ) { nMinLead = rNew.GetMinLead(); nMinTrail = rNew.GetMinTrail(); diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index f0bb668f86ea..8998056f02d1 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) + SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) { SetValue( rOrphans.GetValue() ); return *this; diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index 26926b3456ef..19aac0e99766 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -57,7 +57,7 @@ public: Align GetValue() const { return (Align) SfxUInt16Item::GetValue(); } void SetValue(Align n) { SfxUInt16Item::SetValue((sal_uInt16)n); } - inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) + SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 674f5ba8b747..a558fbd5c7a1 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { + SvxPostureItem& operator=(const SvxPostureItem& rPost) { SetValue( rPost.GetValue() ); return *this; } diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index a786e2976ebd..20cb729505e1 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -45,7 +45,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) + SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) { SetValue( rPropSize.GetValue() ); return *this; diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 788ed50657cc..3dc6e7473cc3 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -46,7 +46,7 @@ public: OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) + SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) { SetValue( rItem.GetValue() ); return *this; diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 82221b6b0845..2c8e21f806ab 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -49,7 +49,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { + SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { SetValue(rShadow.GetValue()); return *this; } diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 1dd09472efd4..5d40fcbf3e0e 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -91,11 +91,11 @@ public: static void ShowLanguageErrors(); void SpellDocument(); // Perform Spell Checking - inline bool IsStartDone(){ return bStartDone; } - inline bool IsEndDone(){ return bEndDone; } - inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check - inline void SetHyphen() { bHyphen = true; } - inline bool IsAllRight() { return bAllRight; } + bool IsStartDone(){ return bStartDone; } + bool IsEndDone(){ return bEndDone; } + bool IsHyphen(){ return bHyphen; } // Split instead of Spell check + void SetHyphen() { bHyphen = true; } + bool IsAllRight() { return bAllRight; } protected: const css::uno::Reference< css::uno::XInterface >& diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 23b85d41f0b5..17957ff561d0 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -323,7 +323,7 @@ public: // Query/Set the current settings of AutoCorrect long GetFlags() const { return nFlags; } - inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;} + SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;} bool IsAutoCorrFlag( long nFlag ) const { return (nFlags & nFlag) != 0; } void SetAutoCorrFlag( long nFlag, bool bOn = true ); diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 869c4ef4c755..80dcf3744a23 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -49,26 +49,26 @@ public: SvxFont( const SvxFont &rFont ); // Methods for Superscript/Subscript - inline short GetEscapement() const { return nEsc; } - inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; } + short GetEscapement() const { return nEsc; } + void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; } - inline sal_uInt8 GetPropr() const { return nPropr; } - inline void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; } - inline void SetProprRel( const sal_uInt8 nNewPropr ) + sal_uInt8 GetPropr() const { return nPropr; } + void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; } + void SetProprRel( const sal_uInt8 nNewPropr ) { SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); } // Kerning - inline short GetFixKerning() const { return nKern; } - inline void SetFixKerning( const short nNewKern ) { nKern = nNewKern; } + short GetFixKerning() const { return nKern; } + void SetFixKerning( const short nNewKern ) { nKern = nNewKern; } - inline SvxCaseMap GetCaseMap() const { return eCaseMap; } - inline void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } + SvxCaseMap GetCaseMap() const { return eCaseMap; } + void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } // Is-Methods: - inline bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } - inline bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } - inline bool IsKern() const { return 0 != nKern; } - inline bool IsEsc() const { return 0 != nEsc; } + bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } + bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } + bool IsKern() const { return 0 != nKern; } + bool IsEsc() const { return 0 != nEsc; } // Consider Upper case, Lower case letters etc. OUString CalcCaseMap(const OUString &rTxt) const; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index d3df41f8766c..f0702c6f6965 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -61,7 +61,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) + SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) { SetValue( rTextLine.GetValue() ); SetColor( rTextLine.GetColor() ); diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index eaa11698e337..1dbd1e875cd3 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -59,7 +59,7 @@ public: virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; - inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { + SvxWeightItem& operator=(const SvxWeightItem& rWeight) { SetValue( rWeight.GetValue() ); return *this; } diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index fbffc6cea9d1..1d5d9eabf3db 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -48,7 +48,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) + SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) { SetValue( rWidows.GetValue() ); return *this; diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index d2195566da22..2459c2557cdb 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -50,7 +50,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper * = nullptr ) const override; - inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) + SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) { SetValue( rWLM.GetValue() ); return *this; |