sw/inc/swtable.hxx | 2 +- sw/source/core/access/accfrmobj.cxx | 7 ------- sw/source/core/access/accfrmobj.hxx | 7 ++++++- sw/source/core/table/swtable.cxx | 5 ----- 4 files changed, 7 insertions(+), 14 deletions(-)
New commits: commit 336a265711cc5e391a8675d8f34316fd788651d1 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sun Aug 21 19:53:28 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sun Aug 21 22:22:14 2022 +0200 tdf#112865 inline a couple of hot methods Change-Id: I5db8b5717380a6a8fab50a6cbdd019e365be64af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138642 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 8099077b91f3..7502f0605778 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -511,7 +511,7 @@ public: void SetSaveUserColor(std::optional<Color> p ) { mxUserColor = p; } void SetSaveNumFormatColor( std::optional<Color> p ) { mxNumFormatColor = p; } - sal_Int32 getRowSpan() const; + sal_Int32 getRowSpan() const { return mnRowSpan; } void setRowSpan( sal_Int32 nNewRowSpan ); bool getDummyFlag() const; void setDummyFlag( bool bDummy ); diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index c09c0215e3db..f78dc2d155db 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -185,13 +185,6 @@ SwAccessibleChild& SwAccessibleChild::operator=( vcl::Window* pWindow ) return *this; } -bool SwAccessibleChild::operator==( const SwAccessibleChild& r ) const -{ - return mpFrame == r.mpFrame && - mpDrawObj == r.mpDrawObj && - mpWindow == r.mpWindow; -} - bool SwAccessibleChild::IsValid() const { return mpFrame != nullptr || diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index cb5fdfb7b839..5e2cc36f87b3 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -51,7 +51,12 @@ class SwAccessibleChild SwAccessibleChild& operator=( const SwFrame* pFrame ); SwAccessibleChild& operator=( vcl::Window* pWindow ); - bool operator==( const SwAccessibleChild& r ) const; + bool operator==( const SwAccessibleChild& r ) const + { + return mpFrame == r.mpFrame && + mpDrawObj == r.mpDrawObj && + mpWindow == r.mpWindow; + } bool IsValid() const; diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 3e250e72a7bf..093330ef9fee 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -74,11 +74,6 @@ using namespace com::sun::star; static void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const Color* pCol, bool bChgAlign, SwNodeOffset nNdPos ); -sal_Int32 SwTableBox::getRowSpan() const -{ - return mnRowSpan; -} - void SwTableBox::setRowSpan( sal_Int32 nNewRowSpan ) { mnRowSpan = nNewRowSpan;