sw/inc/node.hxx | 78 ++++++++++++++------------------------------------------
1 file changed, 20 insertions(+), 58 deletions(-)
New commits:
commit 429d26a7386413ebccdedf72f9ac0115b1b6db1b
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Jun 29 12:03:33 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jun 29 12:21:28 2023 +0200
Simplify a bit
Change-Id: Ia1c142d9841075f307fba69f79999697992a5c5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153735
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a6a7dc603a27..84e466dfefa0 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -184,15 +184,15 @@ public:
inline SwSectionNode *GetSectionNode();
inline const SwSectionNode *GetSectionNode() const;
- inline bool IsStartNode() const;
- inline bool IsContentNode() const;
- inline bool IsEndNode() const;
- inline bool IsTextNode() const;
- inline bool IsTableNode() const;
- inline bool IsSectionNode() const;
- inline bool IsOLENode() const;
- inline bool IsNoTextNode() const;
- inline bool IsGrfNode() const;
+ bool IsStartNode() const { return bool(SwNodeType::Start & m_nNodeType); }
+ bool IsContentNode() const { return bool(SwNodeType::ContentMask &
m_nNodeType); }
+ bool IsEndNode() const { return SwNodeType::End == m_nNodeType; }
+ bool IsTextNode() const { return SwNodeType::Text == m_nNodeType; }
+ bool IsTableNode() const { return SwNodeType::Table == m_nNodeType; }
+ bool IsSectionNode() const { return SwNodeType::Section == m_nNodeType; }
+ bool IsOLENode() const { return SwNodeType::Ole == m_nNodeType; }
+ bool IsNoTextNode() const { return bool(SwNodeType::NoTextMask &
m_nNodeType); }
+ bool IsGrfNode() const { return SwNodeType::Grf == m_nNodeType; }
/**
Checks if this node is in redlines.
@@ -633,80 +633,43 @@ private:
inline SwEndNode *SwNode::GetEndNode()
{
- return SwNodeType::End == m_nNodeType ? static_cast<SwEndNode*>(this) :
nullptr;
+ return IsEndNode() ? static_cast<SwEndNode*>(this) : nullptr;
}
inline const SwEndNode *SwNode::GetEndNode() const
{
- return SwNodeType::End == m_nNodeType ? static_cast<const
SwEndNode*>(this) : nullptr;
+ return IsEndNode() ? static_cast<const SwEndNode*>(this) : nullptr;
}
inline SwStartNode *SwNode::GetStartNode()
{
- return SwNodeType::Start & m_nNodeType ? static_cast<SwStartNode*>(this)
: nullptr;
+ return IsStartNode() ? static_cast<SwStartNode*>(this) : nullptr;
}
inline const SwStartNode *SwNode::GetStartNode() const
{
- return SwNodeType::Start & m_nNodeType ? static_cast<const
SwStartNode*>(this) : nullptr;
+ return IsStartNode() ? static_cast<const SwStartNode*>(this) : nullptr;
}
inline SwTableNode *SwNode::GetTableNode()
{
- return SwNodeType::Table == m_nNodeType ? static_cast<SwTableNode*>(this)
: nullptr;
+ return IsTableNode() ? static_cast<SwTableNode*>(this) : nullptr;
}
inline const SwTableNode *SwNode::GetTableNode() const
{
- return SwNodeType::Table == m_nNodeType ? static_cast<const
SwTableNode*>(this) : nullptr;
+ return IsTableNode() ? static_cast<const SwTableNode*>(this) : nullptr;
}
inline SwSectionNode *SwNode::GetSectionNode()
{
- return SwNodeType::Section == m_nNodeType ?
static_cast<SwSectionNode*>(this) : nullptr;
+ return IsSectionNode() ? static_cast<SwSectionNode*>(this) : nullptr;
}
inline const SwSectionNode *SwNode::GetSectionNode() const
{
- return SwNodeType::Section == m_nNodeType ? static_cast<const
SwSectionNode*>(this) : nullptr;
+ return IsSectionNode() ? static_cast<const SwSectionNode*>(this) :
nullptr;
}
inline SwContentNode *SwNode::GetContentNode()
{
- return SwNodeType::ContentMask & m_nNodeType ?
static_cast<SwContentNode*>(this) : nullptr;
+ return IsContentNode() ? static_cast<SwContentNode*>(this) : nullptr;
}
inline const SwContentNode *SwNode::GetContentNode() const
{
- return SwNodeType::ContentMask & m_nNodeType ? static_cast<const
SwContentNode*>(this) : nullptr;
-}
-
-inline bool SwNode::IsStartNode() const
-{
- return bool(SwNodeType::Start & m_nNodeType);
-}
-inline bool SwNode::IsContentNode() const
-{
- return bool(SwNodeType::ContentMask & m_nNodeType);
-}
-inline bool SwNode::IsEndNode() const
-{
- return SwNodeType::End == m_nNodeType;
-}
-inline bool SwNode::IsTextNode() const
-{
- return SwNodeType::Text == m_nNodeType;
-}
-inline bool SwNode::IsTableNode() const
-{
- return SwNodeType::Table == m_nNodeType;
-}
-inline bool SwNode::IsSectionNode() const
-{
- return SwNodeType::Section == m_nNodeType;
-}
-inline bool SwNode::IsNoTextNode() const
-{
- return bool(SwNodeType::NoTextMask & m_nNodeType);
-}
-inline bool SwNode::IsOLENode() const
-{
- return SwNodeType::Ole == m_nNodeType;
-}
-inline bool SwNode::IsGrfNode() const
-{
- return SwNodeType::Grf == m_nNodeType;
+ return IsContentNode() ? static_cast<const SwContentNode*>(this) :
nullptr;
}
inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp )
const
@@ -727,8 +690,7 @@ inline SwNodeOffset SwNode::StartOfSectionIndex() const
}
inline SwNodeOffset SwNode::EndOfSectionIndex() const
{
- const SwStartNode* pStNd = IsStartNode() ? static_cast<const
SwStartNode*>(this) : m_pStartOfSection;
- return pStNd->m_pEndOfSection->GetIndex();
+ return EndOfSectionNode()->GetIndex();
}
inline const SwEndNode* SwNode::EndOfSectionNode() const
{
