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 /sw/inc | |
| 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 'sw/inc')
48 files changed, 270 insertions, 270 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 69e817c60d34..5b2c186dae67 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 af4e5a41d4dc..95ac4fb1ab31 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 6be2c8b9652b..166ad1fd18ce 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 ce3a64564254..9e54e7449f73 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 814b210460ed..9d155dcb2edb 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 38561d79e8a8..8c0c36e46c2f 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 a91b530425bc..3b734e928d54 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 fb345dba02b3..2696ef619b26 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 85873104a7e6..814e914f3f9d 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 d2d02a99ded3..b8115e1169b2 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 36e0fc5e0f7c..af49f782070a 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 ef2e9539859c..554a6c37c919 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 83cfdf733fd0..3bb687bed369 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 e1ad5f7a523f..e97d400267e6 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 351d59824f9f..fe2a7f0dfe17 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 458d3bda4578..6b013fcff94a 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 015ee47b047b..f9aa44231eca 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 afc451f9eb95..f443db828551 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 b55fb6fa989d..d1ad7ecbf232 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 53ba14d7497a..2dabd5165643 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 fb970dbde735..51cf4f6f1c75 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 35988c4dbccf..ed520543f4a3 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 0fd946059e5e..825f08b7ab89 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 1f707cdcbf70..951084b2dc61 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 64480288334c..57873510d8b0 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 c2bc8cf84efd..2e928eaa8e9f 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 8386c5ab1785..98bb1bdf5dec 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 33bcc2361b6c..eb0d2cce61bd 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 a30af53a581f..a3a166182d45 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 b55ca5d7abd0..19a509d6b5da 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 9c9b625c7590..43d8c977ba01 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 531e17c32506..85b21486de18 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 6bbaf2e7a243..384782bc6254 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 f0ab99ff253d..04d883b19d62 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 5ca5dd8d94dd..5975916e21e3 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 46ca66d1759f..8185e8fb96b2 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 ca69c7a104f3..2fe0e6acb310 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 2dff35adba8e..6bc9f694c336 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 fbe0ccc0ec84..dbdedc4a2b89 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 047814d3b1ac..b124bba088db 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 f241da538d42..7ba3ffdee024 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 0a01e00f0f11..5415c9904586 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 7bd3bad988b5..8d805f54fcc0 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 77c043420e29..931dd10c72a4 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 71ee3e984690..bf9f54160477 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 556e134d1724..b44dd1d8a479 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 96ddd10c6d3b..c6e7b6ed81a4 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 c5ba1947424b..318cc9d427d9 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; } |