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/source | |
| 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/source')
98 files changed, 834 insertions, 834 deletions
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 4206a135c957..9119a6a6336f 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -91,7 +91,7 @@ private: protected: void SetName( const OUString& rName ) { m_sName = rName; } - inline sal_Int16 GetRole() const + sal_Int16 GetRole() const { return m_nRole; } @@ -107,11 +107,11 @@ protected: const SwAccessibleMap *GetMap() const { return m_pMap; } /** convenience method to get the SwViewShell through accessibility map */ - inline SwViewShell* GetShell() + SwViewShell* GetShell() { return GetMap()->GetShell(); } - inline const SwViewShell* GetShell() const + const SwViewShell* GetShell() const { return GetMap()->GetShell(); } @@ -183,7 +183,7 @@ protected: getBoundsImpl(bool bRelative); // #i85634# - inline void NotRegisteredAtAccessibleMap() + void NotRegisteredAtAccessibleMap() { m_isRegisteredAtAccessibleMap = false; } @@ -334,11 +334,11 @@ public: virtual bool HasCursor(); // required by map to remember that object bool Select( SwPaM *pPaM, SdrObject *pObj, bool bAdd ); - inline bool Select( SwPaM& rPaM ) + bool Select( SwPaM& rPaM ) { return Select( &rPaM, nullptr, false ); } - inline bool Select( SdrObject *pObj, bool bAdd ) + bool Select( SdrObject *pObj, bool bAdd ) { return Select( nullptr, pObj, bAdd ); } diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx index 56e8814f42ae..a6455da18952 100644 --- a/sw/source/core/access/accframe.hxx +++ b/sw/source/core/access/accframe.hxx @@ -87,12 +87,12 @@ public: inline bool IsShowing( const SwAccessibleMap& rAccMap ) const; protected: - inline bool IsInPagePreview() const + bool IsInPagePreview() const { return mbIsInPagePreview; } - inline void ClearFrame() + void ClearFrame() { mpFrame = nullptr; } @@ -134,12 +134,12 @@ protected: void GetChildren( SwAccessibleMap& rAccMap, std::list< sw::access::SwAccessibleChild >& rChildren ) const; - inline void SetVisArea( const SwRect& rNewVisArea ) + void SetVisArea( const SwRect& rNewVisArea ) { maVisArea = rNewVisArea; } - inline const SwRect& GetVisArea() const + const SwRect& GetVisArea() const { return maVisArea; } diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx index 0ade63d8da0d..d92adf9eee1a 100644 --- a/sw/source/core/access/accfrmobjslist.hxx +++ b/sw/source/core/access/accfrmobjslist.hxx @@ -35,7 +35,7 @@ private: sw::access::SwAccessibleChild m_aCurr; // The current object size_t m_nNextObj; // The index of the current sdr object - inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst ) + SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst ) : m_rList( rLst ) , m_nNextObj( 0 ) {} @@ -47,18 +47,18 @@ private: SwAccessibleChildSList_const_iterator& next_visible(); public: - inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter ) + SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter ) : m_rList( rIter.m_rList ) , m_aCurr( rIter.m_aCurr ) , m_nNextObj( rIter.m_nNextObj ) {} - inline bool operator==( const SwAccessibleChildSList_const_iterator& r ) const + bool operator==( const SwAccessibleChildSList_const_iterator& r ) const { return m_aCurr == r.m_aCurr; } - inline bool operator!=( + bool operator!=( const SwAccessibleChildSList_const_iterator& r ) const { return !(*this == r); @@ -66,7 +66,7 @@ public: SwAccessibleChildSList_const_iterator& operator++(); - inline const sw::access::SwAccessibleChild& operator*() const + const sw::access::SwAccessibleChild& operator*() const { return m_aCurr; } @@ -83,7 +83,7 @@ class SwAccessibleChildSList public: typedef SwAccessibleChildSList_const_iterator const_iterator; - inline SwAccessibleChildSList( const SwFrame& rFrame, + SwAccessibleChildSList( const SwFrame& rFrame, SwAccessibleMap& rAccMap ) : maVisArea() , mrFrame( rFrame ) @@ -91,7 +91,7 @@ public: , mrAccMap( rAccMap ) {} - inline SwAccessibleChildSList( const SwRect& rVisArea, + SwAccessibleChildSList( const SwRect& rVisArea, const SwFrame& rFrame, SwAccessibleMap& rAccMap ) : maVisArea( rVisArea ) @@ -101,32 +101,32 @@ public: { } - inline const_iterator begin() const + const_iterator begin() const { return SwAccessibleChildSList_const_iterator( *this, mrAccMap ); } - inline const_iterator end() const + const_iterator end() const { return SwAccessibleChildSList_const_iterator( *this ); } - inline const SwFrame& GetFrame() const + const SwFrame& GetFrame() const { return mrFrame; } - inline bool IsVisibleChildrenOnly() const + bool IsVisibleChildrenOnly() const { return mbVisibleChildrenOnly; } - inline const SwRect& GetVisArea() const + const SwRect& GetVisArea() const { return maVisArea; } - inline SwAccessibleMap& GetAccMap() const + SwAccessibleMap& GetAccMap() const { return mrAccMap; } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index d47e20d5e470..421461f076d2 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -426,16 +426,16 @@ public: } // <SetType(..)> only used in method <SwAccessibleMap::AppendEvent(..)> - inline void SetType( EventType eT ) + void SetType( EventType eT ) { meType = eT; } - inline EventType GetType() const + EventType GetType() const { return meType; } - inline ::rtl::Reference < SwAccessibleContext > GetContext() const + ::rtl::Reference < SwAccessibleContext > GetContext() const { uno::Reference < XAccessible > xTmp( mxAcc ); ::rtl::Reference < SwAccessibleContext > xAccImpl( @@ -444,55 +444,55 @@ public: return xAccImpl; } - inline const SwRect& GetOldBox() const + const SwRect& GetOldBox() const { return maOldBox; } // <SetOldBox(..)> only used in method <SwAccessibleMap::AppendEvent(..)> - inline void SetOldBox( const SwRect& rOldBox ) + void SetOldBox( const SwRect& rOldBox ) { maOldBox = rOldBox; } - inline const SwAccessibleChild& GetFrameOrObj() const + const SwAccessibleChild& GetFrameOrObj() const { return maFrameOrObj; } // <SetStates(..)> only used in method <SwAccessibleMap::AppendEvent(..)> - inline void SetStates( AccessibleStates _nStates ) + void SetStates( AccessibleStates _nStates ) { mnStates |= _nStates; } - inline bool IsUpdateCursorPos() const + bool IsUpdateCursorPos() const { return bool(mnStates & AccessibleStates::CARET); } - inline bool IsInvalidateStates() const + bool IsInvalidateStates() const { return bool(mnStates & (AccessibleStates::EDITABLE | AccessibleStates::OPAQUE)); } - inline bool IsInvalidateRelation() const + bool IsInvalidateRelation() const { return bool(mnStates & (AccessibleStates::RELATION_FROM | AccessibleStates::RELATION_TO)); } - inline bool IsInvalidateTextSelection() const + bool IsInvalidateTextSelection() const { return bool( mnStates & AccessibleStates::TEXT_SELECTION_CHANGED ); } - inline bool IsInvalidateTextAttrs() const + bool IsInvalidateTextAttrs() const { return bool( mnStates & AccessibleStates::TEXT_ATTRIBUTE_CHANGED ); } - inline AccessibleStates GetStates() const + AccessibleStates GetStates() const { return mnStates; } - inline AccessibleStates GetAllStates() const + AccessibleStates GetAllStates() const { return mnStates; } @@ -508,11 +508,11 @@ public: : mbFiring( false ) {} - inline void SetFiring() + void SetFiring() { mbFiring = true; } - inline bool IsFiring() const + bool IsFiring() const { return mbFiring; } @@ -685,7 +685,7 @@ public: void AdjustMapMode( MapMode& rMapMode, const Point& rPoint ) const; - inline const SwPageFrame *GetSelPage() const { return mpSelPage; } + const SwPageFrame *GetSelPage() const { return mpSelPage; } void DisposePage(const SwPageFrame *pPageFrame ); }; diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 11beb6340833..e4a68e420f08 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -97,7 +97,7 @@ class SwAccessibleTableData_Impl bool bColumns ) const; // #i77106# - inline bool IncludeRow( const SwFrame& rFrame ) const + bool IncludeRow( const SwFrame& rFrame ) const { return !mbOnlyTableColumnHeader || mpTabFrame->IsInHeadline( rFrame ); @@ -579,7 +579,7 @@ public: virtual ~SwAccSingleTableSelHander_Impl() {} - inline bool IsSelected() const { return bSelected; } + bool IsSelected() const { return bSelected; } virtual void Unselect( sal_Int32, sal_Int32 ) override; }; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index a7e40036d603..f2fc518209ec 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -64,7 +64,7 @@ protected: virtual ~SwAccessibleTable() override; // #i77106# - inline void SetDesc( const OUString& sNewDesc ) + void SetDesc( const OUString& sNewDesc ) { m_sDesc = sNewDesc; } diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx index 63cff0e07c7a..997a4c48fa0b 100644 --- a/sw/source/core/crsr/overlayrangesoutline.hxx +++ b/sw/source/core/crsr/overlayrangesoutline.hxx @@ -45,7 +45,7 @@ namespace sw virtual ~OverlayRangesOutline() override; // data read access - inline const std::vector< basegfx::B2DRange >& getRanges() const + const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index cb6fe9fd782e..102d4873f202 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -182,9 +182,9 @@ namespace inline void RestoreUnoCursors(updater_t& rUpdater); inline void SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); inline void RestoreShellCursors(updater_t& rUpdater); - static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther) + static const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther) { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); }; - static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos) + static void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos) { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); }; }; inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bGetPoint, bool bSetMark) diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index c6934905b32f..5f2c8d0d1d27 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -683,11 +683,11 @@ public: SwHyphArgs( const SwPaM *pPam, const Point &rPoint, sal_uInt16* pPageCount, sal_uInt16* pPageStart ); void SetPam( SwPaM *pPam ) const; - inline void SetNode( SwNode *pNew ) { pNode = pNew; } + void SetNode( SwNode *pNew ) { pNode = pNew; } inline void SetRange( const SwNode *pNew ); - inline void NextNode() { ++nNode; } - inline sal_uInt16 *GetPageCnt() { return pPageCnt; } - inline sal_uInt16 *GetPageSt() { return pPageSt; } + void NextNode() { ++nNode; } + sal_uInt16 *GetPageCnt() { return pPageCnt; } + sal_uInt16 *GetPageSt() { return pPageSt; } }; SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos, diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 1beb43c1d254..782c8c40fb68 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1049,17 +1049,17 @@ namespace numfunc return msFontname; } - inline bool IsFontnameUserDefined() const + bool IsFontnameUserDefined() const { return mbUserDefinedFontname; } - inline const vcl::Font& GetFont() const + const vcl::Font& GetFont() const { return *mpFont; } - inline sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const + sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const { if (p_nListLevel >= MAXLEVEL) { @@ -1275,7 +1275,7 @@ namespace numfunc public: static SwNumberingUIBehaviorConfig& getInstance(); - inline bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const + bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const { return mbChangeIndentOnTabAtFirstPosOfFirstListItem; } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 0791f37309a9..21ac8346dd1f 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -84,7 +84,7 @@ public: virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, sal_Int32 nEnd = -1 ) const override; - inline SwSectionNode* GetSectNode() + SwSectionNode* GetSectNode() { const SwNode* pSectNd( GetAnchor() ); return const_cast<SwSectionNode*>( dynamic_cast<const SwSectionNode*>( pSectNd ) ); diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 74507f5bb34e..7397114ec600 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -75,21 +75,21 @@ class SwLinguIter public: SwLinguIter(); - inline SwEditShell *GetSh() { return pSh; } + SwEditShell *GetSh() { return pSh; } - inline const SwPosition *GetEnd() const { return pEnd; } - inline void SetEnd( SwPosition* pNew ){ delete pEnd; pEnd = pNew; } + const SwPosition *GetEnd() const { return pEnd; } + void SetEnd( SwPosition* pNew ){ delete pEnd; pEnd = pNew; } - inline const SwPosition *GetStart() const { return pStart; } - inline void SetStart( SwPosition* pNew ){ delete pStart; pStart = pNew; } + const SwPosition *GetStart() const { return pStart; } + void SetStart( SwPosition* pNew ){ delete pStart; pStart = pNew; } - inline const SwPosition *GetCurr() const { return pCurr; } - inline void SetCurr( SwPosition* pNew ){ delete pCurr; pCurr = pNew; } + const SwPosition *GetCurr() const { return pCurr; } + void SetCurr( SwPosition* pNew ){ delete pCurr; pCurr = pNew; } - inline const SwPosition *GetCurrX() const { return pCurrX; } - inline void SetCurrX( SwPosition* pNew ){ delete pCurrX; pCurrX = pNew; } + const SwPosition *GetCurrX() const { return pCurrX; } + void SetCurrX( SwPosition* pNew ){ delete pCurrX; pCurrX = pNew; } - inline sal_uInt16& GetCursorCnt(){ return nCursorCnt; } + sal_uInt16& GetCursorCnt(){ return nCursorCnt; } // for the UI: void Start_( SwEditShell *pSh, SwDocPositions eStart, diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 7d2c6f9b84a8..e5f24a4290c6 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -62,7 +62,7 @@ class SwUndoDelNum : public SwUndo, private SwUndRng { sal_uLong index; int level; - inline NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {}; + NodeLevel(sal_uLong idx, int lvl) : index(idx), level(lvl) {}; }; std::vector<NodeLevel> aNodes; std::unique_ptr<SwHistory> pHistory; diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index afe6717c3de4..db35e88e3053 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -84,28 +84,28 @@ namespace objectpositioning virtual ~SwAnchoredObjectPosition(); // accessors for object and its corresponding data/information - inline SdrObject& GetObject() const + SdrObject& GetObject() const { return mrDrawObj; } - inline bool IsObjFly() const + bool IsObjFly() const { return mbIsObjFly; } - inline SwAnchoredObject& GetAnchoredObj() const + SwAnchoredObject& GetAnchoredObj() const { return *mpAnchoredObj; } - inline SwFrame& GetAnchorFrame() const + SwFrame& GetAnchorFrame() const { return *mpAnchorFrame; } - inline const SwFrameFormat& GetFrameFormat() const + const SwFrameFormat& GetFrameFormat() const { return *mpFrameFormat; } // #i62875# - inline bool DoesObjFollowsTextFlow() const + bool DoesObjFollowsTextFlow() const { return mbFollowTextFlow; } @@ -181,7 +181,7 @@ namespace objectpositioning object has to be checked and thus, (if needed) the proposed relative position has to be adjusted. default value <true> */ - inline SwTwips AdjustVertRelPos( const SwTwips nTopOfAnch, + SwTwips AdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, const SwFrame& rPageAlignLayFrame, @@ -261,7 +261,7 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips. */ - inline SwTwips AdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, + SwTwips AdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const { return !mbDoNotCaptureAnchoredObj diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 34a1de4d21e1..54a74913df63 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -104,7 +104,7 @@ public: virtual void DeleteMarked() override; - inline void ValidateMarkList() { FlushComeBackTimer(); } + void ValidateMarkList() { FlushComeBackTimer(); } // #i99665# bool IsAntiAliasing() const; diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index 774c8d2a7225..f293b879cf58 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -152,8 +152,8 @@ public: static bool IsMoveBwdJump() { return m_bMoveBwdJump; } static void SetMoveBwdJump( bool bNew ){ m_bMoveBwdJump = bNew; } - inline void SetUndersized( const bool bNew ) { m_bUndersized = bNew; } - inline bool IsUndersized() const { return m_bUndersized; } + void SetUndersized( const bool bNew ) { m_bUndersized = bNew; } + bool IsUndersized() const { return m_bUndersized; } bool IsPrevObjMove() const; diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 4fbb81868b7f..2b2b21d1a7ab 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -203,7 +203,7 @@ public: bool IsHeightClipped() const { return m_bHeightClipped; } bool IsLowerOf( const SwLayoutFrame* pUpper ) const; - inline bool IsUpperOf( const SwFlyFrame& _rLower ) const + bool IsUpperOf( const SwFlyFrame& _rLower ) const { return _rLower.IsLowerOf( this ); } diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index ac7a6ca5ad84..7c8425064957 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -71,23 +71,23 @@ public: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; // #i37068# - accessors for member <mbNoMoveOnCheckClip> - inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) + void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip ) { mbNoMoveOnCheckClip = _bNewNoMoveOnCheckClip; } - inline bool IsNoMoveOnCheckClip() const + bool IsNoMoveOnCheckClip() const { return mbNoMoveOnCheckClip; } // #i34753# - accessors for member <mbNoMakePos> - inline void SetNoMakePos( const bool _bNoMakePos ) + void SetNoMakePos( const bool _bNoMakePos ) { if ( IsFlyLayFrame() ) { mbNoMakePos = _bNoMakePos; } } - inline bool IsNoMakePos() const + bool IsNoMakePos() const { if ( IsFlyLayFrame() ) { @@ -99,7 +99,7 @@ public: } } - inline const SwRect& GetUnclippedFrame( ) const + const SwRect& GetUnclippedFrame( ) const { if ( maUnclippedFrame.HasArea( ) ) return maUnclippedFrame; diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 3ebd3d1711d7..e6c4fa47f0e7 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -38,7 +38,7 @@ class Point; class SwFntCache : public SwCache { public: - inline SwFntCache() : SwCache(50 + SwFntCache() : SwCache(50 #ifdef DBG_UTIL , OString(RTL_CONSTASCII_STRINGPARAM("Global Font-Cache pFntCache")) #endif @@ -87,12 +87,12 @@ public: virtual ~SwFntObj() override; - inline vcl::Font *GetScrFont() { return m_pScrFont; } - inline vcl::Font& GetFont() { return m_aFont; } - inline const vcl::Font& GetFont() const { return m_aFont; } + vcl::Font *GetScrFont() { return m_pScrFont; } + vcl::Font& GetFont() { return m_aFont; } + const vcl::Font& GetFont() const { return m_aFont; } - inline sal_uInt16 GetGuessedLeading() const { return m_nGuessedLeading; } - inline sal_uInt16 GetExternalLeading() const { return m_nExtLeading; } + sal_uInt16 GetGuessedLeading() const { return m_nGuessedLeading; } + sal_uInt16 GetExternalLeading() const { return m_nExtLeading; } sal_uInt16 GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut ); sal_uInt16 GetFontHeight( const SwViewShell *pSh, const OutputDevice& rOut ); @@ -101,10 +101,10 @@ public: void GuessLeading( const SwViewShell& rSh, const FontMetric& rMet ); void SetDevFont( const SwViewShell *pSh, OutputDevice& rOut ); - inline OutputDevice* GetPrt() const { return m_pPrinter; } - inline sal_uInt16 GetZoom() const { return m_nZoom; } - inline sal_uInt16 GetPropWidth() const { return m_nPropWidth; } - inline bool IsSymbol() const { return m_bSymbol; } + OutputDevice* GetPrt() const { return m_pPrinter; } + sal_uInt16 GetZoom() const { return m_nZoom; } + sal_uInt16 GetPropWidth() const { return m_nPropWidth; } + bool IsSymbol() const { return m_bSymbol; } void DrawText( SwDrawTextInfo &rInf ); /// determine the TextSize (of the printer) @@ -135,7 +135,7 @@ public: SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner, SwViewShell const *pShell, bool bCheck = false ); - inline SwFntObj* Get() { return static_cast<SwFntObj*>( SwCacheAccess::Get() ); } + SwFntObj* Get() { return static_cast<SwFntObj*>( SwCacheAccess::Get() ); } }; #endif diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 47c7835d8738..8171908b71a7 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -411,14 +411,14 @@ public: inline void SetCompletePaint() const; inline void ResetCompletePaint() const; - inline bool IsCompletePaint() const { return mbCompletePaint; } + bool IsCompletePaint() const { return mbCompletePaint; } inline void SetRetouche() const; inline void ResetRetouche() const; - inline bool IsRetouche() const { return mbRetouche; } + bool IsRetouche() const { return mbRetouche; } void SetInfFlags(); - inline void InvalidateInfFlags() { mbInfInvalid = true; } + void InvalidateInfFlags() { mbInfInvalid = true; } inline bool IsInDocBody() const; // use InfoFlags, determine flags inline bool IsInFootnote() const; // if necessary inline bool IsInTab() const; @@ -435,15 +435,15 @@ public: bool IsInBalancedSection() const; - inline bool IsReverse() const { return mbReverse; } + bool IsReverse() const { return mbReverse; } inline bool IsVertical() const; inline bool IsVertLR() const; - inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; } - inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; } + void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; } + void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; } inline bool IsRightToLeft() const; - inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew; } + void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew; } void CheckDirChange(); // returns upper left frame position for LTR and @@ -477,7 +477,7 @@ public: const SwAttrSet *GetAttrSet() const; - inline bool HasFixSize() const { return mbFixSize; } + bool HasFixSize() const { return mbFixSize; } // check all pages (starting from the given) and correct them if needed static void CheckPageDescs( SwPageFrame *pStart, bool bNotifyFields = true, SwPageFrame** ppPrev = nullptr); @@ -732,11 +732,11 @@ public: void MakeUpperPos( const SwFrame*, const SwFrame*, bool ); void MakeLeftPos( const SwFrame*, const SwFrame*, bool ); void MakeRightPos( const SwFrame*, const SwFrame*, bool ); - inline bool IsNeighbourFrame() const + bool IsNeighbourFrame() const { return bool(GetType() & FRM_NEIGHBOUR); } // #i65250# - inline sal_uInt32 GetFrameId() const { return mnFrameId; } + sal_uInt32 GetFrameId() const { return mnFrameId; } // NEW TABLES // Some functions for covered/covering table cells. This way unnecessary diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx index 99713647b5de..8ec58e1a94d9 100644 --- a/sw/source/core/inc/frminf.hxx +++ b/sw/source/core/inc/frminf.hxx @@ -34,7 +34,7 @@ class SwTextFrameInfo static SwTwips GetLineStart( const SwTextCursor &rLine ); public: - inline SwTextFrameInfo( const SwTextFrame *pTextFrame ) : pFrame(pTextFrame) { } + SwTextFrameInfo( const SwTextFrame *pTextFrame ) : pFrame(pTextFrame) { } // Does the paragraph fit into a single line? bool IsOneLine() const; diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index b6b56e031717..81453b10487c 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -329,10 +329,10 @@ public: SwBorderAttrs( const SwModify *pOwner, const SwFrame *pConstructor ); virtual ~SwBorderAttrs() override; - inline const SwAttrSet &GetAttrSet() const { return m_rAttrSet; } - inline const SvxULSpaceItem &GetULSpace() const { return m_rUL; } - inline const SvxBoxItem &GetBox() const { return m_rBox; } - inline const SvxShadowItem &GetShadow() const { return m_rShadow; } + const SwAttrSet &GetAttrSet() const { return m_rAttrSet; } + const SvxULSpaceItem &GetULSpace() const { return m_rUL; } + const SvxBoxItem &GetBox() const { return m_rBox; } + const SvxShadowItem &GetShadow() const { return m_rShadow; } inline sal_uInt16 CalcTopLine() const; inline sal_uInt16 CalcBottomLine() const; @@ -345,9 +345,9 @@ public: inline bool IsLine() const; - inline const Size &GetSize() const { return m_aFrameSize; } + const Size &GetSize() const { return m_aFrameSize; } - inline bool IsBorderDist() const { return m_bBorderDist; } + bool IsBorderDist() const { return m_bBorderDist; } // Should upper (or lower) border be evaluated for this frame? // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index b001a948c413..907b8e3d98cf 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -64,14 +64,14 @@ protected: static void ResetFootnote( const SwFootnoteFrame *pAssumed ); public: - inline SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib ) + SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib ) : SwLayoutFrame( pFormat, pSib ) , nMaxFootnoteHeight(0) {} SwLayoutFrame *FindBodyCont(); inline const SwLayoutFrame *FindBodyCont() const; - inline void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; } + void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; } // footnote interface void AppendFootnote( SwContentFrame *, SwTextFootnote * ); diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 974ad841783f..d9770da00662 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -110,19 +110,19 @@ public: bool IsBackMoveLocked() { return bBackMoveLocked; } // prevents that the last content deletes the SwFootnoteFrame as well (Cut()) - inline void ColLock() { mbColLocked = true; } - inline void ColUnlock() { mbColLocked = false; } + void ColLock() { mbColLocked = true; } + void ColUnlock() { mbColLocked = false; } // #i49383# - inline void UnlockPosOfLowerObjs() + void UnlockPosOfLowerObjs() { mbUnlockPosOfLowerObjs = true; } - inline void KeepLockPosOfLowerObjs() + void KeepLockPosOfLowerObjs() { mbUnlockPosOfLowerObjs = false; } - inline bool IsUnlockPosOfLowerObjs() + bool IsUnlockPosOfLowerObjs() { return mbUnlockPosOfLowerObjs; } diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx index 6bc78b9adcd2..2ff8197d2ccc 100644 --- a/sw/source/core/inc/ifinishedthreadlistener.hxx +++ b/sw/source/core/inc/ifinishedthreadlistener.hxx @@ -30,14 +30,14 @@ class IFinishedThreadListener { public: - inline virtual ~IFinishedThreadListener() + virtual ~IFinishedThreadListener() { }; virtual void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ) = 0; protected: - inline IFinishedThreadListener() + IFinishedThreadListener() { }; }; diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 0541a20d6eae..51b71f056e16 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -150,7 +150,7 @@ public: void SetUpdateExpFields() {m_bUpdateExpFields = true; } inline void SetCheckPageNum( sal_uInt16 nNew ); - inline void SetCheckPageNumDirect( sal_uInt16 nNew ) { m_nCheckPageNum = nNew; } + void SetCheckPageNumDirect( sal_uInt16 nNew ) { m_nCheckPageNum = nNew; } void Action(OutputDevice* pRenderContext); // here it begins void Reset(); // back to CTor-defaults diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index ddeb9d189074..e28839310e83 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -83,17 +83,17 @@ class SwObjectFormatter virtual SwFrame& GetAnchorFrame() = 0; - inline const SwPageFrame& GetPageFrame() const + const SwPageFrame& GetPageFrame() const { return mrPageFrame; } - inline bool ConsiderWrapOnObjPos() const + bool ConsiderWrapOnObjPos() const { return mbConsiderWrapOnObjPos; } - inline SwLayAction* GetLayAction() + SwLayAction* GetLayAction() { return mpLayAction; } diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 22ded200ca23..313cc29493e3 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -46,10 +46,10 @@ class ObservableThread : public osl::Thread, void SetListener( std::weak_ptr< IFinishedThreadListener > const & pThreadListener, const oslInterlockedCount nThreadID ); - static inline void * operator new(std::size_t size) + static void * operator new(std::size_t size) { return SimpleReferenceObject::operator new(size); } - static inline void operator delete(void * pointer) + static void operator delete(void * pointer) { SimpleReferenceObject::operator delete(pointer); } protected: diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index f1505fa63ba7..3bb152e40cef 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -188,8 +188,8 @@ public: void SetFootnotePage( bool b ) { m_bFootnotePage = b; } void SetEndNotePage( bool b ) { m_bEndNotePage = b; } - inline sal_uInt16 GetPhyPageNum() const { return m_nPhyPageNum;} - inline void SetPhyPageNum( sal_uInt16 nNum ) { m_nPhyPageNum = nNum;} + sal_uInt16 GetPhyPageNum() const { return m_nPhyPageNum;} + void SetPhyPageNum( sal_uInt16 nNum ) { m_nPhyPageNum = nNum;} /// Validate, invalidate and query the Page status /// Layout/Content and Fly/non-Fly respectively are inspected separately diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 983c1c39b4fc..8ff8bcca6279 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -46,7 +46,7 @@ private: { sal_Int32 position; //!< Character position at which we change script sal_uInt8 type; //!< Script type (Latin/Asian/Complex) that we change to. - inline ScriptChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {}; + ScriptChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {}; }; //TODO - This is sorted, so should probably be a std::set rather than vector. // But we also use random access (probably unnecessarily). @@ -56,7 +56,7 @@ private: { sal_Int32 position; //!< Character position at which we change direction. sal_uInt8 type; //!< Direction that we change to. - inline DirectionChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {}; + DirectionChangeInfo(sal_Int32 pos, sal_uInt8 typ) : position(pos), type(typ) {}; }; std::vector<DirectionChangeInfo> aDirectionChanges; std::deque< sal_Int32 > aKashida; @@ -70,7 +70,7 @@ private: sal_Int32 position; //!< Character position where the change occurs. sal_Int32 length; //!< Length of the segment. CompType type; //!< Type of compression that we change to. - inline CompressionChangeInfo(sal_Int32 pos, sal_Int32 len, CompType typ) : position(pos), length(len), type(typ) {}; + CompressionChangeInfo(sal_Int32 pos, sal_Int32 len, CompType typ) : position(pos), length(len), type(typ) {}; }; std::vector<CompressionChangeInfo> aCompressionChanges; #ifdef DBG_UTIL @@ -112,7 +112,7 @@ public: } // get default direction for paragraph - inline sal_uInt8 GetDefaultDir() const { return nDefaultDir; }; + sal_uInt8 GetDefaultDir() const { return nDefaultDir; }; // array operations, nCnt refers to array position size_t CountScriptChg() const { return aScriptChanges.size(); } diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 5a9431f63eb1..4bad9cf5b1e0 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -82,10 +82,10 @@ public: SwContentFrame *FindLastContent( SwFindMode nMode = SwFindMode::None ); inline const SwContentFrame *FindLastContent() const; - inline SwSection* GetSection() { return m_pSection; } - inline const SwSection* GetSection() const { return m_pSection; } - inline void ColLock() { mbColLocked = true; } - inline void ColUnlock() { mbColLocked = false; } + SwSection* GetSection() { return m_pSection; } + const SwSection* GetSection() const { return m_pSection; } + void ColLock() { mbColLocked = true; } + void ColUnlock() { mbColLocked = false; } void CalcFootnoteContent(); void SimpleFormat(); @@ -110,7 +110,7 @@ public: * if bCheckFollow is set. */ bool ToMaximize( bool bCheckFollow ) const; - inline bool ToMaximize_() const { + bool ToMaximize_() const { if( !m_pSection ) return false; return ToMaximize( false ); } diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index d8dfe25687b4..5e6a81d07781 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -110,10 +110,10 @@ public: inline void IncreaseMax( const sal_uInt16 nAdd ); inline void DecreaseMax( const sal_uInt16 nSub ); sal_uInt16 GetCurMax() const { return m_nCurMax; } - inline SwCacheObj *First() { return m_pRealFirst; } + SwCacheObj *First() { return m_pRealFirst; } static inline SwCacheObj *Next( SwCacheObj *pCacheObj); - inline SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; } - inline sal_uInt16 size() { return m_aCacheObjects.size(); } + SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; } + sal_uInt16 size() { return m_aCacheObjects.size(); } }; /// Safely manipulate the cache @@ -143,12 +143,12 @@ class SwCacheObj sal_uInt8 m_nLock; - inline SwCacheObj *GetNext() { return m_pNext; } - inline SwCacheObj *GetPrev() { return m_pPrev; } - inline void SetNext( SwCacheObj *pNew ) { m_pNext = pNew; } - inline void SetPrev( SwCacheObj *pNew ) { m_pPrev = pNew; } + SwCacheObj *GetNext() { return m_pNext; } + SwCacheObj *GetPrev() { return m_pPrev; } + void SetNext( SwCacheObj *pNew ) { m_pNext = pNew; } + void SetPrev( SwCacheObj *pNew ) { m_pPrev = pNew; } - inline void SetCachePos( const sal_uInt16 nNew ) { m_nCachePos = nNew; } + void SetCachePos( const sal_uInt16 nNew ) { m_nCachePos = nNew; } protected: const void *m_pOwner; @@ -158,12 +158,12 @@ public: SwCacheObj( const void *pOwner ); virtual ~SwCacheObj(); - inline const void *GetOwner() const { return m_pOwner; } + const void *GetOwner() const { return m_pOwner; } inline bool IsOwner( const void *pNew ) const; - inline sal_uInt16 GetCachePos() const { return m_nCachePos; } + sal_uInt16 GetCachePos() const { return m_nCachePos; } - inline bool IsLocked() const { return 0 != m_nLock; } + bool IsLocked() const { return 0 != m_nLock; } #ifdef DBG_UTIL void Lock(); diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 19d50e3808a0..244291e4c555 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -33,7 +33,7 @@ class SwFontCache : public SwCache { public: - inline SwFontCache() : SwCache(50 + SwFontCache() : SwCache(50 #ifdef DBG_UTIL , "Global AttributSet/Font-Cache pSwFontCache" #endif @@ -59,9 +59,9 @@ public: virtual ~SwFontObj() override; - inline SwFont& GetFont() { return aSwFont; } - inline const SwFont& GetFont() const { return aSwFont; } - inline const SfxPoolItem** GetDefault() { return pDefaultArray; } + SwFont& GetFont() { return aSwFont; } + const SwFont& GetFont() const { return aSwFont; } + const SfxPoolItem** GetDefault() { return pDefaultArray; } }; class SwFontAccess : public SwCacheAccess diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index caef07ddc31d..4b94ff256bdb 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -108,12 +108,12 @@ class SwSubFont : public SvxFont inline void SetSize( const Size& rSize ); inline void SetWeight( const FontWeight eWeight ); inline void SetLanguage( LanguageType eNewLang ); - inline short CheckKerning() + short CheckKerning() { return GetFixKerning() >= 0 ? GetFixKerning() : CheckKerning_( ); } - inline void SetPropWidth( const sal_uInt16 nNew ) + void SetPropWidth( const sal_uInt16 nNew ) { m_pMagic = nullptr; m_nProportionalWidth = nNew; } public: - inline SwSubFont() : m_aSize(0,0) + SwSubFont() : m_aSize(0,0) { m_pMagic = nullptr; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0; m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; } sal_uInt16 GetPropWidth() const { return m_nProportionalWidth; } }; @@ -175,48 +175,48 @@ public: SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess ); SwFont( const SwFont& rFont ); - inline void ChgFnt( SwViewShell const *pSh, OutputDevice& rOut ) + void ChgFnt( SwViewShell const *pSh, OutputDevice& rOut ) { m_bPaintBlank = m_aSub[m_nActual].ChgFnt( pSh, rOut ); } ~SwFont(); SwFont& operator=( const SwFont &rFont ); - inline SwFontScript GetActual() const { return m_nActual; } + SwFontScript GetActual() const { return m_nActual; } inline void SetActual( SwFontScript nNew ); - inline const SvxFont& GetActualFont() const { return m_aSub[m_nActual]; } + const SvxFont& GetActualFont() const { return m_aSub[m_nActual]; } // gets a MagicNumber via SwFntAccess void GoMagic( SwViewShell *pSh, SwFontScript nWhich ); // set background color void SetBackColor( Color* pNewColor ); - inline const Color* GetBackColor() const{ return m_pBackColor.get(); } + const Color* GetBackColor() const{ return m_pBackColor.get(); } void SetHighlightColor( const Color& aNewColor ); const Color& GetHighlightColor() const { return m_aHighlightColor; } - inline void ChkMagic( SwViewShell *pSh, SwFontScript nWhich ) + void ChkMagic( SwViewShell *pSh, SwFontScript nWhich ) { if( !m_aSub[ nWhich ].m_pMagic ) GoMagic( pSh, nWhich ); } - inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, SwFontScript nWhich ) + void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, SwFontScript nWhich ) { rMagic = m_aSub[nWhich].m_pMagic; rIdx = m_aSub[nWhich].m_nFontIndex; } - inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, SwFontScript nWhich ) + void SetMagic( const void* pNew, const sal_uInt16 nIdx, SwFontScript nWhich ) { m_aSub[nWhich].m_pMagic = pNew; m_aSub[nWhich].m_nFontIndex = nIdx; } - inline bool DifferentMagic( const SwFont* pFnt, SwFontScript nWhich ) + bool DifferentMagic( const SwFont* pFnt, SwFontScript nWhich ) { return m_aSub[nWhich].m_pMagic != pFnt->m_aSub[nWhich].m_pMagic || !m_aSub[nWhich].m_pMagic || !pFnt->m_aSub[nWhich].m_pMagic; } - inline const Size &GetSize( SwFontScript nWhich ) const + const Size &GetSize( SwFontScript nWhich ) const { return m_aSub[nWhich].m_aSize; } - inline bool IsFntChg() const { return m_bFontChg; } - inline void SetFntChg( const bool bNew ) { m_bFontChg = bNew; } + bool IsFntChg() const { return m_bFontChg; } + void SetFntChg( const bool bNew ) { m_bFontChg = bNew; } // the encapsulated SV-Font-methods (set bFntChg to true) inline void SetColor( const Color& rColor ); inline void SetFillColor( const Color& rColor ); inline void SetAlign( const FontAlign eAlign ); inline void SetUnderline( const FontLineStyle eUnderline ); - inline void SetUnderColor( const Color &rColor ) { m_aUnderColor = rColor; } + void SetUnderColor( const Color &rColor ) { m_aUnderColor = rColor; } inline void SetOverline( const FontLineStyle eOverline ); - inline void SetOverColor( const Color &rColor ) { m_aOverColor = rColor; } + void SetOverColor( const Color &rColor ) { m_aOverColor = rColor; } inline void SetStrikeout( const FontStrikeout eStrikeout ); inline void SetOutline( const bool bOutline ); void SetVertical( sal_uInt16 nDir, const bool bVertLayout = false ); @@ -248,26 +248,26 @@ public: // Get/Set-methods for the current setting inline void SetNoHyph( const bool bNew ); inline void SetBlink( const bool bBlink ); - inline bool IsBlink() const { return m_bBlink; } - inline sal_uInt8 &GetTox() { return m_nToxCount; } - inline bool IsTox() const { return ( 0 != m_nToxCount ); } - inline sal_uInt8 &GetRef() { return m_nRefCount; } - inline bool IsRef() const { return ( 0 != m_nRefCount ); } - inline sal_uInt8 &GetMeta() { return m_nMetaCount; } - inline bool IsMeta() const { return (0 != m_nMetaCount); } - inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; } - inline bool IsInputField() const { return (0 != m_nInputFieldCount); } - inline bool IsURL() const { return m_bURL; } + bool IsBlink() const { return m_bBlink; } + sal_uInt8 &GetTox() { return m_nToxCount; } + bool IsTox() const { return ( 0 != m_nToxCount ); } + sal_uInt8 &GetRef() { return m_nRefCount; } + bool IsRef() const { return ( 0 != m_nRefCount ); } + sal_uInt8 &GetMeta() { return m_nMetaCount; } + bool IsMeta() const { return (0 != m_nMetaCount); } + sal_uInt8 &GetInputField() { return m_nInputFieldCount; } + bool IsInputField() const { return (0 != m_nInputFieldCount); } + bool IsURL() const { return m_bURL; } inline void SetGreyWave( const bool bNew ); - inline bool IsGreyWave() const { return m_bGreyWave; } + bool IsGreyWave() const { return m_bGreyWave; } inline void SetNoCol( const bool bNew ); - inline bool IsPaintBlank() const { return m_bPaintBlank; } + bool IsPaintBlank() const { return m_bPaintBlank; } // setting of the base class font for SwTextCharFormat void SetDiffFnt( const SfxItemSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess ); - inline const SvxFont &GetFnt( const SwFontScript nWhich ) const + const SvxFont &GetFnt( const SwFontScript nWhich ) const { return m_aSub[nWhich]; }; bool IsSymbol( SwViewShell *pSh ) @@ -290,13 +290,13 @@ public: { return m_aSub[m_nActual].GetEmphasisMark(); } sal_uInt16 GetOrientation( const bool bVertLayout = false ) const; - inline const OUString& GetName( const SwFontScript nWhich ) const + const OUString& GetName( const SwFontScript nWhich ) const { return m_aSub[nWhich].GetFamilyName(); } - inline LanguageType GetLanguage( const SwFontScript nWhich ) const + LanguageType GetLanguage( const SwFontScript nWhich ) const { return m_aSub[nWhich].GetLanguage(); } - inline rtl_TextEncoding GetCharSet( const SwFontScript nWhich ) const + rtl_TextEncoding GetCharSet( const SwFontScript nWhich ) const { return m_aSub[nWhich].GetCharSet(); } - inline long GetHeight( const SwFontScript nWhich ) const + long GetHeight( const SwFontScript nWhich ) const { return m_aSub[nWhich].GetFontSize().Height(); } // makes the logical font be effective in the OutputDevice @@ -318,21 +318,21 @@ public: sal_Int32 GetCursorOfst_( SwDrawTextInfo& rInf ) { return m_aSub[m_nActual].GetCursorOfst_( rInf ); } - inline void DrawText_( SwDrawTextInfo &rInf ) + void DrawText_( SwDrawTextInfo &rInf ) { m_aSub[m_nActual].DrawText_( rInf, IsGreyWave() ); } - inline void DrawStretchText_( SwDrawTextInfo &rInf ) + void DrawStretchText_( SwDrawTextInfo &rInf ) { m_aSub[m_nActual].DrawStretchText_( rInf ); } - inline short CheckKerning() + short CheckKerning() { return m_aSub[m_nActual].CheckKerning(); } - inline sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut ) + sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut ) { return m_aSub[m_nActual].GetAscent( pSh, rOut ); } - inline sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut ) + sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut ) { return m_aSub[m_nActual].GetHeight( pSh, rOut ); } - inline void Invalidate() + void Invalidate() { m_bFontChg = m_bOrgChg = true; } void SetTopBorder( const editeng::SvxBorderLine* pTopBorder ); diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 4c9dcff0b202..f52d26feb06a 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -76,7 +76,7 @@ class ThreadManager final Suspending the starting of further threads is sensible during the destruction of a Writer document. */ - inline void SuspendStartingOfThreads() + void SuspendStartingOfThreads() { osl::MutexGuard aGuard(maMutex); @@ -87,7 +87,7 @@ class ThreadManager final */ void ResumeStartingOfThreads(); - inline bool StartingOfThreadsSuspended() + bool StartingOfThreadsSuspended() { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index a028b04c865d..c4a8b9924cac 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -88,7 +88,7 @@ public: const TextAndReading& rTaR2, const css::lang::Locale& rLocale2 ) const; - inline bool IsEqual( const TextAndReading& rTaR1, + bool IsEqual( const TextAndReading& rTaR1, const css::lang::Locale& rLocale1, const TextAndReading& rTaR2, const css::lang::Locale& rLocale2 ) const @@ -96,7 +96,7 @@ public: return 0 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 ); } - inline bool IsLess( const TextAndReading& rTaR1, + bool IsLess( const TextAndReading& rTaR1, const css::lang::Locale& rLocale1, const TextAndReading& rTaR2, const css::lang::Locale& rLocale2 ) const diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 36f93275b247..6fe54f9e4088 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -121,12 +121,12 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame bool mbFollowFormatAllowed : 1; void ResetPreps(); - inline void Lock() { mbLocked = true; } - inline void Unlock() { mbLocked = false; } - inline void SetWidow( const bool bNew ) { mbWidow = bNew; } - inline void SetJustWidow( const bool bNew ) { mbJustWidow = bNew; } - inline void SetEmpty( const bool bNew ) { mbEmpty = bNew; } - inline void SetFieldFollow( const bool bNew ) { mbFieldFollow = bNew; } + void Lock() { mbLocked = true; } + void Unlock() { mbLocked = false; } + void SetWidow( const bool bNew ) { mbWidow = bNew; } + void SetJustWidow( const bool bNew ) { mbJustWidow = bNew; } + void SetEmpty( const bool bNew ) { mbEmpty = bNew; } + void SetFieldFollow( const bool bNew ) { mbFieldFollow = bNew; } bool IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const; @@ -273,7 +273,7 @@ public: * Makes sure that the Frame is not switched (e.g. switched for a * character-bound Frame) */ - inline bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const + bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const { return GetCursorOfst_( pPos, rPoint, false ); } void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. @@ -309,22 +309,22 @@ public: /// Methods to manage the FollowFrame void SplitFrame( const sal_Int32 nTextPos ); SwContentFrame *JoinFrame(); - inline sal_Int32 GetOfst() const { return mnOffset; } + sal_Int32 GetOfst() const { return mnOffset; } void SetOfst_( const sal_Int32 nNewOfst ); inline void SetOfst ( const sal_Int32 nNewOfst ); - inline void ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; } + void ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; } SwTextFrame *GetFrameAtPos ( const SwPosition &rPos); inline const SwTextFrame *GetFrameAtPos ( const SwPosition &rPos) const; SwTextFrame& GetFrameAtOfst( const sal_Int32 nOfst ); /// If there's a Follow and we don't contain text ourselves - inline bool IsEmptyMaster() const + bool IsEmptyMaster() const { return GetFollow() && !GetFollow()->GetOfst(); } /// Returns the text portion we want to edit (for inline see underneath) const OUString& GetText() const; - inline SwTextNode *GetTextNode() + SwTextNode *GetTextNode() { return static_cast< SwTextNode* >( SwContentFrame::GetNode()); } - inline const SwTextNode *GetTextNode() const + const SwTextNode *GetTextNode() const { return static_cast< const SwTextNode* >( SwContentFrame::GetNode()); } SwTextFrame(SwTextNode * const, SwFrame* ); @@ -377,26 +377,26 @@ public: DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrame) // Locking - inline bool IsLocked() const { return mbLocked; } + bool IsLocked() const { return mbLocked; } - inline bool IsWidow() const { return mbWidow; } - inline bool IsJustWidow() const { return mbJustWidow; } - inline bool IsEmpty() const { return mbEmpty; } - inline bool HasFootnote() const { return mbFootnote; } - inline bool IsInFootnoteConnect()const { return mbInFootnoteConnect;} - inline bool IsFieldFollow() const { return mbFieldFollow;} + bool IsWidow() const { return mbWidow; } + bool IsJustWidow() const { return mbJustWidow; } + bool IsEmpty() const { return mbEmpty; } + bool HasFootnote() const { return mbFootnote; } + bool IsInFootnoteConnect()const { return mbInFootnoteConnect;} + bool IsFieldFollow() const { return mbFieldFollow;} inline void SetRepaint() const; inline void ResetRepaint() const; - inline bool HasRepaint() const { return mbRepaint; } + bool HasRepaint() const { return mbRepaint; } inline void SetBlinkPor() const; inline void ResetBlinkPor() const; - inline bool HasBlinkPor() const { return mbHasBlinkPortions; } - inline void SetAnimation() const + bool HasBlinkPor() const { return mbHasBlinkPortions; } + void SetAnimation() const { const_cast<SwTextFrame*>(this)->mbHasAnimation = true; } - inline bool HasAnimation() const { return mbHasAnimation; } + bool HasAnimation() const { return mbHasAnimation; } - inline bool IsSwapped() const { return mbIsSwapped; } + bool IsSwapped() const { return mbIsSwapped; } /// Does the Frame have a local footnote (in this Frame or Follow)? #ifdef DBG_UTIL @@ -422,7 +422,7 @@ public: const sal_Int32 nLen = COMPLETE_STRING ); inline SwTwips GetFootnoteFrameHeight() const; SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ); - inline const SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ) const + const SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ) const { return const_cast<SwTextFrame *>(this)->FindFootnoteRef( pFootnote ); } void ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadLine ); @@ -455,7 +455,7 @@ public: SwTextFrame* GetFormatted( bool bForceQuickFormat = false ); /// Will be moved soon - inline void SetFootnote( const bool bNew ) { mbFootnote = bNew; } + void SetFootnote( const bool bNew ) { mbFootnote = bNew; } /// Respect the Follows inline bool IsInside( const sal_Int32 nPos ) const; @@ -463,7 +463,7 @@ public: const SwBodyFrame *FindBodyFrame() const; /// DropCaps and selections - inline bool GetDropRect( SwRect &rRect ) const + bool GetDropRect( SwRect &rRect ) const { return HasPara() && GetDropRect_( rRect ); } static SwCache *GetTextCache() { return pTextCache; } @@ -471,14 +471,14 @@ public: static long GetMinPrtLine() { return nMinPrtLine; } - inline sal_uInt16 GetCacheIdx() const { return mnCacheIndex; } - inline void SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; } + sal_uInt16 GetCacheIdx() const { return mnCacheIndex; } + void SetCacheIdx( const sal_uInt16 nNew ) { mnCacheIndex = nNew; } /// Removes the Line information from the Cache void ClearPara(); /// Am I a FootnoteFrame, with a number at the start of the paragraph? - inline bool IsFootnoteNumFrame() const + bool IsFootnoteNumFrame() const { return IsInFootnote() && !GetIndPrev() && IsFootnoteNumFrame_(); } /** @@ -495,7 +495,7 @@ public: */ void CalcAdditionalFirstLineOffset(); - inline SwTwips GetAdditionalFirstLineOffset() const + SwTwips GetAdditionalFirstLineOffset() const { return mnAdditionalFirstLineOffset; } @@ -591,25 +591,25 @@ public: * Calculates the coordinates of a rectangle when switching from * RTL to LTR layout */ - inline void SwitchRTLtoLTR( SwRect& rRect ) const { SwitchLTRtoRTL( rRect ); } + void SwitchRTLtoLTR( SwRect& rRect ) const { SwitchLTRtoRTL( rRect ); } /** * Calculates the coordinates of a point when switching from * RTL to LTR layout */ - inline void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); }; + void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); }; - inline bool FollowFormatAllowed() const + bool FollowFormatAllowed() const { return mbFollowFormatAllowed; } - inline void AllowFollowFormat() + void AllowFollowFormat() { mbFollowFormatAllowed = true; } - inline void ForbidFollowFormat() + void ForbidFollowFormat() { mbFollowFormatAllowed = false; } @@ -623,7 +623,7 @@ public: SwTwips GetBaseVertOffsetForFly(bool bIgnoreFlysAnchoredAtThisFrame) const; - inline SwTwips GetHeightOfLastLine() const + SwTwips GetHeightOfLastLine() const { return mnHeightOfLastLine; } diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 87b7b24fc708..011132457c5b 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -211,7 +211,7 @@ public: void InitPagePreviewLayout(); - inline SwPagePreviewLayout* PagePreviewLayout() + SwPagePreviewLayout* PagePreviewLayout() { return m_pPagePreviewLayout; } diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 67b11e1cb780..d0e38a0ca4e0 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -201,11 +201,11 @@ public: virtual SwWrongList* Clone(); virtual void CopyFrom( const SwWrongList& rCopy ); - inline WrongListType GetWrongListType() const { return meType; } - inline sal_Int32 GetBeginInv() const { return nBeginInvalid; } - inline sal_Int32 GetEndInv() const { return nEndInvalid; } + WrongListType GetWrongListType() const { return meType; } + sal_Int32 GetBeginInv() const { return nBeginInvalid; } + sal_Int32 GetEndInv() const { return nEndInvalid; } void SetInvalid( sal_Int32 nBegin, sal_Int32 nEnd ); - inline void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; } + void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; } void Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ); bool InvalidateWrong(); enum class FreshState { FRESH, CURSOR, NOTHING }; @@ -227,19 +227,19 @@ public: // the other wrong list has to be inserted. void JoinList( SwWrongList* pNext, sal_Int32 nInsertPos ); - inline sal_Int32 Len( sal_uInt16 nIdx ) const + sal_Int32 Len( sal_uInt16 nIdx ) const { return nIdx < maList.size() ? maList[nIdx].mnLen : 0; } - inline sal_Int32 Pos( sal_uInt16 nIdx ) const + sal_Int32 Pos( sal_uInt16 nIdx ) const { return nIdx < maList.size() ? maList[nIdx].mnPos : 0; } - inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } + sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } - inline void Insert( const OUString& rType, + void Insert( const OUString& rType, css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag, sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere ) { @@ -256,14 +256,14 @@ public: css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag, sal_Int32 nNewPos, sal_Int32 nNewLen ); - inline SwWrongList* SubList( sal_uInt16 nIdx ) const + SwWrongList* SubList( sal_uInt16 nIdx ) const { return nIdx < maList.size() ? maList[nIdx].mpSubList : nullptr; } void InsertSubList( sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere, SwWrongList* pSubList ); - inline const SwWrongArea* GetElement( sal_uInt16 nIdx ) const + const SwWrongArea* GetElement( sal_uInt16 nIdx ) const { return nIdx < maList.size() ? &maList[nIdx] : nullptr; } diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 434e4bcc597b..99455bbe8b0f 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -47,10 +47,10 @@ class SwPageNumAndTypeOfAnchors std::vector< tEntry* > maObjList; public: - inline SwPageNumAndTypeOfAnchors() + SwPageNumAndTypeOfAnchors() { } - inline ~SwPageNumAndTypeOfAnchors() + ~SwPageNumAndTypeOfAnchors() { for ( std::vector< tEntry* >::iterator aIter = maObjList.begin(); aIter != maObjList.end(); ++aIter ) @@ -60,7 +60,7 @@ class SwPageNumAndTypeOfAnchors maObjList.clear(); } - inline void Collect( SwAnchoredObject& _rAnchoredObj ) + void Collect( SwAnchoredObject& _rAnchoredObj ) { tEntry* pNewEntry = new tEntry; pNewEntry->mpAnchoredObj = &_rAnchoredObj; @@ -89,7 +89,7 @@ class SwPageNumAndTypeOfAnchors maObjList.push_back( pNewEntry ); } - inline SwAnchoredObject* operator[]( sal_uInt32 _nIndex ) + SwAnchoredObject* operator[]( sal_uInt32 _nIndex ) { SwAnchoredObject* bRetObj = nullptr; @@ -101,7 +101,7 @@ class SwPageNumAndTypeOfAnchors return bRetObj; } - inline sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const + sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const { sal_uInt32 nRetPgNum = 0L; @@ -114,7 +114,7 @@ class SwPageNumAndTypeOfAnchors } // --> #i26945# - inline bool AnchoredAtMaster( sal_uInt32 _nIndex ) + bool AnchoredAtMaster( sal_uInt32 _nIndex ) { bool bAnchoredAtMaster( true ); @@ -126,7 +126,7 @@ class SwPageNumAndTypeOfAnchors return bAnchoredAtMaster; } - inline sal_uInt32 Count() const + sal_uInt32 Count() const { return maObjList.size(); } diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx index d9dc3c95bed4..fa6b0830c990 100644 --- a/sw/source/core/text/atrhndl.hxx +++ b/sw/source/core/text/atrhndl.hxx @@ -52,14 +52,14 @@ private: public: // Ctor, Dtor inline SwAttrStack(); - inline ~SwAttrStack() { + ~SwAttrStack() { if ( nSize > INITIAL_NUM_ATTR ) delete [] pArray; } // reset stack - inline void Reset() { nCount = 0; }; + void Reset() { nCount = 0; }; // insert on top - inline void Push( const SwTextAttr& rAttr ) { Insert( rAttr, nCount ); }; + void Push( const SwTextAttr& rAttr ) { Insert( rAttr, nCount ); }; // insert at specified position, take care for not inserting behind // the value returned by Count() void Insert( const SwTextAttr& rAttr, const sal_uInt16 nPos ); @@ -71,7 +71,7 @@ private: const SwTextAttr* Top() const; // number of elements on stack - inline sal_uInt16 Count() const { return nCount; }; + sal_uInt16 Count() const { return nCount; }; // returns position of rAttr on Stack if found, otherwise USHRT_MAX // can be used for Remove of an attribute diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 5fd1529d6539..3697c6417e3f 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -744,9 +744,9 @@ class SwSetToRightMargin { bool bRight; public: - inline SwSetToRightMargin() : bRight( false ) { } - inline ~SwSetToRightMargin() { SwTextCursor::SetRightMargin( bRight ); } - inline void SetRight( const bool bNew ) { bRight = bNew; } + SwSetToRightMargin() : bRight( false ) { } + ~SwSetToRightMargin() { SwTextCursor::SetRightMargin( bRight ); } + void SetRight( const bool bNew ) { bRight = bNew; } }; bool SwTextFrame::UnitUp_( SwPaM *pPam, const SwTwips nOffset, diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 18f89aded9e0..c30e6a231395 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -60,9 +60,9 @@ class FormatLevel { static sal_uInt16 nLevel; public: - inline FormatLevel() { ++nLevel; } - inline ~FormatLevel() { --nLevel; } - static inline sal_uInt16 GetLevel() { return nLevel; } + FormatLevel() { ++nLevel; } + ~FormatLevel() { --nLevel; } + static sal_uInt16 GetLevel() { return nLevel; } static bool LastLevel() { return 10 < nLevel; } }; sal_uInt16 FormatLevel::nLevel = 0; diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 412e5c6af114..8dfd0fac9360 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -70,7 +70,7 @@ class SwExtraPainter sal_uInt16 nDivider; bool bGoLeft; bool bLineNum; - inline bool IsClipChg() { return aClip.IsChg(); } + bool IsClipChg() { return aClip.IsChg(); } SwExtraPainter(const SwExtraPainter&) = delete; SwExtraPainter& operator=(const SwExtraPainter&) = delete; @@ -79,10 +79,10 @@ public: SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, sal_Int16 eHor, bool bLnNm ); - inline SwFont* GetFont() const { return pFnt.get(); } - inline void IncLineNr() { ++nLineNr; } - inline bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); } - inline bool HasDivider() { if( !nDivider ) return false; + SwFont* GetFont() const { return pFnt.get(); } + void IncLineNr() { ++nLineNr; } + bool HasNumber() { return !( nLineNr % rLineInf.GetCountBy() ); } + bool HasDivider() { if( !nDivider ) return false; return !(nLineNr % rLineInf.GetDividerCountBy()); } void PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed ); diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx index 4b29b0902e86..952d80580ac9 100644 --- a/sw/source/core/text/guess.hxx +++ b/sw/source/core/text/guess.hxx @@ -37,7 +37,7 @@ class SwTextGuess // a field in the text has been expanded sal_uInt16 nBreakWidth; // width of the broken portion public: - inline SwTextGuess(): pHanging( nullptr ), nCutPos(0), nBreakStart(0), + SwTextGuess(): pHanging( nullptr ), nCutPos(0), nBreakStart(0), nBreakPos(0), nFieldDiff(0), nBreakWidth(0) { } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 720d3fb3f0a7..c7572fd01dbf 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -89,14 +89,14 @@ public: // #i24363# tab stops relative to indent - returns the tab stop following nSearchPos or NULL const SvxTabStop *GetTabStop( const SwTwips nSearchPos, const SwTwips nRight ) const; - inline const SvxLineSpacingItem *GetLineSpacing() const { return pSpace; } - inline sal_uInt16 GetDefTabStop() const { return nDefTabStop; } - inline void SetDefTabStop( sal_uInt16 nNew ) const + const SvxLineSpacingItem *GetLineSpacing() const { return pSpace; } + sal_uInt16 GetDefTabStop() const { return nDefTabStop; } + void SetDefTabStop( sal_uInt16 nNew ) const { const_cast<SwLineInfo*>(this)->nDefTabStop = nNew; } // vertical alignment - inline SvxParaVertAlignItem::Align GetVertAlign() const { return nVertAlign; } - inline bool HasSpecialAlign( bool bVert ) const + SvxParaVertAlignItem::Align GetVertAlign() const { return nVertAlign; } + bool HasSpecialAlign( bool bVert ) const { return bVert ? ( SvxParaVertAlignItem::Align::Baseline != nVertAlign ) : ( SvxParaVertAlignItem::Align::Baseline != nVertAlign && @@ -104,11 +104,11 @@ public: sal_uInt16 NumberOfTabStops() const; - inline bool IsListTabStopIncluded() const + bool IsListTabStopIncluded() const { return bListTabStopIncluded; } - inline long GetListTabStopPosition() const + long GetListTabStopPosition() const { return nListTabStopPosition; } @@ -201,55 +201,55 @@ public: // rPos will set to the end of the multi-line part. SwMultiCreator* GetMultiCreator( sal_Int32 &rPos, SwMultiPortion* pM ) const; - inline bool OnWin() const { return m_bOnWin; } - inline void SetOnWin( const bool bNew ) { m_bOnWin = bNew; } - inline bool NotEOL() const { return m_bNotEOL; } - inline void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; } - inline bool URLNotify() const { return m_bURLNotify; } - inline bool StopUnderflow() const { return m_bStopUnderflow; } - inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; } - inline bool IsFootnoteInside() const { return m_bFootnoteInside; } - inline void SetFootnoteInside( const bool bNew ) { m_bFootnoteInside = bNew; } - inline bool IsOtherThanFootnoteInside() const { return m_bOtherThanFootnoteInside; } - inline void SetOtherThanFootnoteInside( const bool bNew ) { m_bOtherThanFootnoteInside = bNew; } - inline bool IsMulti() const { return m_bMulti; } - inline void SetMulti( const bool bNew ) { m_bMulti = bNew; } - inline bool IsFirstMulti() const { return m_bFirstMulti; } - inline void SetFirstMulti( const bool bNew ) { m_bFirstMulti = bNew; } - inline bool IsRuby() const { return m_bRuby; } - inline void SetRuby( const bool bNew ) { m_bRuby = bNew; } - inline bool IsHanging() const { return m_bHanging; } - inline void SetHanging( const bool bNew ) { m_bHanging = bNew; } - inline bool HasScriptSpace() const { return m_bScriptSpace; } - inline void SetScriptSpace( const bool bNew ) { m_bScriptSpace = bNew; } - inline bool HasForbiddenChars() const { return m_bForbiddenChars; } - inline void SetForbiddenChars( const bool bN ) { m_bForbiddenChars = bN; } - inline bool SnapToGrid() const { return m_bSnapToGrid; } - inline void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; } - inline sal_uInt8 GetDirection() const { return m_nDirection; } - inline void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; } - inline bool IsRotated() const { return ( 1 & m_nDirection ); } - - inline SwViewShell *GetVsh() { return m_pVsh; } - inline const SwViewShell *GetVsh() const { return m_pVsh; } - - inline vcl::RenderContext *GetOut() { return m_pOut; } - inline const vcl::RenderContext *GetOut() const { return m_pOut; } - inline void SetOut( OutputDevice* pNewOut ) { m_pOut = pNewOut; } - - inline vcl::RenderContext *GetRefDev() { return m_pRef; } - inline const vcl::RenderContext *GetRefDev() const { return m_pRef; } - - inline SwFont *GetFont() { return m_pFnt; } - inline const SwFont *GetFont() const { return m_pFnt; } - inline void SetFont( SwFont *pNew ) { m_pFnt = pNew; } + bool OnWin() const { return m_bOnWin; } + void SetOnWin( const bool bNew ) { m_bOnWin = bNew; } + bool NotEOL() const { return m_bNotEOL; } + void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; } + bool URLNotify() const { return m_bURLNotify; } + bool StopUnderflow() const { return m_bStopUnderflow; } + void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; } + bool IsFootnoteInside() const { return m_bFootnoteInside; } + void SetFootnoteInside( const bool bNew ) { m_bFootnoteInside = bNew; } + bool IsOtherThanFootnoteInside() const { return m_bOtherThanFootnoteInside; } + void SetOtherThanFootnoteInside( const bool bNew ) { m_bOtherThanFootnoteInside = bNew; } + bool IsMulti() const { return m_bMulti; } + void SetMulti( const bool bNew ) { m_bMulti = bNew; } + bool IsFirstMulti() const { return m_bFirstMulti; } + void SetFirstMulti( const bool bNew ) { m_bFirstMulti = bNew; } + bool IsRuby() const { return m_bRuby; } + void SetRuby( const bool bNew ) { m_bRuby = bNew; } + bool IsHanging() const { return m_bHanging; } + void SetHanging( const bool bNew ) { m_bHanging = bNew; } + bool HasScriptSpace() const { return m_bScriptSpace; } + void SetScriptSpace( const bool bNew ) { m_bScriptSpace = bNew; } + bool HasForbiddenChars() const { return m_bForbiddenChars; } + void SetForbiddenChars( const bool bN ) { m_bForbiddenChars = bN; } + bool SnapToGrid() const { return m_bSnapToGrid; } + void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; } + sal_uInt8 GetDirection() const { return m_nDirection; } + void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; } + bool IsRotated() const { return ( 1 & m_nDirection ); } + + SwViewShell *GetVsh() { return m_pVsh; } + const SwViewShell *GetVsh() const { return m_pVsh; } + + vcl::RenderContext *GetOut() { return m_pOut; } + const vcl::RenderContext *GetOut() const { return m_pOut; } + void SetOut( OutputDevice* pNewOut ) { m_pOut = pNewOut; } + + vcl::RenderContext *GetRefDev() { return m_pRef; } + const vcl::RenderContext *GetRefDev() const { return m_pRef; } + + SwFont *GetFont() { return m_pFnt; } + const SwFont *GetFont() const { return m_pFnt; } + void SetFont( SwFont *pNew ) { m_pFnt = pNew; } void SelectFont(); - inline void SetUnderFnt( SwUnderlineFont* pNew ) { m_pUnderFnt = pNew; } - inline SwUnderlineFont* GetUnderFnt() const { return m_pUnderFnt; } + void SetUnderFnt( SwUnderlineFont* pNew ) { m_pUnderFnt = pNew; } + SwUnderlineFont* GetUnderFnt() const { return m_pUnderFnt; } - inline const SwViewOption &GetOpt() const { return *m_pOpt; } - inline const OUString &GetText() const { return *m_pText; } - inline sal_Unicode GetChar( const sal_Int32 nPos ) const { + const SwViewOption &GetOpt() const { return *m_pOpt; } + const OUString &GetText() const { return *m_pText; } + sal_Unicode GetChar( const sal_Int32 nPos ) const { if (m_pText && nPos < m_pText->getLength()) return (*m_pText)[ nPos ]; return 0; } @@ -280,23 +280,23 @@ public: sal_uInt16 GetAscent() const; - inline sal_Int32 GetIdx() const { return m_nIdx; } - inline void SetIdx( const sal_Int32 nNew ) { m_nIdx = nNew; } - inline sal_Int32 GetLen() const { return m_nLen; } - inline void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; } - inline void SetText( const OUString &rNew ){ m_pText = &rNew; } + sal_Int32 GetIdx() const { return m_nIdx; } + void SetIdx( const sal_Int32 nNew ) { m_nIdx = nNew; } + sal_Int32 GetLen() const { return m_nLen; } + void SetLen( const sal_Int32 nNew ) { m_nLen = nNew; } + void SetText( const OUString &rNew ){ m_pText = &rNew; } // No Bullets for the symbol font! - inline bool IsNoSymbol() const + bool IsNoSymbol() const { return RTL_TEXTENCODING_SYMBOL != m_pFnt->GetCharSet( m_pFnt->GetActual() ); } void NoteAnimation() const; // Home is where Your heart is... - inline SwTextFrame *GetTextFrame() { return m_pFrame; } - inline const SwTextFrame *GetTextFrame() const { return m_pFrame; } + SwTextFrame *GetTextFrame() { return m_pFrame; } + const SwTextFrame *GetTextFrame() const { return m_pFrame; } - inline bool HasHint( sal_Int32 nPos ) const + bool HasHint( sal_Int32 nPos ) const { return HasHint_( m_pFrame->GetTextNode(), nPos ); } static bool HasHint_( const SwTextNode* pTextNode, sal_Int32 nPos ); @@ -305,11 +305,11 @@ public: // space among compressed kanas. // During formatting, the maximum values of compressable portions are // stored in m_aMaxWidth and discarded after a line has been formatted. - inline void SetMaxWidthDiff( const void *nKey, sal_uInt16 nVal ) + void SetMaxWidthDiff( const void *nKey, sal_uInt16 nVal ) { m_aMaxWidth.insert( std::make_pair( reinterpret_cast<sal_uIntPtr>(nKey), nVal ) ); }; - inline sal_uInt16 GetMaxWidthDiff( const void *nKey ) + sal_uInt16 GetMaxWidthDiff( const void *nKey ) { SwTextPortionMap::iterator it = m_aMaxWidth.find( reinterpret_cast<sal_uIntPtr>(nKey) ); @@ -318,24 +318,24 @@ public: else return 0; }; - inline void ResetMaxWidthDiff() + void ResetMaxWidthDiff() { m_aMaxWidth.clear(); }; - inline bool CompressLine() + bool CompressLine() { return !m_aMaxWidth.empty(); }; // Feature: Kana Compression - inline sal_uInt16 GetKanaIdx() const { return m_nKanaIdx; } - inline void ResetKanaIdx(){ m_nKanaIdx = 0; } - inline void SetKanaIdx( sal_uInt16 nNew ) { m_nKanaIdx = nNew; } - inline void IncKanaIdx() { ++m_nKanaIdx; } - inline void SetKanaComp( std::deque<sal_uInt16> *pNew ){ m_pKanaComp = pNew; } - inline std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; } - inline sal_uInt16 GetKanaComp() const + sal_uInt16 GetKanaIdx() const { return m_nKanaIdx; } + void ResetKanaIdx(){ m_nKanaIdx = 0; } + void SetKanaIdx( sal_uInt16 nNew ) { m_nKanaIdx = nNew; } + void IncKanaIdx() { ++m_nKanaIdx; } + void SetKanaComp( std::deque<sal_uInt16> *pNew ){ m_pKanaComp = pNew; } + std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; } + sal_uInt16 GetKanaComp() const { return ( m_pKanaComp && m_nKanaIdx < m_pKanaComp->size() ) ? (*m_pKanaComp)[m_nKanaIdx] : 0; } @@ -390,13 +390,13 @@ public: SwTextPaintInfo( SwTextFrame *pFrame, const SwRect &rPaint ); - inline SwTwips X() const { return aPos.X(); } - inline void X( const long nNew ) { aPos.X() = nNew; } - inline SwTwips Y() const { return aPos.Y(); } - inline void Y( const SwTwips nNew ) { aPos.Y() = nNew; } + SwTwips X() const { return aPos.X(); } + void X( const long nNew ) { aPos.X() = nNew; } + SwTwips Y() const { return aPos.Y(); } + void Y( const SwTwips nNew ) { aPos.Y() = nNew; } - inline SwTextFly& GetTextFly() { return aTextFly; } - inline const SwTextFly& GetTextFly() const { return aTextFly; } + SwTextFly& GetTextFly() { return aTextFly; } + const SwTextFly& GetTextFly() const { return aTextFly; } inline void DrawText( const OUString &rText, const SwLinePortion &rPor, const sal_Int32 nIdx = 0, const sal_Int32 nLen = COMPLETE_STRING, @@ -427,7 +427,7 @@ public: void DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const; - inline void NotifyURL( const SwLinePortion &rPor ) const + void NotifyURL( const SwLinePortion &rPor ) const { if( URLNotify() ) NotifyURL_( rPor ); } /** @@ -443,33 +443,33 @@ public: inline SwTwips GetPaintOfst() const; inline void SetPaintOfst( const SwTwips nNew ); - inline const Point &GetPos() const { return aPos; } - inline void SetPos( const Point &rNew ) { aPos = rNew; } + const Point &GetPos() const { return aPos; } + void SetPos( const Point &rNew ) { aPos = rNew; } - inline const SwRect &GetPaintRect() const { return aPaintRect; } + const SwRect &GetPaintRect() const { return aPaintRect; } // STUFF FOR JUSTIFIED ALIGNMENT - inline sal_uInt16 GetSpaceIdx() const { return nSpaceIdx; } - inline void ResetSpaceIdx(){nSpaceIdx = 0; } - inline void SetSpaceIdx( sal_uInt16 nNew ) { nSpaceIdx = nNew; } - inline void IncSpaceIdx() { ++nSpaceIdx; } - inline void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); } - inline long GetSpaceAdd() const + sal_uInt16 GetSpaceIdx() const { return nSpaceIdx; } + void ResetSpaceIdx(){nSpaceIdx = 0; } + void SetSpaceIdx( sal_uInt16 nNew ) { nSpaceIdx = nNew; } + void IncSpaceIdx() { ++nSpaceIdx; } + void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); } + long GetSpaceAdd() const { return ( pSpaceAdd && nSpaceIdx < pSpaceAdd->size() ) ? (*pSpaceAdd)[nSpaceIdx] : 0; } - inline void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; } - inline std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; } + void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; } + std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; } - inline void SetWrongList( const SwWrongList *pNew ){ pWrongList = pNew; } - inline const SwWrongList* GetpWrongList() const { return pWrongList; } + void SetWrongList( const SwWrongList *pNew ){ pWrongList = pNew; } + const SwWrongList* GetpWrongList() const { return pWrongList; } - inline void SetGrammarCheckList( const SwWrongList *pNew ){ pGrammarCheckList = pNew; } - inline const SwWrongList* GetGrammarCheckList() const { return pGrammarCheckList; } + void SetGrammarCheckList( const SwWrongList *pNew ){ pGrammarCheckList = pNew; } + const SwWrongList* GetGrammarCheckList() const { return pGrammarCheckList; } - inline void SetSmartTags( const SwWrongList *pNew ){ pSmartTags = pNew; } - inline const SwWrongList* GetSmartTags() const { return pSmartTags; } + void SetSmartTags( const SwWrongList *pNew ){ pSmartTags = pNew; } + const SwWrongList* GetSmartTags() const { return pSmartTags; } }; class SwTextFormatInfo : public SwTextPaintInfo @@ -542,112 +542,112 @@ public: SwTextFormatInfo( const SwTextFormatInfo& rInf, SwLineLayout& rLay, SwTwips nActWidth ); - inline sal_uInt16 Width() const { return m_nWidth; } - inline void Width( const sal_uInt16 nNew ) { m_nWidth = nNew; } + sal_uInt16 Width() const { return m_nWidth; } + void Width( const sal_uInt16 nNew ) { m_nWidth = nNew; } void Init(); // Returns the first changed position of the paragraph inline sal_Int32 GetReformatStart() const; // Margins - inline SwTwips Left() const { return m_nLeft; } - inline void Left( const SwTwips nNew ) { m_nLeft = nNew; } - inline SwTwips Right() const { return m_nRight; } - inline void Right( const SwTwips nNew ) { m_nRight = nNew; } - inline SwTwips First() const { return m_nFirst; } - inline void First( const SwTwips nNew ) { m_nFirst = nNew; } - inline sal_uInt16 RealWidth() const { return m_nRealWidth; } - inline void RealWidth( const sal_uInt16 nNew ) { m_nRealWidth = nNew; } - inline sal_uInt16 ForcedLeftMargin() const { return m_nForcedLeftMargin; } - inline void ForcedLeftMargin( const sal_uInt16 nN ) { m_nForcedLeftMargin = nN; } - - inline sal_uInt8 &MaxHyph() { return m_nMaxHyph; } - inline const sal_uInt8 &MaxHyph() const { return m_nMaxHyph; } - - inline SwLineLayout *GetRoot() { return m_pRoot; } - inline const SwLineLayout *GetRoot() const { return m_pRoot; } - - inline void SetRoot( SwLineLayout *pNew ) { m_pRoot = pNew; } - inline SwLinePortion *GetLast() { return m_pLast; } - inline void SetLast( SwLinePortion *pNewLast ) { m_pLast = pNewLast; } - inline bool IsFull() const { return m_bFull; } - inline void SetFull( const bool bNew ) { m_bFull = bNew; } - inline bool IsHyphForbud() const + SwTwips Left() const { return m_nLeft; } + void Left( const SwTwips nNew ) { m_nLeft = nNew; } + SwTwips Right() const { return m_nRight; } + void Right( const SwTwips nNew ) { m_nRight = nNew; } + SwTwips First() const { return m_nFirst; } + void First( const SwTwips nNew ) { m_nFirst = nNew; } + sal_uInt16 RealWidth() const { return m_nRealWidth; } + void RealWidth( const sal_uInt16 nNew ) { m_nRealWidth = nNew; } + sal_uInt16 ForcedLeftMargin() const { return m_nForcedLeftMargin; } + void ForcedLeftMargin( const sal_uInt16 nN ) { m_nForcedLeftMargin = nN; } + + sal_uInt8 &MaxHyph() { return m_nMaxHyph; } + const sal_uInt8 &MaxHyph() const { return m_nMaxHyph; } + + SwLineLayout *GetRoot() { return m_pRoot; } + const SwLineLayout *GetRoot() const { return m_pRoot; } + + void SetRoot( SwLineLayout *pNew ) { m_pRoot = pNew; } + SwLinePortion *GetLast() { return m_pLast; } + void SetLast( SwLinePortion *pNewLast ) { m_pLast = pNewLast; } + bool IsFull() const { return m_bFull; } + void SetFull( const bool bNew ) { m_bFull = bNew; } + bool IsHyphForbud() const { return m_pFly ? m_bNoMidHyph : m_bNoEndHyph; } - inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid ) + void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid ) { m_bNoEndHyph = (m_nMaxHyph && bEnd >= m_nMaxHyph); m_bNoMidHyph = (m_nMaxHyph && bMid >= m_nMaxHyph); } - inline bool IsIgnoreFly() const { return m_bIgnoreFly; } - inline void SetIgnoreFly( const bool bNew ) { m_bIgnoreFly = bNew; } - inline bool IsFakeLineStart() const { return m_bFakeLineStart; } - inline void SetFakeLineStart( const bool bNew ) { m_bFakeLineStart = bNew; } - inline bool IsStop() const { return m_bStop; } - inline void SetStop( const bool bNew ) { m_bStop = bNew; } - inline SwLinePortion *GetRest() { return m_pRest; } - inline void SetRest( SwLinePortion *pNewRest ) { m_pRest = pNewRest; } - inline bool IsNewLine() const { return m_bNewLine; } - inline void SetNewLine( const bool bNew ) { m_bNewLine = bNew; } - inline bool IsShift() const { return m_bShift; } - inline void SetShift( const bool bNew ) { m_bShift = bNew; } - inline bool IsInterHyph() const { return m_bInterHyph; } - inline bool IsUnderflow() const { return m_bUnderflow; } - inline void ClrUnderflow() { m_bUnderflow = false; } - inline bool IsDropInit() const { return m_bDropInit; } - inline void SetDropInit( const bool bNew ) { m_bDropInit = bNew; } - inline bool IsQuick() const { return m_bQuick; } - inline bool IsTest() const { return m_bTestFormat; } - - inline sal_Int32 GetLineStart() const { return m_nLineStart; } - inline void SetLineStart( const sal_Int32 nNew ) { m_nLineStart = nNew; } + bool IsIgnoreFly() const { return m_bIgnoreFly; } + void SetIgnoreFly( const bool bNew ) { m_bIgnoreFly = bNew; } + bool IsFakeLineStart() const { return m_bFakeLineStart; } + void SetFakeLineStart( const bool bNew ) { m_bFakeLineStart = bNew; } + bool IsStop() const { return m_bStop; } + void SetStop( const bool bNew ) { m_bStop = bNew; } + SwLinePortion *GetRest() { return m_pRest; } + void SetRest( SwLinePortion *pNewRest ) { m_pRest = pNewRest; } + bool IsNewLine() const { return m_bNewLine; } + void SetNewLine( const bool bNew ) { m_bNewLine = bNew; } + bool IsShift() const { return m_bShift; } + void SetShift( const bool bNew ) { m_bShift = bNew; } + bool IsInterHyph() const { return m_bInterHyph; } + bool IsUnderflow() const { return m_bUnderflow; } + void ClrUnderflow() { m_bUnderflow = false; } + bool IsDropInit() const { return m_bDropInit; } + void SetDropInit( const bool bNew ) { m_bDropInit = bNew; } + bool IsQuick() const { return m_bQuick; } + bool IsTest() const { return m_bTestFormat; } + + sal_Int32 GetLineStart() const { return m_nLineStart; } + void SetLineStart( const sal_Int32 nNew ) { m_nLineStart = nNew; } // these are used during fly calculation - inline sal_uInt16 GetLineHeight() const { return m_nLineHeight; } - inline void SetLineHeight( const sal_uInt16 nNew ) { m_nLineHeight = nNew; } - inline sal_uInt16 GetLineNetHeight() const { return m_nLineNetHeight; } - inline void SetLineNetHeight( const sal_uInt16 nNew ) { m_nLineNetHeight = nNew; } - - inline const SwLinePortion *GetUnderflow() const { return m_pUnderflow; } - inline SwLinePortion *GetUnderflow() { return m_pUnderflow; } - inline void SetUnderflow( SwLinePortion *pNew ) + sal_uInt16 GetLineHeight() const { return m_nLineHeight; } + void SetLineHeight( const sal_uInt16 nNew ) { m_nLineHeight = nNew; } + sal_uInt16 GetLineNetHeight() const { return m_nLineNetHeight; } + void SetLineNetHeight( const sal_uInt16 nNew ) { m_nLineNetHeight = nNew; } + + const SwLinePortion *GetUnderflow() const { return m_pUnderflow; } + SwLinePortion *GetUnderflow() { return m_pUnderflow; } + void SetUnderflow( SwLinePortion *pNew ) { m_pUnderflow = pNew; m_bUnderflow = true; } - inline sal_Int32 GetSoftHyphPos() const { return m_nSoftHyphPos; } - inline void SetSoftHyphPos( const sal_Int32 nNew ) { m_nSoftHyphPos = nNew; } + sal_Int32 GetSoftHyphPos() const { return m_nSoftHyphPos; } + void SetSoftHyphPos( const sal_Int32 nNew ) { m_nSoftHyphPos = nNew; } inline void SetParaFootnote(); // FlyFrames - inline SwFlyPortion *GetFly() { return m_pFly; } - inline void SetFly( SwFlyPortion *pNew ) { m_pFly = pNew; } + SwFlyPortion *GetFly() { return m_pFly; } + void SetFly( SwFlyPortion *pNew ) { m_pFly = pNew; } inline const SwAttrSet& GetCharAttr() const; // Tabs - inline SwTabPortion *GetLastTab() { return m_pLastTab; } - inline void SetLastTab( SwTabPortion *pNew ) { m_pLastTab = pNew; } - inline sal_Unicode GetTabDecimal() const { return m_cTabDecimal; } - inline void SetTabDecimal( const sal_Unicode cNew ) { m_cTabDecimal = cNew;} + SwTabPortion *GetLastTab() { return m_pLastTab; } + void SetLastTab( SwTabPortion *pNew ) { m_pLastTab = pNew; } + sal_Unicode GetTabDecimal() const { return m_cTabDecimal; } + void SetTabDecimal( const sal_Unicode cNew ) { m_cTabDecimal = cNew;} - inline void ClearHookChar() { m_cHookChar = 0; } - inline void SetHookChar( const sal_Unicode cNew ) { m_cHookChar = cNew; } - inline sal_Unicode GetHookChar() const { return m_cHookChar; } + void ClearHookChar() { m_cHookChar = 0; } + void SetHookChar( const sal_Unicode cNew ) { m_cHookChar = cNew; } + sal_Unicode GetHookChar() const { return m_cHookChar; } // Done-Flags - inline bool IsFootnoteDone() const { return m_bFootnoteDone; } - inline void SetFootnoteDone( const bool bNew ) { m_bFootnoteDone = bNew; } - inline bool IsErgoDone() const { return m_bErgoDone; } - inline void SetErgoDone( const bool bNew ) { m_bErgoDone = bNew; } - inline bool IsNumDone() const { return m_bNumDone; } - inline void SetNumDone( const bool bNew ) { m_bNumDone = bNew; } - inline bool IsArrowDone() const { return m_bArrowDone; } - inline void SetArrowDone( const bool bNew ) { m_bArrowDone = bNew; } + bool IsFootnoteDone() const { return m_bFootnoteDone; } + void SetFootnoteDone( const bool bNew ) { m_bFootnoteDone = bNew; } + bool IsErgoDone() const { return m_bErgoDone; } + void SetErgoDone( const bool bNew ) { m_bErgoDone = bNew; } + bool IsNumDone() const { return m_bNumDone; } + void SetNumDone( const bool bNew ) { m_bNumDone = bNew; } + bool IsArrowDone() const { return m_bArrowDone; } + void SetArrowDone( const bool bNew ) { m_bArrowDone = bNew; } // For SwTextPortion::Hyphenate bool ChgHyph( const bool bNew ); // Should the hyphenate helper be discarded? bool IsHyphenate() const; - inline sal_Int32 GetUnderScorePos() const { return m_nUnderScorePos; } - inline void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; } + sal_Int32 GetUnderScorePos() const { return m_nUnderScorePos; } + void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; } // Calls HyphenateWord() of Hyphenator css::uno::Reference< css::linguistic2::XHyphenatedWord > @@ -667,8 +667,8 @@ public: // Return: Position; sets cHookChar if necessary sal_Int32 ScanPortionEnd( const sal_Int32 nStart, const sal_Int32 nEnd ); - inline void SetTabOverflow( bool bOverflow ) { m_bTabOverflow = bOverflow; } - inline bool IsTabOverflow() { return m_bTabOverflow; } + void SetTabOverflow( bool bOverflow ) { m_bTabOverflow = bOverflow; } + bool IsTabOverflow() { return m_bTabOverflow; } }; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 32c50352ee98..3f820673e357 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -813,7 +813,7 @@ void SwTextFormatter::CalcAscent( SwTextFormatInfo &rInf, SwLinePortion *pPor ) class SwMetaPortion : public SwTextPortion { public: - inline SwMetaPortion() { SetWhichPor( POR_META ); } + SwMetaPortion() { SetWhichPor( POR_META ); } virtual void Paint( const SwTextPaintInfo &rInf ) const override; // OUTPUT_OPERATOR }; diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx index efa267396bef..a47b90784eb7 100644 --- a/sw/source/core/text/itrpaint.hxx +++ b/sw/source/core/text/itrpaint.hxx @@ -51,11 +51,11 @@ public: // surrounding SwBidiPortion void PaintMultiPortion( const SwRect &rPaint, SwMultiPortion& rMulti, const SwMultiPortion* pEnvPor = nullptr ); - inline void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; } - inline bool IsPaintDrop() const { return bPaintDrop; } - inline SwTextPaintInfo &GetInfo() + void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; } + bool IsPaintDrop() const { return bPaintDrop; } + SwTextPaintInfo &GetInfo() { return static_cast<SwTextPaintInfo&>(SwTextIter::GetInfo()); } - inline const SwTextPaintInfo &GetInfo() const + const SwTextPaintInfo &GetInfo() const { return static_cast<const SwTextPaintInfo&>(SwTextIter::GetInfo()); } }; diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index 97a119d7e90c..3501ffdb8b3a 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -81,23 +81,23 @@ public: { CtorInitTextIter(pTextFrame, pTextInf); } - inline const SwLineLayout *GetCurr() const { return m_pCurr; } // NEVER 0! - inline const SwLineLayout *GetNext() const { return m_pCurr->GetNext(); } + const SwLineLayout *GetCurr() const { return m_pCurr; } // NEVER 0! + const SwLineLayout *GetNext() const { return m_pCurr->GetNext(); } const SwLineLayout *GetPrev(); - inline sal_Int32 GetLength() const { return m_pCurr->GetLen(); } - inline sal_uInt16 GetLineNr() const { return m_nLineNr; } - inline sal_Int32 GetStart() const { return m_nStart; } - inline sal_Int32 GetEnd() const { return GetStart() + GetLength(); } - inline SwTwips Y() const { return m_nY; } + sal_Int32 GetLength() const { return m_pCurr->GetLen(); } + sal_uInt16 GetLineNr() const { return m_nLineNr; } + sal_Int32 GetStart() const { return m_nStart; } + sal_Int32 GetEnd() const { return GetStart() + GetLength(); } + SwTwips Y() const { return m_nY; } - inline SwTwips RegStart() const { return m_nRegStart; } - inline sal_uInt16 RegDiff() const { return m_nRegDiff; } - inline bool IsRegisterOn() const { return m_bRegisterOn; } + SwTwips RegStart() const { return m_nRegStart; } + sal_uInt16 RegDiff() const { return m_nRegDiff; } + bool IsRegisterOn() const { return m_bRegisterOn; } - inline SwTextInfo &GetInfo() { return *m_pInf; } - inline const SwTextInfo &GetInfo() const { return *m_pInf; } + SwTextInfo &GetInfo() { return *m_pInf; } + const SwTextInfo &GetInfo() const { return *m_pInf; } - inline void Top() { Init(); } + void Top() { Init(); } void Bottom(); const SwLineLayout *Next(); const SwLineLayout *Prev(); @@ -114,26 +114,26 @@ public: // Truncates all after pCurr void TruncLines( bool bNoteFollow = false ); - inline sal_uInt16 GetLineHeight() const { return m_pCurr->GetRealHeight(); } + sal_uInt16 GetLineHeight() const { return m_pCurr->GetRealHeight(); } void CalcAscentAndHeight( sal_uInt16 &rAscent, sal_uInt16 &rHeight ) const; // Lots of trouble for querying pCurr == pPara - inline bool IsFirstTextLine() const + bool IsFirstTextLine() const { return m_nStart == GetInfo().GetTextStart() && !( m_pCurr->IsDummy() && GetNextLine() ); } // Replacement for the old IsFirstLine() - inline bool IsParaLine() const + bool IsParaLine() const { return m_pCurr == m_pInf->GetParaPortion(); } const SwLineInfo &GetLineInfo() const { return m_aLineInf; } - inline SwTwips GetFirstPos() const { return m_nFrameStart; } + SwTwips GetFirstPos() const { return m_nFrameStart; } inline bool SeekAndChg( SwTextSizeInfo &rInf ); inline bool SeekAndChgBefore( SwTextSizeInfo &rInf ); inline bool SeekStartAndChg( SwTextSizeInfo &rInf, const bool bPara=false ); - inline SwTextFrame *GetTextFrame() { return m_pFrame; } - inline const SwTextFrame *GetTextFrame() const { return m_pFrame; } + SwTextFrame *GetTextFrame() { return m_pFrame; } + const SwTextFrame *GetTextFrame() const { return m_pFrame; } // Counts consecutive hyphens in order to be within the boundary given by MaxHyphens void CntHyphens( sal_uInt8 &nEndCnt, sal_uInt8 &nMidCnt) const; @@ -155,7 +155,7 @@ private: protected: // For FormatQuoVadis - inline void Right( const SwTwips nNew ) { nRight = nNew; } + void Right( const SwTwips nNew ) { nRight = nNew; } void CtorInitTextMargin( SwTextFrame *pFrame, SwTextSizeInfo *pInf ); explicit SwTextMargin(SwTextNode* pTextNode) @@ -179,34 +179,34 @@ public: } inline SwTwips GetLeftMargin() const; inline SwTwips Left() const; - inline SwTwips Right() const { return nRight; } - inline SwTwips FirstLeft() const { return nFirst; } - inline SwTwips CurrWidth() const { return m_pCurr->PrtWidth(); } + SwTwips Right() const { return nRight; } + SwTwips FirstLeft() const { return nFirst; } + SwTwips CurrWidth() const { return m_pCurr->PrtWidth(); } SwTwips GetLineStart() const; - inline SwTwips GetLineEnd() const { return GetLineStart() + CurrWidth(); } - inline Point GetTopLeft() const { return Point( GetLineStart(), Y() ); } - inline bool IsOneBlock() const { return m_bOneBlock; } - inline bool IsLastBlock() const { return m_bLastBlock; } - inline bool IsLastCenter() const { return m_bLastCenter; } - inline sal_uInt16 GetAdjust() const { return nAdjust; } - inline sal_uInt16 GetLineWidth() const + SwTwips GetLineEnd() const { return GetLineStart() + CurrWidth(); } + Point GetTopLeft() const { return Point( GetLineStart(), Y() ); } + bool IsOneBlock() const { return m_bOneBlock; } + bool IsLastBlock() const { return m_bLastBlock; } + bool IsLastCenter() const { return m_bLastCenter; } + sal_uInt16 GetAdjust() const { return nAdjust; } + sal_uInt16 GetLineWidth() const { return sal_uInt16( Right() - GetLeftMargin() + 1 ); } - inline SwTwips GetLeftMin() const { return nFirst < nLeft ? nFirst : nLeft; } - inline bool HasNegFirst() const { return nFirst < nLeft; } + SwTwips GetLeftMin() const { return nFirst < nLeft ? nFirst : nLeft; } + bool HasNegFirst() const { return nFirst < nLeft; } // #i91133# - inline SwTwips GetTabLeft() const + SwTwips GetTabLeft() const { return mnTabLeft; } // DropCaps - inline sal_uInt16 GetDropLines() const { return nDropLines; } - inline void SetDropLines( const sal_uInt16 nNew ) { nDropLines = nNew; } - inline sal_uInt16 GetDropLeft() const { return nDropLeft; } - inline sal_uInt16 GetDropHeight() const { return nDropHeight; } - inline void SetDropHeight( const sal_uInt16 nNew ) { nDropHeight = nNew; } - inline sal_uInt16 GetDropDescent() const { return nDropDescent; } - inline void SetDropDescent( const sal_uInt16 nNew ) { nDropDescent = nNew; } + sal_uInt16 GetDropLines() const { return nDropLines; } + void SetDropLines( const sal_uInt16 nNew ) { nDropLines = nNew; } + sal_uInt16 GetDropLeft() const { return nDropLeft; } + sal_uInt16 GetDropHeight() const { return nDropHeight; } + void SetDropHeight( const sal_uInt16 nNew ) { nDropHeight = nNew; } + sal_uInt16 GetDropDescent() const { return nDropDescent; } + void SetDropDescent( const sal_uInt16 nNew ) { nDropDescent = nNew; } void DropInit(); // Returns the TextPos for start and end of the current line without whitespace @@ -214,9 +214,9 @@ public: sal_Int32 GetTextStart() const; sal_Int32 GetTextEnd() const; - inline SwTextSizeInfo &GetInfo() + SwTextSizeInfo &GetInfo() { return static_cast<SwTextSizeInfo&>(SwTextIter::GetInfo()); } - inline const SwTextSizeInfo &GetInfo() const + const SwTextSizeInfo &GetInfo() const { return static_cast<const SwTextSizeInfo&>(SwTextIter::GetInfo()); } }; @@ -248,7 +248,7 @@ public: void CalcAdjLine( SwLineLayout *pCurr ); // For adjusting afterwards - inline void GetAdjusted() const + void GetAdjusted() const { if( m_pCurr->IsFormatAdj() ) const_cast<SwTextAdjuster*>(this)->CalcAdjLine( m_pCurr ); @@ -292,8 +292,8 @@ public: sal_uInt16 nPorHeight = 0, sal_uInt16 nAscent = 0, const bool bAutoToCentered = false ) const; - static inline void SetRightMargin( const bool bNew ){ bRightMargin = bNew; } - static inline bool IsRightMargin() { return bRightMargin; } + static void SetRightMargin( const bool bNew ){ bRightMargin = bNew; } + static bool IsRightMargin() { return bRightMargin; } }; // Change current output device to printer, this has to be done before diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx index 05ff5a6bb084..030a9b5f2435 100644 --- a/sw/source/core/text/pordrop.hxx +++ b/sw/source/core/text/pordrop.hxx @@ -45,12 +45,12 @@ public: : pFollow( nullptr ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ), m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {}; ~SwDropPortionPart(); - inline SwDropPortionPart* GetFollow() const { return pFollow; }; - inline void SetFollow( SwDropPortionPart* pNew ) { pFollow = pNew; }; - inline SwFont& GetFont() const { return *pFnt; } - inline sal_Int32 GetLen() const { return nLen; } - inline sal_uInt16 GetWidth() const { return nWidth; } - inline void SetWidth( sal_uInt16 nNew ) { nWidth = nNew; } + SwDropPortionPart* GetFollow() const { return pFollow; }; + void SetFollow( SwDropPortionPart* pNew ) { pFollow = pNew; }; + SwFont& GetFont() const { return *pFnt; } + sal_Int32 GetLen() const { return nLen; } + sal_uInt16 GetWidth() const { return nWidth; } + void SetWidth( sal_uInt16 nNew ) { nWidth = nNew; } bool GetJoinBorderWithPrev() const { return m_bJoinBorderWithPrev; } bool GetJoinBorderWithNext() const { return m_bJoinBorderWithNext; } @@ -85,18 +85,18 @@ public: virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override; virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override; - inline sal_uInt16 GetLines() const { return nLines; } - inline sal_uInt16 GetDistance() const { return nDistance; } - inline sal_uInt16 GetDropHeight() const { return nDropHeight; } - inline sal_uInt16 GetDropDescent() const { return nDropDescent; } - inline sal_uInt16 GetDropLeft() const { return Width() + nFix; } + sal_uInt16 GetLines() const { return nLines; } + sal_uInt16 GetDistance() const { return nDistance; } + sal_uInt16 GetDropHeight() const { return nDropHeight; } + sal_uInt16 GetDropDescent() const { return nDropDescent; } + sal_uInt16 GetDropLeft() const { return Width() + nFix; } - inline SwDropPortionPart* GetPart() const { return pPart; } - inline void SetPart( SwDropPortionPart* pNew ) { pPart = pNew; } + SwDropPortionPart* GetPart() const { return pPart; } + void SetPart( SwDropPortionPart* pNew ) { pPart = pNew; } - inline void SetY( short nNew ) { nY = nNew; } + void SetY( short nNew ) { nY = nNew; } - inline SwFont* GetFnt() const { return pPart ? &pPart->GetFont() : nullptr; } + SwFont* GetFnt() const { return pPart ? &pPart->GetFont() : nullptr; } static void DeleteDropCapCache(); diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx index 60b10175ed7c..2688836509f6 100644 --- a/sw/source/core/text/porexp.hxx +++ b/sw/source/core/text/porexp.hxx @@ -25,7 +25,7 @@ class SwExpandPortion : public SwTextPortion { public: - inline SwExpandPortion() { SetWhichPor( POR_EXP ); } + SwExpandPortion() { SetWhichPor( POR_EXP ); } virtual bool Format( SwTextFormatInfo &rInf ) override; virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override; virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; @@ -43,7 +43,7 @@ class SwBlankPortion : public SwExpandPortion sal_Unicode cChar; bool bMulti; // For multiportion brackets public: - inline SwBlankPortion( sal_Unicode cCh, bool bMult = false ) + SwBlankPortion( sal_Unicode cCh, bool bMult = false ) : cChar( cCh ), bMulti( bMult ) { cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); } diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 740c2d93769a..3f229e330482 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -48,9 +48,9 @@ protected: const bool bPlaceHolder : 1; bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR) - inline void SetFont( SwFont *pNew ) { pFnt = pNew; } - inline bool IsNoLength() const { return m_bNoLength; } - inline void SetNoLength() { m_bNoLength = true; } + void SetFont( SwFont *pNew ) { pFnt = pNew; } + bool IsNoLength() const { return m_bNoLength; } + void SetNoLength() { m_bNoLength = true; } public: SwFieldPortion( const SwFieldPortion& rField ); @@ -60,9 +60,9 @@ public: sal_uInt16 m_nAttrFieldType; void TakeNextOffset( const SwFieldPortion* pField ); void CheckScript( const SwTextSizeInfo &rInf ); - inline bool HasFont() const { return nullptr != pFnt; } + bool HasFont() const { return nullptr != pFnt; } // #i89179# - made public - inline const SwFont *GetFont() const { return pFnt; } + const SwFont *GetFont() const { return pFnt; } const OUString& GetExp() const { return aExpand; } virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override; @@ -74,23 +74,23 @@ public: virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; - inline bool IsFollow() const { return bFollow; } - inline void SetFollow( bool bNew ) { bFollow = bNew; } + bool IsFollow() const { return bFollow; } + void SetFollow( bool bNew ) { bFollow = bNew; } - inline bool IsLeft() const { return bLeft; } - inline void SetLeft( bool bNew ) { bLeft = bNew; } + bool IsLeft() const { return bLeft; } + void SetLeft( bool bNew ) { bLeft = bNew; } - inline bool IsHide() const { return bHide; } - inline void SetHide( bool bNew ) { bHide = bNew; } + bool IsHide() const { return bHide; } + void SetHide( bool bNew ) { bHide = bNew; } - inline bool IsCenter() const { return bCenter; } - inline void SetCenter( bool bNew ) { bCenter = bNew; } + bool IsCenter() const { return bCenter; } + void SetCenter( bool bNew ) { bCenter = bNew; } - inline bool HasFollow() const { return bHasFollow; } - inline void SetHasFollow( bool bNew ) { bHasFollow = bNew; } + bool HasFollow() const { return bHasFollow; } + void SetHasFollow( bool bNew ) { bHasFollow = bNew; } - inline sal_Int32 GetNextOffset() const { return nNextOffset; } - inline void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; } + sal_Int32 GetNextOffset() const { return nNextOffset; } + void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; } // Field cloner for SplitGlue virtual SwFieldPortion *Clone( const OUString &rExpand ) const; @@ -110,7 +110,7 @@ public: class SwHiddenPortion : public SwFieldPortion { public: - inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = nullptr ) + SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = nullptr ) : SwFieldPortion( rExpand, pFntL ) { SetLen(1); SetWhichPor( POR_HIDDEN ); } virtual void Paint( const SwTextPaintInfo &rInf ) const override; @@ -185,14 +185,14 @@ public: void StopAnimation( OutputDevice* pOut ); - inline bool IsAnimated() const { return bAnimated; } - inline void SetAnimated( bool bNew ) { bAnimated = bNew; } - inline void SetRelPos( SwTwips nNew ) { nYPos = nNew; } - inline void SetId( long nNew ) const + bool IsAnimated() const { return bAnimated; } + void SetAnimated( bool bNew ) { bAnimated = bNew; } + void SetRelPos( SwTwips nNew ) { nYPos = nNew; } + void SetId( long nNew ) const { const_cast<SwGrfNumPortion*>(this)->nId = nNew; } - inline SwTwips GetRelPos() const { return nYPos; } - inline SwTwips GetGrfHeight() const { return nGrfHeight; } - inline sal_Int16 GetOrient() const { return eOrient; } + SwTwips GetRelPos() const { return nYPos; } + SwTwips GetGrfHeight() const { return nGrfHeight; } + sal_Int16 GetOrient() const { return eOrient; } OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 5e617a4ea8cc..84568066302f 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -35,8 +35,8 @@ class SwFlyPortion : public SwFixPortion public: explicit SwFlyPortion( const SwRect &rFlyRect ) : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } - inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; } - inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; } + sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; } + void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; } virtual void Paint( const SwTextPaintInfo &rInf ) const override; virtual bool Format( SwTextFormatInfo &rInf ) override; OUTPUT_OPERATOR_OVERRIDE @@ -53,11 +53,11 @@ class SwFlyCntPortion : public SwLinePortion public: SwFlyCntPortion(); - inline const Point& GetRefPoint() const { return m_aRef; } - inline bool IsMax() const { return m_bMax; } - inline sw::LineAlign GetAlign() const { return m_eAlign; } - inline void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; } - inline void SetMax(bool bMax) { m_bMax = bMax; } + const Point& GetRefPoint() const { return m_aRef; } + bool IsMax() const { return m_bMax; } + sw::LineAlign GetAlign() const { return m_eAlign; } + void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; } + void SetMax(bool bMax) { m_bMax = bMax; } void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags); virtual bool Format(SwTextFormatInfo& rInf) override; OUTPUT_OPERATOR_OVERRIDE @@ -72,7 +72,7 @@ namespace sw public: FlyContentPortion(SwFlyInContentFrame* pFly); static FlyContentPortion* Create(const SwTextFrame& rFrame, SwFlyInContentFrame* pFly, const Point& rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags); - inline SwFlyInContentFrame* GetFlyFrame() { return m_pFly; } + SwFlyInContentFrame* GetFlyFrame() { return m_pFly; } void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); }; virtual void Paint(const SwTextPaintInfo& rInf) const override; virtual ~FlyContentPortion() override; diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx index a76b02d80c03..396f2b3fab5e 100644 --- a/sw/source/core/text/porglue.hxx +++ b/sw/source/core/text/porglue.hxx @@ -34,8 +34,8 @@ public: void Join( SwGluePortion *pVictim ); inline short GetPrtGlue() const; - inline sal_uInt16 GetFixWidth() const { return nFixWidth; } - inline void SetFixWidth( const sal_uInt16 nNew ) { nFixWidth = nNew; } + sal_uInt16 GetFixWidth() const { return nFixWidth; } + void SetFixWidth( const sal_uInt16 nNew ) { nFixWidth = nNew; } void MoveGlue( SwGluePortion *pTarget, const short nPrtGlue ); inline void MoveAllGlue( SwGluePortion *pTarget ); inline void MoveHalfGlue( SwGluePortion *pTarget ); diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx index aecf4523e36c..212018c4d9d4 100644 --- a/sw/source/core/text/porhyph.hxx +++ b/sw/source/core/text/porhyph.hxx @@ -68,7 +68,7 @@ public: virtual void Paint( const SwTextPaintInfo &rInf ) const override; virtual bool Format( SwTextFormatInfo &rInf ) override; virtual void FormatEOL( SwTextFormatInfo &rInf ) override; - inline void SetExpand( const bool bNew ) { bExpand = bNew; } + void SetExpand( const bool bNew ) { bExpand = bNew; } bool IsExpand() const { return bExpand; } virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override; diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx index eb7c2bd996d7..a95145bd8184 100644 --- a/sw/source/core/text/porlay.hxx +++ b/sw/source/core/text/porlay.hxx @@ -38,19 +38,19 @@ class SwCharRange { sal_Int32 nStart, nLen; public: - inline SwCharRange( const sal_Int32 nInitStart = 0, + SwCharRange( const sal_Int32 nInitStart = 0, const sal_Int32 nInitLen = 0): nStart( nInitStart ), nLen(nInitLen) {} - inline sal_Int32 &Start() { return nStart; } - inline const sal_Int32 &Start() const { return nStart; } - inline void LeftMove( sal_Int32 nNew ) + sal_Int32 &Start() { return nStart; } + const sal_Int32 &Start() const { return nStart; } + void LeftMove( sal_Int32 nNew ) { if ( nNew < nStart ) { nLen += nStart-nNew; nStart = nNew; } } - inline sal_Int32 &Len() { return nLen; } - inline const sal_Int32 &Len() const { return nLen; } - inline bool operator<(const SwCharRange &rRange) const + sal_Int32 &Len() { return nLen; } + const sal_Int32 &Len() const { return nLen; } + bool operator<(const SwCharRange &rRange) const { return nStart < rRange.nStart; } - inline bool operator>(const SwCharRange &rRange) const + bool operator>(const SwCharRange &rRange) const { return nStart + nLen > rRange.nStart + rRange.nLen; } - inline bool operator!=(const SwCharRange &rRange) const + bool operator!=(const SwCharRange &rRange) const { return *this < rRange || *this > rRange; } SwCharRange &operator+=(const SwCharRange &rRange); }; @@ -107,82 +107,82 @@ public: // Flags void ResetFlags(); - inline void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; } - inline bool IsFormatAdj() const { return m_bFormatAdj; } - inline void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; } - inline bool IsEndHyph() const { return m_bEndHyph; } - inline void SetMidHyph( const bool bNew ) { m_bMidHyph = bNew; } - inline bool IsMidHyph() const { return m_bMidHyph; } - inline void SetFly( const bool bNew ) { m_bFly = bNew; } - inline bool IsFly() const { return m_bFly; } - inline void SetRest( const bool bNew ) { m_bRest = bNew; } - inline bool IsRest() const { return m_bRest; } - inline void SetBlinking( const bool bNew = true ) { m_bBlinking = bNew; } - inline bool IsBlinking() const { return m_bBlinking; } - inline void SetContent( const bool bNew = true ) { m_bContent = bNew; } - inline bool HasContent() const { return m_bContent; } - inline void SetRedline( const bool bNew = true ) { m_bRedline = bNew; } - inline bool HasRedline() const { return m_bRedline; } - inline void SetForcedLeftMargin() { m_bForcedLeftMargin = true; } - inline bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; } - inline void SetHanging( const bool bNew = true ) { m_bHanging = bNew; } - inline bool IsHanging() const { return m_bHanging; } - inline void SetUnderscore( const bool bNew = true ) { m_bUnderscore = bNew; } - inline bool HasUnderscore() const { return m_bUnderscore; } + void SetFormatAdj( const bool bNew ) { m_bFormatAdj = bNew; } + bool IsFormatAdj() const { return m_bFormatAdj; } + void SetEndHyph( const bool bNew ) { m_bEndHyph = bNew; } + bool IsEndHyph() const { return m_bEndHyph; } + void SetMidHyph( const bool bNew ) { m_bMidHyph = bNew; } + bool IsMidHyph() const { return m_bMidHyph; } + void SetFly( const bool bNew ) { m_bFly = bNew; } + bool IsFly() const { return m_bFly; } + void SetRest( const bool bNew ) { m_bRest = bNew; } + bool IsRest() const { return m_bRest; } + void SetBlinking( const bool bNew = true ) { m_bBlinking = bNew; } + bool IsBlinking() const { return m_bBlinking; } + void SetContent( const bool bNew = true ) { m_bContent = bNew; } + bool HasContent() const { return m_bContent; } + void SetRedline( const bool bNew = true ) { m_bRedline = bNew; } + bool HasRedline() const { return m_bRedline; } + void SetForcedLeftMargin() { m_bForcedLeftMargin = true; } + bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; } + void SetHanging( const bool bNew = true ) { m_bHanging = bNew; } + bool IsHanging() const { return m_bHanging; } + void SetUnderscore( const bool bNew = true ) { m_bUnderscore = bNew; } + bool HasUnderscore() const { return m_bUnderscore; } // Respecting empty dummy lines - inline void SetDummy( const bool bNew ) { m_bDummy = bNew; } - inline bool IsDummy() const { return m_bDummy; } + void SetDummy( const bool bNew ) { m_bDummy = bNew; } + bool IsDummy() const { return m_bDummy; } - inline void SetClipping( const bool bNew ) { m_bClipping = bNew; } - inline bool IsClipping() const { return m_bClipping; } + void SetClipping( const bool bNew ) { m_bClipping = bNew; } + bool IsClipping() const { return m_bClipping; } SwLineLayout(); virtual ~SwLineLayout() override; - inline SwLineLayout *GetNext() { return m_pNext; } - inline const SwLineLayout *GetNext() const { return m_pNext; } - inline void SetNext( SwLineLayout *pNew ) { m_pNext = pNew; } + SwLineLayout *GetNext() { return m_pNext; } + const SwLineLayout *GetNext() const { return m_pNext; } + void SetNext( SwLineLayout *pNew ) { m_pNext = pNew; } void Init( SwLinePortion *pNextPortion = nullptr); // Collects the data for the line void CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf ); - inline void SetRealHeight( sal_uInt16 nNew ) { m_nRealHeight = nNew; } - inline sal_uInt16 GetRealHeight() const { return m_nRealHeight; } + void SetRealHeight( sal_uInt16 nNew ) { m_nRealHeight = nNew; } + sal_uInt16 GetRealHeight() const { return m_nRealHeight; } // Creates the glue chain for short lines SwMarginPortion *CalcLeftMargin(); - inline SwTwips GetHangingMargin() const + SwTwips GetHangingMargin() const { return GetHangingMargin_(); } // For special treatment for empty lines virtual bool Format( SwTextFormatInfo &rInf ) override; // Stuff for justified alignment - inline bool IsSpaceAdd() { return m_pLLSpaceAdd != nullptr; } + bool IsSpaceAdd() { return m_pLLSpaceAdd != nullptr; } void InitSpaceAdd(); // Creates pLLSpaceAdd if necessary void CreateSpaceAdd( const long nInit = 0 ); - inline void FinishSpaceAdd() { delete m_pLLSpaceAdd; m_pLLSpaceAdd = nullptr; } - inline sal_uInt16 GetLLSpaceAddCount() const { return sal::static_int_cast< sal_uInt16 >(m_pLLSpaceAdd->size()); } - inline void SetLLSpaceAdd( long nNew, sal_uInt16 nIdx ) + void FinishSpaceAdd() { delete m_pLLSpaceAdd; m_pLLSpaceAdd = nullptr; } + sal_uInt16 GetLLSpaceAddCount() const { return sal::static_int_cast< sal_uInt16 >(m_pLLSpaceAdd->size()); } + void SetLLSpaceAdd( long nNew, sal_uInt16 nIdx ) { if ( nIdx == GetLLSpaceAddCount() ) m_pLLSpaceAdd->push_back( nNew ); else (*m_pLLSpaceAdd)[ nIdx ] = nNew; } - inline long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[ nIdx ]; } - inline void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase( m_pLLSpaceAdd->begin() ); } - inline std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd; } + long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[ nIdx ]; } + void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase( m_pLLSpaceAdd->begin() ); } + std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd; } // Stuff for Kana compression - inline void SetKanaComp( std::deque<sal_uInt16>* pNew ){ m_pKanaComp = pNew; } - inline void FinishKanaComp() { delete m_pKanaComp; m_pKanaComp = nullptr; } - inline std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; } - inline std::deque<sal_uInt16>& GetKanaComp() { return *m_pKanaComp; } + void SetKanaComp( std::deque<sal_uInt16>* pNew ){ m_pKanaComp = pNew; } + void FinishKanaComp() { delete m_pKanaComp; m_pKanaComp = nullptr; } + std::deque<sal_uInt16>* GetpKanaComp() const { return m_pKanaComp; } + std::deque<sal_uInt16>& GetKanaComp() { return *m_pKanaComp; } /** determine ascent and descent for positioning of as-character anchored object @@ -262,14 +262,14 @@ public: inline void ResetPreps(); // Get/Set methods - inline SwRepaint& GetRepaint() { return m_aRepaint; } - inline const SwRepaint& GetRepaint() const { return m_aRepaint; } - inline SwCharRange& GetReformat() { return m_aReformat; } - inline const SwCharRange& GetReformat() const { return m_aReformat; } - inline long& GetDelta() { return m_nDelta; } - inline const long& GetDelta() const { return m_nDelta; } - inline SwScriptInfo& GetScriptInfo() { return m_aScriptInfo; } - inline const SwScriptInfo& GetScriptInfo() const { return m_aScriptInfo; } + SwRepaint& GetRepaint() { return m_aRepaint; } + const SwRepaint& GetRepaint() const { return m_aRepaint; } + SwCharRange& GetReformat() { return m_aReformat; } + const SwCharRange& GetReformat() const { return m_aReformat; } + long& GetDelta() { return m_nDelta; } + const long& GetDelta() const { return m_nDelta; } + SwScriptInfo& GetScriptInfo() { return m_aScriptInfo; } + const SwScriptInfo& GetScriptInfo() const { return m_aScriptInfo; } // For SwTextFrame::Format: returns the paragraph's current length sal_Int32 GetParLen() const; @@ -278,27 +278,27 @@ public: bool UpdateQuoVadis( const OUString &rQuo ); // Flags - inline void SetFly() { m_bFlys = true; } - inline bool HasFly() const { return m_bFlys; } + void SetFly() { m_bFlys = true; } + bool HasFly() const { return m_bFlys; } // Preps - inline void SetPrep() { m_bPrep = true; } - inline bool IsPrep() const { return m_bPrep; } - inline void SetPrepWidows() { m_bPrepWidows = true; } - inline bool IsPrepWidows() const { return m_bPrepWidows; } - inline void SetPrepMustFit( const bool bNew ) { m_bPrepMustFit = bNew; } - inline bool IsPrepMustFit() const { return m_bPrepMustFit; } - inline void SetPrepAdjust() { m_bPrepAdjust = true; } - inline bool IsPrepAdjust() const { return m_bPrepAdjust; } - inline void SetFollowField( const bool bNew ) { m_bFollowField = bNew; } - inline bool IsFollowField() const { return m_bFollowField; } - inline void SetFixLineHeight() { m_bFixLineHeight = true; } - inline bool IsFixLineHeight() const { return m_bFixLineHeight; } - - inline void SetFootnoteNum( const bool bNew ) { m_bFootnoteNum = bNew; } - inline bool IsFootnoteNum() const { return m_bFootnoteNum; } - inline void SetMargin( const bool bNew = true ) { m_bMargin = bNew; } - inline bool IsMargin() const { return m_bMargin; } + void SetPrep() { m_bPrep = true; } + bool IsPrep() const { return m_bPrep; } + void SetPrepWidows() { m_bPrepWidows = true; } + bool IsPrepWidows() const { return m_bPrepWidows; } + void SetPrepMustFit( const bool bNew ) { m_bPrepMustFit = bNew; } + bool IsPrepMustFit() const { return m_bPrepMustFit; } + void SetPrepAdjust() { m_bPrepAdjust = true; } + bool IsPrepAdjust() const { return m_bPrepAdjust; } + void SetFollowField( const bool bNew ) { m_bFollowField = bNew; } + bool IsFollowField() const { return m_bFollowField; } + void SetFixLineHeight() { m_bFixLineHeight = true; } + bool IsFixLineHeight() const { return m_bFixLineHeight; } + + void SetFootnoteNum( const bool bNew ) { m_bFootnoteNum = bNew; } + bool IsFootnoteNum() const { return m_bFootnoteNum; } + void SetMargin( const bool bNew = true ) { m_bMargin = bNew; } + bool IsMargin() const { return m_bMargin; } // Set nErgo in the QuoVadisPortion void SetErgoSumNum( const OUString &rErgo ); diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 008b5c0dcb92..c95c052f1171 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -78,18 +78,18 @@ public: virtual ~SwLinePortion(); // Access methods - inline SwLinePortion *GetPortion() const { return pPortion; } + SwLinePortion *GetPortion() const { return pPortion; } inline SwLinePortion &operator=(const SwLinePortion &rPortion); - inline sal_Int32 GetLen() const { return nLineLength; } - inline void SetLen( const sal_Int32 nLen ) { nLineLength = nLen; } - inline void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; } - inline sal_uInt16 &GetAscent() { return nAscent; } - inline sal_uInt16 GetAscent() const { return nAscent; } - inline void SetAscent( const sal_uInt16 nNewAsc ) { nAscent = nNewAsc; } - inline void PrtWidth( sal_uInt16 nNewWidth ) { Width( nNewWidth ); } - inline sal_uInt16 PrtWidth() const { return Width(); } - inline void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); } - inline void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); } + sal_Int32 GetLen() const { return nLineLength; } + void SetLen( const sal_Int32 nLen ) { nLineLength = nLen; } + void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; } + sal_uInt16 &GetAscent() { return nAscent; } + sal_uInt16 GetAscent() const { return nAscent; } + void SetAscent( const sal_uInt16 nNewAsc ) { nAscent = nNewAsc; } + void PrtWidth( sal_uInt16 nNewWidth ) { Width( nNewWidth ); } + sal_uInt16 PrtWidth() const { return Width(); } + void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); } + void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); } // Insert methods virtual SwLinePortion *Insert( SwLinePortion *pPortion ); @@ -100,49 +100,49 @@ public: // Returns 0, if there's no payload virtual SwLinePortion *Compress(); - inline void SetWhichPor( const sal_uInt16 nNew ) { nWhichPor = nNew; } - inline sal_uInt16 GetWhichPor( ) const { return nWhichPor; } + void SetWhichPor( const sal_uInt16 nNew ) { nWhichPor = nNew; } + sal_uInt16 GetWhichPor( ) const { return nWhichPor; } // Group queries - inline bool InTextGrp() const { return (nWhichPor & PORGRP_TXT) != 0; } - inline bool InGlueGrp() const { return (nWhichPor & PORGRP_GLUE) != 0; } - inline bool InTabGrp() const { return (nWhichPor & PORGRP_TAB) != 0; } - inline bool InHyphGrp() const { return (nWhichPor & PORGRP_HYPH) != 0; } - inline bool InNumberGrp() const { return (nWhichPor & PORGRP_NUMBER) != 0; } - inline bool InFixGrp() const { return (nWhichPor & PORGRP_FIX) != 0; } - inline bool InFieldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; } - inline bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; } - inline bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; } - inline bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; } - inline bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; } - inline bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); } + bool InTextGrp() const { return (nWhichPor & PORGRP_TXT) != 0; } + bool InGlueGrp() const { return (nWhichPor & PORGRP_GLUE) != 0; } + bool InTabGrp() const { return (nWhichPor & PORGRP_TAB) != 0; } + bool InHyphGrp() const { return (nWhichPor & PORGRP_HYPH) != 0; } + bool InNumberGrp() const { return (nWhichPor & PORGRP_NUMBER) != 0; } + bool InFixGrp() const { return (nWhichPor & PORGRP_FIX) != 0; } + bool InFieldGrp() const { return (nWhichPor & PORGRP_FLD) != 0; } + bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; } + bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; } + bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; } + bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; } + bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); } // Individual queries - inline bool IsGrfNumPortion() const { return nWhichPor == POR_GRFNUM; } - inline bool IsFlyCntPortion() const { return nWhichPor == POR_FLYCNT; } - inline bool IsBlankPortion() const { return nWhichPor == POR_BLANK; } - inline bool IsBreakPortion() const { return nWhichPor == POR_BRK; } - inline bool IsErgoSumPortion() const { return nWhichPor == POR_ERGOSUM; } - inline bool IsQuoVadisPortion() const { return nWhichPor == POR_QUOVADIS; } - inline bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; } - inline bool IsTabRightPortion() const { return nWhichPor == POR_TABRIGHT; } - inline bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; } - inline bool IsFootnotePortion() const { return nWhichPor == POR_FTN; } - inline bool IsDropPortion() const { return nWhichPor == POR_DROP; } - inline bool IsLayPortion() const { return nWhichPor == POR_LAY; } - inline bool IsParaPortion() const { return nWhichPor == POR_PARA; } - inline bool IsMarginPortion() const { return nWhichPor == POR_MARGIN; } - inline bool IsFlyPortion() const { return nWhichPor == POR_FLY; } - inline bool IsHolePortion() const { return nWhichPor == POR_HOLE; } - inline bool IsSoftHyphPortion() const { return nWhichPor == POR_SOFTHYPH; } - inline bool IsPostItsPortion() const { return nWhichPor == POR_POSTITS; } - inline bool IsCombinedPortion() const { return nWhichPor == POR_COMBINED; } - inline bool IsTextPortion() const { return nWhichPor == POR_TXT; } - inline bool IsHangingPortion() const { return nWhichPor == POR_HNG; } - inline bool IsKernPortion() const { return nWhichPor == POR_KERN; } - inline bool IsArrowPortion() const { return nWhichPor == POR_ARROW; } - inline bool IsMultiPortion() const { return nWhichPor == POR_MULTI; } - inline bool IsNumberPortion() const { return nWhichPor == POR_NUMBER; } // #i23726# - inline bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; } + bool IsGrfNumPortion() const { return nWhichPor == POR_GRFNUM; } + bool IsFlyCntPortion() const { return nWhichPor == POR_FLYCNT; } + bool IsBlankPortion() const { return nWhichPor == POR_BLANK; } + bool IsBreakPortion() const { return nWhichPor == POR_BRK; } + bool IsErgoSumPortion() const { return nWhichPor == POR_ERGOSUM; } + bool IsQuoVadisPortion() const { return nWhichPor == POR_QUOVADIS; } + bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; } + bool IsTabRightPortion() const { return nWhichPor == POR_TABRIGHT; } + bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; } + bool IsFootnotePortion() const { return nWhichPor == POR_FTN; } + bool IsDropPortion() const { return nWhichPor == POR_DROP; } + bool IsLayPortion() const { return nWhichPor == POR_LAY; } + bool IsParaPortion() const { return nWhichPor == POR_PARA; } + bool IsMarginPortion() const { return nWhichPor == POR_MARGIN; } + bool IsFlyPortion() const { return nWhichPor == POR_FLY; } + bool IsHolePortion() const { return nWhichPor == POR_HOLE; } + bool IsSoftHyphPortion() const { return nWhichPor == POR_SOFTHYPH; } + bool IsPostItsPortion() const { return nWhichPor == POR_POSTITS; } + bool IsCombinedPortion() const { return nWhichPor == POR_COMBINED; } + bool IsTextPortion() const { return nWhichPor == POR_TXT; } + bool IsHangingPortion() const { return nWhichPor == POR_HNG; } + bool IsKernPortion() const { return nWhichPor == POR_KERN; } + bool IsArrowPortion() const { return nWhichPor == POR_ARROW; } + bool IsMultiPortion() const { return nWhichPor == POR_MULTI; } + bool IsNumberPortion() const { return nWhichPor == POR_NUMBER; } // #i23726# + bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; } // Positioning SwLinePortion *FindPrevPortion( const SwLinePortion *pRoot ); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 52fdf931010b..94458d90b05e 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1179,7 +1179,7 @@ public: SwSpaceManipulator( SwTextPaintInfo& rInf, SwMultiPortion& rMult ); ~SwSpaceManipulator(); void SecondLine(); - inline long GetSpaceAdd() const { return nSpaceAdd; } + long GetSpaceAdd() const { return nSpaceAdd; } }; SwSpaceManipulator::SwSpaceManipulator( SwTextPaintInfo& rInf, diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index ea2903775a2e..105d4540fbaf 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -113,17 +113,17 @@ public: const SwLineLayout& GetRoot() const { return aRoot; } SwLineLayout& GetRoot() { return aRoot; } - inline bool HasTabulator() const { return bTab1 || bTab2; } - inline bool IsFormatted() const { return bFormatted; } - inline void SetFormatted() { bFormatted = true; } - inline bool IsFollowField() const { return bFollowField; } - inline void SetFollowField() { bFollowField = true; } - inline bool HasFlyInContent() const { return bFlyInContent; } - inline void SetFlyInContent( bool bNew ) { bFlyInContent = bNew; } - inline bool IsDouble() const { return bDouble; } - inline bool IsRuby() const { return bRuby; } - inline bool IsBidi() const { return bBidi; } - inline bool OnTop() const { return bTop; } + bool HasTabulator() const { return bTab1 || bTab2; } + bool IsFormatted() const { return bFormatted; } + void SetFormatted() { bFormatted = true; } + bool IsFollowField() const { return bFollowField; } + void SetFollowField() { bFollowField = true; } + bool HasFlyInContent() const { return bFlyInContent; } + void SetFlyInContent( bool bNew ) { bFlyInContent = bNew; } + bool IsDouble() const { return bDouble; } + bool IsRuby() const { return bRuby; } + bool IsBidi() const { return bBidi; } + bool OnTop() const { return bTop; } void ActualizeTabulator(); virtual void Paint( const SwTextPaintInfo &rInf ) const override; @@ -134,9 +134,9 @@ public: void CalcSize( SwTextFormatter& rLine, SwTextFormatInfo &rInf ); inline bool HasBrackets() const; - inline bool HasRotation() const { return 0 != (1 & nDirection); } - inline bool IsRevers() const { return 0 != (2 & nDirection); } - inline sal_uInt8 GetDirection() const { return nDirection; } + bool HasRotation() const { return 0 != (1 & nDirection); } + bool IsRevers() const { return 0 != (2 & nDirection); } + sal_uInt8 GetDirection() const { return nDirection; } // Accessibility: pass information about this portion to the PortionHandler virtual void HandlePortion( SwPortionHandler& rPH ) const override; @@ -155,22 +155,22 @@ public: SwDoubleLinePortion( const SwMultiCreator& rCreate, sal_Int32 nEnd ); virtual ~SwDoubleLinePortion() override; - inline SwBracket* GetBrackets() const { return pBracket.get(); } + SwBracket* GetBrackets() const { return pBracket.get(); } void SetBrackets( const SwDoubleLinePortion& rDouble ); void PaintBracket( SwTextPaintInfo& rInf, long nSpaceAdd, bool bOpen ) const; void FormatBrackets( SwTextFormatInfo &rInf, SwTwips& nMaxWidth ); - inline sal_uInt16 PreWidth() const { return pBracket->nPreWidth; }; - inline sal_uInt16 PostWidth() const { return pBracket->nPostWidth; } - inline void ClearBrackets() + sal_uInt16 PreWidth() const { return pBracket->nPreWidth; }; + sal_uInt16 PostWidth() const { return pBracket->nPostWidth; } + void ClearBrackets() { pBracket->nPreWidth = pBracket->nPostWidth=0; Width( 0 ); } - inline sal_uInt16 BracketWidth(){ return PreWidth() + PostWidth(); } + sal_uInt16 BracketWidth(){ return PreWidth() + PostWidth(); } void CalcBlanks( SwTextFormatInfo &rInf ); static void ResetSpaceAdd( SwLineLayout* pCurr ); - inline SwTwips GetLineDiff() const { return nLineDiff; } - inline sal_Int32 GetSpaceCnt() const + SwTwips GetLineDiff() const { return nLineDiff; } + sal_Int32 GetSpaceCnt() const { return ( nLineDiff < 0 ) ? nBlank2 : nBlank1; } - inline sal_Int32 GetSmallerSpaceCnt() const + sal_Int32 GetSmallerSpaceCnt() const { return ( nLineDiff < 0 ) ? nBlank1 : nBlank2; } virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; @@ -191,10 +191,10 @@ public: const bool* pForceRubyPos ); void CalcRubyOffset(); - inline void Adjust( SwTextFormatInfo &rInf ) + void Adjust( SwTextFormatInfo &rInf ) { if(nAdjustment && GetRoot().GetNext()) Adjust_(rInf); } - inline sal_uInt16 GetAdjustment() const { return nAdjustment; } - inline sal_Int32 GetRubyOffset() const { return nRubyOffset; } + sal_uInt16 GetAdjustment() const { return nAdjustment; } + sal_Int32 GetRubyOffset() const { return nRubyOffset; } }; class SwRotatedPortion : public SwMultiPortion @@ -213,7 +213,7 @@ class SwBidiPortion : public SwMultiPortion public: SwBidiPortion( sal_Int32 nEnd, sal_uInt8 nLv ); - inline sal_uInt8 GetLevel() const { return nLevel; } + sal_uInt8 GetLevel() const { return nLevel; } // Get number of blanks for justified alignment sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf ) const; // Calculates extra spacing based on number of blanks diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx index 593acb05edc6..37cc7721c627 100644 --- a/sw/source/core/text/porref.hxx +++ b/sw/source/core/text/porref.hxx @@ -24,7 +24,7 @@ class SwRefPortion : public SwTextPortion { public: - inline SwRefPortion(){ SetWhichPor( POR_REF ); } + SwRefPortion(){ SetWhichPor( POR_REF ); } virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index e58f0680d169..9c421d438b0e 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -86,8 +86,8 @@ public: explicit SwArrowPortion( const SwTextPaintInfo &rInf ); virtual void Paint( const SwTextPaintInfo &rInf ) const override; virtual SwLinePortion *Compress() override; - inline bool IsLeft() const { return bLeft; } - inline const Point& GetPos() const { return aPos; } + bool IsLeft() const { return bLeft; } + const Point& GetPos() const { return aPos; } OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx index 55f00ae83f7d..65022a44c998 100644 --- a/sw/source/core/text/portab.hxx +++ b/sw/source/core/text/portab.hxx @@ -35,8 +35,8 @@ public: virtual bool Format( SwTextFormatInfo &rInf ) override; virtual void FormatEOL( SwTextFormatInfo &rInf ) override; bool PostFormat( SwTextFormatInfo &rInf ); - inline bool IsFilled() const { return 0 != cFill; } - inline sal_uInt16 GetTabPos() const { return nTabPos; } + bool IsFilled() const { return 0 != cFill; } + sal_uInt16 GetTabPos() const { return nTabPos; } // Accessibility: pass information about this portion to the PortionHandler virtual void HandlePortion( SwPortionHandler& rPH ) const override; @@ -47,7 +47,7 @@ public: class SwTabLeftPortion : public SwTabPortion { public: - inline SwTabLeftPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar, bool bAutoTab = true ) + SwTabLeftPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar, bool bAutoTab = true ) : SwTabPortion( nTabPosVal, cFillChar, bAutoTab ) { SetWhichPor( POR_TABLEFT ); } OUTPUT_OPERATOR_OVERRIDE @@ -56,7 +56,7 @@ public: class SwTabRightPortion : public SwTabPortion { public: - inline SwTabRightPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar ) + SwTabRightPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar ) : SwTabPortion( nTabPosVal, cFillChar ) { SetWhichPor( POR_TABRIGHT ); } OUTPUT_OPERATOR_OVERRIDE @@ -65,7 +65,7 @@ public: class SwTabCenterPortion : public SwTabPortion { public: - inline SwTabCenterPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar ) + SwTabCenterPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cFillChar ) : SwTabPortion( nTabPosVal, cFillChar ) { SetWhichPor( POR_TABCENTER ); } OUTPUT_OPERATOR_OVERRIDE @@ -83,20 +83,20 @@ class SwTabDecimalPortion : public SwTabPortion sal_uInt16 mnWidthOfPortionsUpTpDecimalPosition; public: - inline SwTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab, + SwTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab, const sal_Unicode cFillChar ) : SwTabPortion( nTabPosVal, cFillChar ), mcTab(cTab), mnWidthOfPortionsUpTpDecimalPosition( USHRT_MAX ) { SetWhichPor( POR_TABDECIMAL ); } - inline sal_Unicode GetTabDecimal() const { return mcTab; } + sal_Unicode GetTabDecimal() const { return mcTab; } - inline void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew ) + void SetWidthOfPortionsUpToDecimalPosition( sal_uInt16 nNew ) { mnWidthOfPortionsUpTpDecimalPosition = nNew; } - inline sal_uInt16 GetWidthOfPortionsUpToDecimalPosition() const + sal_uInt16 GetWidthOfPortionsUpToDecimalPosition() const { return mnWidthOfPortionsUpTpDecimalPosition; } @@ -107,7 +107,7 @@ public: class SwAutoTabDecimalPortion : public SwTabDecimalPortion { public: - inline SwAutoTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab, + SwAutoTabDecimalPortion( const sal_uInt16 nTabPosVal, const sal_Unicode cTab, const sal_Unicode cFillChar ) : SwTabDecimalPortion( nTabPosVal, cTab, cFillChar ) { SetLen( 0 ); } diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx index 3d4937e65e27..cb3ebc321171 100644 --- a/sw/source/core/text/portox.hxx +++ b/sw/source/core/text/portox.hxx @@ -25,7 +25,7 @@ class SwToxPortion : public SwTextPortion { public: - inline SwToxPortion(){ SetWhichPor( POR_TOX ); } + SwToxPortion(){ SetWhichPor( POR_TOX ); } virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE }; diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index 26d7970d56d4..f795f36d3c4e 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -33,7 +33,7 @@ class SwTextPortion : public SwLinePortion bool Format_( SwTextFormatInfo &rInf ); public: - inline SwTextPortion(){ SetWhichPor( POR_TXT ); } + SwTextPortion(){ SetWhichPor( POR_TXT ); } static SwTextPortion * CopyLinePortion(const SwLinePortion &rPortion); virtual void Paint( const SwTextPaintInfo &rInf ) const override; virtual bool Format( SwTextFormatInfo &rInf ) override; @@ -87,7 +87,7 @@ public: class SwFieldMarkPortion : public SwTextPortion { public: - inline SwFieldMarkPortion() : SwTextPortion() + SwFieldMarkPortion() : SwTextPortion() { } virtual void Paint( const SwTextPaintInfo &rInf ) const override; virtual bool Format( SwTextFormatInfo &rInf ) override; diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 1de12a16050c..556c3af662c7 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -87,29 +87,29 @@ public: sal_Int32 nRedlPos, bool bShw, const std::vector<ExtTextInputAttr> *pArr = nullptr, sal_Int32 nExtStart = COMPLETE_STRING ); ~SwRedlineItr(); - inline bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } - inline void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); } + bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } + void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); } void ChangeTextAttr( SwFont* pFnt, SwTextAttr &rHt, bool bChg ); - inline short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) { + short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) { if( bShow || pExt ) return Seek_( rFnt, nNew, nOld ); return 0; } - inline void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING; + void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING; if( pExt ) pExt->Reset(); } - inline sal_Int32 GetNextRedln( sal_Int32 nNext ) { + sal_Int32 GetNextRedln( sal_Int32 nNext ) { if( bShow || pExt ) return GetNextRedln_( nNext ); return nNext; } - inline bool ChkSpecialUnderline() const + bool ChkSpecialUnderline() const { return IsOn() && ChkSpecialUnderline_(); } bool CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd ); - inline bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew ) + bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew ) { return pExt->Leave(rFnt, nNew ); } - inline bool ExtOn() { + bool ExtOn() { if( pExt ) return pExt->IsOn(); return false; } - inline void UpdateExtFont( SwFont &rFnt ) { + void UpdateExtFont( SwFont &rFnt ) { OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" ); pExt->UpdateFont( rFnt ); } }; diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index 2acc3de89ed9..77d199c72750 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -37,10 +37,10 @@ public: SwTextLine( SwTextFrame *pFrame, SwParaPortion *pNew = nullptr ); virtual ~SwTextLine() override; - inline SwParaPortion *GetPara() { return pLine.get(); } - inline const SwParaPortion *GetPara() const { return pLine.get(); } + SwParaPortion *GetPara() { return pLine.get(); } + const SwParaPortion *GetPara() const { return pLine.get(); } - inline void SetPara( SwParaPortion *pNew, bool bDelete ) { if (!bDelete) pLine.release(); pLine.reset( pNew ); } + void SetPara( SwParaPortion *pNew, bool bDelete ) { if (!bDelete) pLine.release(); pLine.reset( pNew ); } }; class SwTextLineAccess : public SwCacheAccess diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index d520edceeda6..5408517e6d94 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -41,11 +41,11 @@ public: } ~SwSaveClip(); - inline void ChgClip( const SwRect &rRect, const SwTextFrame* pFrame = nullptr, + void ChgClip( const SwRect &rRect, const SwTextFrame* pFrame = nullptr, bool bEnlargeRect = false) { if( pOut ) ChgClip_( rRect, pFrame, bEnlargeRect ); } - inline bool IsOn() const { return bOn; } - inline bool IsChg() const { return bChg; } + bool IsOn() const { return bOn; } + bool IsChg() const { return bChg; } }; diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx index 1063f6313272..56326a1cb53e 100644 --- a/sw/source/core/text/widorp.hxx +++ b/sw/source/core/text/widorp.hxx @@ -37,7 +37,7 @@ public: bool IsBreakNow( SwTextMargin &rLine ); bool IsKeepAlways() const { return m_bKeep; } - inline void SetKeep( const bool bNew ) { m_bKeep = bNew; } + void SetKeep( const bool bNew ) { m_bKeep = bNew; } bool IsInside( SwTextMargin &rLine ) const; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 0afe25a166a6..55862431d549 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -99,10 +99,10 @@ protected: public: virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) = 0; virtual void Do() = 0; - inline OutputDevice& GetOut() { return rInf.GetOut(); } - inline SwDrawTextInfo& GetInf() { return rInf; } - inline SwCapitalInfo* GetCapInf() const { return pCapInf; } - inline void SetCapInf( SwCapitalInfo& rNew ) { pCapInf = &rNew; } + OutputDevice& GetOut() { return rInf.GetOut(); } + SwDrawTextInfo& GetInf() { return rInf; } + SwCapitalInfo* GetCapInf() const { return pCapInf; } + void SetCapInf( SwCapitalInfo& rNew ) { pCapInf = &rNew; } }; class SwDoGetCapitalSize : public SwDoCapitals @@ -327,7 +327,7 @@ public: virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; virtual void Do() override; - inline sal_Int32 GetCursor(){ return nCursor; } + sal_Int32 GetCursor(){ return nCursor; } }; void SwDoCapitalCursorOfst::Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx index f28dc1bb1df0..51966860fb53 100644 --- a/sw/source/core/unocore/XMLRangeHelper.hxx +++ b/sw/source/core/unocore/XMLRangeHelper.hxx @@ -46,7 +46,7 @@ struct Cell bIsEmpty(true) {} - inline bool empty() const { return bIsEmpty; } + bool empty() const { return bIsEmpty; } }; struct CellRange diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 2d9e4c6dc109..15eb57a2ca1d 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1002,13 +1002,13 @@ namespace { typedef SwXTextFrame core_frame_t; typedef XTextFrame uno_frame_t; - static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat) + static uno::Any wrapFrame(SwFrameFormat & rFrameFormat) { uno::Reference<text::XTextFrame> const xRet( SwXTextFrame::CreateXTextFrame(*rFrameFormat.GetDoc(), &rFrameFormat)); return uno::makeAny(xRet); } - static inline bool filter(const SwNode* const pNode) { return !pNode->IsNoTextNode(); }; + static bool filter(const SwNode* const pNode) { return !pNode->IsNoTextNode(); }; }; template<> @@ -1016,13 +1016,13 @@ namespace { typedef SwXTextGraphicObject core_frame_t; typedef XTextContent uno_frame_t; - static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat) + static uno::Any wrapFrame(SwFrameFormat & rFrameFormat) { uno::Reference<text::XTextContent> const xRet( SwXTextGraphicObject::CreateXTextGraphicObject(*rFrameFormat.GetDoc(), &rFrameFormat)); return uno::makeAny(xRet); } - static inline bool filter(const SwNode* const pNode) { return pNode->IsGrfNode(); }; + static bool filter(const SwNode* const pNode) { return pNode->IsGrfNode(); }; }; template<> @@ -1030,13 +1030,13 @@ namespace { typedef SwXTextEmbeddedObject core_frame_t; typedef XEmbeddedObjectSupplier uno_frame_t; - static inline uno::Any wrapFrame(SwFrameFormat & rFrameFormat) + static uno::Any wrapFrame(SwFrameFormat & rFrameFormat) { uno::Reference<text::XTextContent> const xRet( SwXTextEmbeddedObject::CreateXTextEmbeddedObject(*rFrameFormat.GetDoc(), &rFrameFormat)); return uno::makeAny(xRet); } - static inline bool filter(const SwNode* const pNode) { return pNode->IsOLENode(); }; + static bool filter(const SwNode* const pNode) { return pNode->IsOLENode(); }; }; template<FlyCntType T> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 0b3bbc279fd3..b661fa4b94b3 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -226,7 +226,7 @@ public: } // #i28701# - inline SwFormatWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos( + SwFormatWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos( const bool _bCreate = false ) { if ( _bCreate && !pWrapInfluenceOnObjPos ) @@ -237,7 +237,7 @@ public: } return pWrapInfluenceOnObjPos; } - inline void RemoveWrapInfluenceOnObjPos() + void RemoveWrapInfluenceOnObjPos() { DELETEZ(pWrapInfluenceOnObjPos); } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 9dd67560d91a..9d7d9a8d2220 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -295,17 +295,17 @@ public: inline HTMLTableCell *GetCell( sal_uInt16 nCell ) const; - inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; } - inline SvxAdjust GetAdjust() const { return eAdjust; } + void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; } + SvxAdjust GetAdjust() const { return eAdjust; } - inline void SetVertOri( sal_Int16 eV) { eVertOri = eV; } - inline sal_Int16 GetVertOri() const { return eVertOri; } + void SetVertOri( sal_Int16 eV) { eVertOri = eV; } + sal_Int16 GetVertOri() const { return eVertOri; } void SetBGBrush( SvxBrushItem *pBrush ) { pBGBrush = pBrush; } const SvxBrushItem *GetBGBrush() const { return pBGBrush; } - inline void SetEndOfGroup() { bIsEndOfGroup = true; } - inline bool IsEndOfGroup() const { return bIsEndOfGroup; } + void SetEndOfGroup() { bIsEndOfGroup = true; } + bool IsEndOfGroup() const { return bIsEndOfGroup; } void IncEmptyRows() { nEmptyRows++; } sal_uInt16 GetEmptyRows() const { return nEmptyRows; } @@ -341,14 +341,14 @@ public: inline void SetWidth( sal_uInt16 nWidth, bool bRelWidth); - inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; } - inline SvxAdjust GetAdjust() const { return eAdjust; } + void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; } + SvxAdjust GetAdjust() const { return eAdjust; } - inline void SetVertOri( sal_Int16 eV) { eVertOri = eV; } - inline sal_Int16 GetVertOri() const { return eVertOri; } + void SetVertOri( sal_Int16 eV) { eVertOri = eV; } + sal_Int16 GetVertOri() const { return eVertOri; } - inline void SetEndOfGroup() { bIsEndOfGroup = true; } - inline bool IsEndOfGroup() const { return bIsEndOfGroup; } + void SetEndOfGroup() { bIsEndOfGroup = true; } + bool IsEndOfGroup() const { return bIsEndOfGroup; } inline void SetFrameFormat( SwFrameFormat *pFormat, bool bBorderLine, sal_Int16 eVertOri ); @@ -576,7 +576,7 @@ public: sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0, sal_uInt16 nAbsRightSpace=0, sal_uInt16 nInhAbsSpace=0 ); - inline bool IsNewDoc() const { return m_pParser->IsNewDoc(); } + bool IsNewDoc() const { return m_pParser->IsNewDoc(); } void SetHasParentSection( bool bSet ) { m_bHasParentSection = bSet; } bool HasParentSection() const { return m_bHasParentSection; } diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index cb16c4c9ac33..0ebe99f026cf 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -286,12 +286,12 @@ public: inline void SetMargins( sal_uInt16 nLeft, sal_uInt16 nRight, short nIndent ); - inline bool IsLRSpaceChanged() const { return bLRSpaceChanged; } + bool IsLRSpaceChanged() const { return bLRSpaceChanged; } inline void GetMargins( sal_uInt16& nLeft, sal_uInt16& nRight, short &nIndent ) const; inline void SetULSpace( sal_uInt16 nUpper, sal_uInt16 nLower ); - inline bool IsULSpaceChanged() const { return bULSpaceChanged; } + bool IsULSpaceChanged() const { return bULSpaceChanged; } inline void GetULSpace( sal_uInt16& rUpper, sal_uInt16& rLower ) const; bool HasAttrs() const { return !aAttrs.empty(); } @@ -496,7 +496,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient // Attribute am Dok setzen void SetAttr_( bool bChkEnd, bool bBeforeTable, HTMLAttrs *pPostIts ); - inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false, + void SetAttr( bool bChkEnd = true, bool bBeforeTable = false, HTMLAttrs *pPostIts = nullptr ) { if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrames.empty() ) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 0eb40164873d..aa4f13a8fa12 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1889,7 +1889,7 @@ bool MSWordExportBase::GetAnnotationMarks( const SwTextNode& rNd, sal_Int32 nStt class CompareMarksEnd : public std::binary_function < const IMark *, const IMark *, bool > { public: - inline bool operator() ( const IMark * pOneB, const IMark * pTwoB ) const + bool operator() ( const IMark * pOneB, const IMark * pTwoB ) const { const sal_Int32 nOEnd = pOneB->GetMarkEnd().nContent.GetIndex(); const sal_Int32 nTEnd = pTwoB->GetMarkEnd().nContent.GetIndex(); diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 2bc8e106d7b8..f5dc04e26737 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -55,7 +55,7 @@ class SwXMLTableContext : public XMLTextTableContext struct ColumnWidthInfo { sal_uInt16 width; //!< Column width (absolute or relative). bool isRelative; //!< True for a relative width, false for absolute. - inline ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth), isRelative(isRel) {}; + ColumnWidthInfo(sal_uInt16 wdth, bool isRel) : width(wdth), isRelative(isRel) {}; }; std::vector<ColumnWidthInfo> m_aColumnWidths; std::vector<OUString> *m_pColumnDefaultCellStyleNames; diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index f9d1b18354fa..523a51cbce4b 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -68,7 +68,7 @@ public: virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; - inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } + void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } }; #endif diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 027edf34b75b..08d6583a7ad0 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -62,7 +62,7 @@ public: void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; - inline Printer* GetPrt() { return pPrinter; } + Printer* GetPrt() { return pPrinter; } }; #endif diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 153524ae9445..2c720b2c8bdf 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -77,8 +77,8 @@ public: void SetToBusinessCard(); void InitDatabaseBox(); - inline void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; } - inline SwDBManager* GetDBManager() const { return pDBManager; } + void SetDBManager(SwDBManager* pDBManager_) { pDBManager = pDBManager_; } + SwDBManager* GetDBManager() const { return pDBManager; } }; class SwOneExampleFrame; diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index a7e665b428b1..548cd5d6b091 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -63,7 +63,7 @@ protected: void SavePos( const ListBox* pLst1); void RestorePos( ListBox* pLst1 ); void EnableInsert(bool bEnable); - inline bool IsFieldEdit() const { return m_bFieldEdit; } + bool IsFieldEdit() const { return m_bFieldEdit; } // insert field void InsertField( sal_uInt16 nTypeId, @@ -84,7 +84,7 @@ public: virtual void ActivatePage() override; - inline SwFieldMgr& GetFieldMgr() { return m_aMgr; } + SwFieldMgr& GetFieldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); void EditNewField( bool bOnlyActivate = false ); virtual sal_uInt16 GetGroup() = 0; diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index 55fecd467c78..cc15504ee8df 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -48,7 +48,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition const Color& aColorAnchor ); static void DestroyAnchorOverlayObject( AnchorOverlayObject* pAnchor ); - inline const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; } + const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; } const basegfx::B2DPoint& GetThirdPosition() const { return maThirdPosition; } const basegfx::B2DPoint& GetFourthPosition() const { return maFourthPosition; } const basegfx::B2DPoint& GetFifthPosition() const { return maFifthPosition; } @@ -71,12 +71,12 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void SetSeventhPosition( const basegfx::B2DPoint& rNew ); void setLineSolid( const bool bNew ); - inline bool getLineSolid() const { return mbLineSolid; } + bool getLineSolid() const { return mbLineSolid; } - inline void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; }; + void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; }; void SetAnchorState( const AnchorState aState ); - inline AnchorState GetAnchorState() const { return mAnchorState; } + AnchorState GetAnchorState() const { return mAnchorState; } protected: /* 6------------7 diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index 1d797c946b50..941980bceb59 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -52,7 +52,7 @@ namespace sw virtual ~OverlayRanges() override; // data read access - inline const std::vector< basegfx::B2DRange >& getRanges() const + const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index fb796b9b9e81..d8a55e92304c 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -50,7 +50,7 @@ private: public: void SetShadowState(ShadowState aState); - inline ShadowState GetShadowState() {return mShadowState;} + ShadowState GetShadowState() {return mShadowState;} void SetPosition( const basegfx::B2DPoint& rPoint1, const basegfx::B2DPoint& rPoint2 ); diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 52133ede7095..04bb8407a511 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -56,9 +56,9 @@ protected: SwWrtShell& GetShell(); SwWrtShell* GetShellPtr(); - inline SwView& GetView() { return rView; } - inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } + SwView& GetView() { return rView; } + void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } + bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } DECL_LINK( InsertDBTextHdl, void*, void ); diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx index b1fa6fdfc789..8b03143ffbbf 100644 --- a/sw/source/uibase/inc/caption.hxx +++ b/sw/source/uibase/inc/caption.hxx @@ -47,43 +47,43 @@ public: InsCaptionOpt(const InsCaptionOpt&); ~InsCaptionOpt(); - inline bool& UseCaption() { return bUseCaption; } - inline bool UseCaption() const { return bUseCaption; } + bool& UseCaption() { return bUseCaption; } + bool UseCaption() const { return bUseCaption; } - inline SwCapObjType GetObjType() const { return eObjType; } + SwCapObjType GetObjType() const { return eObjType; } - inline const SvGlobalName& GetOleId() const { return aOleId; } + const SvGlobalName& GetOleId() const { return aOleId; } - inline const OUString& GetCategory() const { return sCategory; } - inline void SetCategory(const OUString& rCat) { sCategory = rCat; } + const OUString& GetCategory() const { return sCategory; } + void SetCategory(const OUString& rCat) { sCategory = rCat; } - inline sal_uInt16 GetNumType() const { return nNumType; } - inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } + sal_uInt16 GetNumType() const { return nNumType; } + void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } const OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;} - inline const OUString& GetCaption() const { return sCaption; } - inline void SetCaption(const OUString& rCap) { sCaption = rCap; } + const OUString& GetCaption() const { return sCaption; } + void SetCaption(const OUString& rCap) { sCaption = rCap; } - inline sal_uInt16 GetPos() const { return nPos; } - inline void SetPos(const sal_uInt16 nP) { nPos = nP; } + sal_uInt16 GetPos() const { return nPos; } + void SetPos(const sal_uInt16 nP) { nPos = nP; } - inline sal_uInt16 GetLevel() const { return nLevel; } - inline void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } + sal_uInt16 GetLevel() const { return nLevel; } + void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } - inline const OUString& GetSeparator() const { return sSeparator; } - inline void SetSeparator(const OUString& rSep) { sSeparator = rSep; } + const OUString& GetSeparator() const { return sSeparator; } + void SetSeparator(const OUString& rSep) { sSeparator = rSep; } const OUString& GetCharacterStyle() const { return sCharacterStyle; } void SetCharacterStyle(const OUString& rStyle) { sCharacterStyle = rStyle; } - inline bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } - inline bool& CopyAttributes() { return bCopyAttributes; } - inline bool CopyAttributes() const { return bCopyAttributes; } + bool& CopyAttributes() { return bCopyAttributes; } + bool CopyAttributes() const { return bCopyAttributes; } InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); }; diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index 7f0b46e4f13e..0ff0823950b8 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -38,8 +38,8 @@ protected: public: virtual bool ReInitDlg(SwDocShell *pDocSh); - inline SwDocShell* GetOldDocShell() { return m_pDocSh; } - inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } + SwDocShell* GetOldDocShell() { return m_pDocSh; } + void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } }; #endif diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index 9ba4450c4a30..b369700115ec 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -46,8 +46,8 @@ public: void SetDrawPointer(); void EnterSelectMode(const MouseEvent& rMEvt); - inline bool IsInsertForm() const { return m_bInsForm; } - inline bool IsCreateObj() const { return m_bCreateObj; } + bool IsInsertForm() const { return m_bInsForm; } + bool IsCreateObj() const { return m_bCreateObj; } // mouse- & key events; return value=true: event was edited virtual bool KeyInput(const KeyEvent& rKEvt); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 7c666ba77ef6..1a965f07c494 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -225,8 +225,8 @@ public: void SetObjectSelect( bool bVal ) { m_bObjectSelect = bVal; } bool IsObjectSelect() const { return m_bObjectSelect; } - inline SdrObjKind GetSdrDrawMode() const { return m_eDrawMode; } - inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } + SdrObjKind GetSdrDrawMode() const { return m_eDrawMode; } + void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } void StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect ); bool IsFrameAction() const { return m_bInsFrame; } @@ -262,8 +262,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - static inline long GetDDStartPosX() { return m_nDDStartPosX; } - static inline long GetDDStartPosY() { return m_nDDStartPosY; } + static long GetDDStartPosX() { return m_nDDStartPosX; } + static long GetDDStartPosY() { return m_nDDStartPosY; } static void InitStaticData(); static void FinitStaticData(); diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 55c549060542..f1101153f537 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -118,8 +118,8 @@ public: void DelAttr(sal_uInt16 nId); // reach out the set - inline const SfxItemSet &GetAttrSet() const { return m_aSet; } - inline SfxItemSet &GetAttrSet() { return m_aSet; } + const SfxItemSet &GetAttrSet() const { return m_aSet; } + SfxItemSet &GetAttrSet() { return m_aSet; } void SetAttrSet(const SfxItemSet& rSet); inline const SwFormatVertOrient &GetVertOrient() const; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 6563bb362b7d..fe4a3a1d397d 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -197,7 +197,7 @@ public: void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } void SetFormatUsed(bool bFormat); void SetFrameType(const OUString &rType) { m_sDlgType = rType; } - inline bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } + bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 8dfe82451a7e..349fba6c2697 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -126,7 +126,7 @@ public: virtual ~SwMailMergeDlg() override; virtual void dispose() override; - inline DBManagerOptions GetMergeType() { return nMergeType; } + DBManagerOptions GetMergeType() { return nMergeType; } bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); } bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); } diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 68e242338413..27cdbc190f66 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -52,14 +52,14 @@ public: void Clear(); - inline void SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; } + void SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; } void SetFormatType(const short nFormatType); - inline short GetFormatType() const { return nCurrFormatType; } + short GetFormatType() const { return nCurrFormatType; } void SetDefFormat(const sal_uLong nDefFormat); sal_uLong GetFormat() const; - inline LanguageType GetCurLanguage() const { return eCurLanguage;} + LanguageType GetCurLanguage() const { return eCurLanguage;} void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;} void SetAutomaticLanguage(bool bSet){bUseAutomaticLanguage = bSet;} diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index a4022db8df4b..aaf35150498e 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -303,8 +303,8 @@ public: SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); virtual ~SwMarkPreview() override; - inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } + void SetColor(const Color& rCol) { m_aMarkCol = rCol; } + void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } virtual Size GetOptimalSize() const override; }; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 80edefd8dec0..0c3445ff4631 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -232,9 +232,9 @@ private: static void InitInterface_Impl(); public: - inline SwViewShell* GetViewShell() const + SwViewShell* GetViewShell() const { return m_pViewWin->GetViewShell(); } - inline void RepaintCoreRect( const SwRect& rRect ) + void RepaintCoreRect( const SwRect& rRect ) { m_pViewWin->RepaintCoreRect( rRect ); } void DocSzChgd(const Size& rNewSize); @@ -271,12 +271,12 @@ public: // Inline method to request values of new members // <mbResetFormDesignMode> and <mbFormDesignModeToReset> - inline bool ResetFormDesignMode() const + bool ResetFormDesignMode() const { return mbResetFormDesignMode; } - inline bool FormDesignModeToReset() const + bool FormDesignModeToReset() const { return mbFormDesignModeToReset; } diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 3328920b8b58..08104b33f0dd 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -51,7 +51,7 @@ struct SwRedlineDataParent SvTreeListEntry* pTLBParent; // corresponding TreeListBox entry OUString sComment; // redline comment - inline bool operator< ( const SwRedlineDataParent& rObj ) const + bool operator< ( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; @@ -123,8 +123,8 @@ public: DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); - inline SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } - inline bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } + SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } + bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } void Init(SwRedlineTable::size_type nStart = 0); void CallAcceptReject( bool bSelect, bool bAccept ); diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index e26e5764667b..c47056c6eb9a 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -164,9 +164,9 @@ public: SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); - inline SfxRequest* GetRequest() const { return m_pRequest; } - inline sal_Int16 GetParam() const { return m_nParam; } - inline void SetParam( sal_Int16 nParam ) { m_nParam = nParam; } + SfxRequest* GetRequest() const { return m_pRequest; } + sal_Int16 GetParam() const { return m_nParam; } + void SetParam( sal_Int16 nParam ) { m_nParam = nParam; } }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 254a9a6dc58d..00e26825b38a 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -103,9 +103,9 @@ public: virtual void Reset(const SfxItemSet *rSet) override; static const sal_uInt16* GetRanges() { return m_aWrapPageRg; } - inline void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } - inline void SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; } - inline void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; } + void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } + void SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; } + void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; } }; #endif diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index a58fa570de36..7399043f27b6 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -42,13 +42,13 @@ class ShellMoveCursor SwWrtShell* pSh; bool bAct; public: - inline ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel ) + ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel ) { bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrameType(nullptr,false) & FrameTypeFlags::FLY_ANY); ( pSh = pWrtSh )->MoveCursor( bSel ); pWrtSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_HYPERLINK_GETLINK); } - inline ~ShellMoveCursor() + ~ShellMoveCursor() { if( bAct ) { |