summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-05-18 14:49:39 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-06-08 21:51:29 +0200
commitd2c4a3051317aeb69449ea3024ba4d3da5aab0d4 (patch)
tree7a81d2d39abb4d4ce502434573e754e4e761ec99 /sw
parente297c60196fe0b5682877ec53080888140867654 (diff)
sw_redlinehide: trivial node conversions in headers
Change-Id: I74607928dbc8e07df0bba8f3179797735f37a92a
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/inftxt.hxx3
-rw-r--r--sw/source/core/text/itrform2.hxx2
-rw-r--r--sw/source/core/text/itrpaint.hxx2
3 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index c0bf6f7aa46c..40bf57ebcebb 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -776,7 +776,8 @@ inline TextFrameIndex SwTextFormatInfo::GetReformatStart() const
inline const SwAttrSet& SwTextFormatInfo::GetCharAttr() const
{
- return GetTextFrame()->GetTextNode()->GetSwAttrSet();
+ // sw_redlinehide: this is used for numbering/footnote number portions, so:
+ return GetTextFrame()->GetTextNodeForParaProps()->GetSwAttrSet();
}
inline void SwTextFormatInfo::SetParaFootnote()
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 8071c42455c9..bf9a6c8af749 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -152,7 +152,7 @@ public:
void CtorInitTextFormatter( SwTextFrame *pFrame, SwTextFormatInfo *pInf );
SwTextFormatter(SwTextFrame *pTextFrame, SwTextFormatInfo *pTextFormatInf)
- : SwTextPainter(pTextFrame->GetTextNode())
+ : SwTextPainter(pTextFrame->GetTextNodeFirst())
, bUnclipped(false)
{
CtorInitTextFormatter( pTextFrame, pTextFormatInf );
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index b9d3f03e974b..aa8807af1b0c 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -40,7 +40,7 @@ protected:
public:
SwTextPainter(SwTextFrame *pTextFrame, SwTextPaintInfo *pTextPaintInf)
- : SwTextCursor(pTextFrame->GetTextNode())
+ : SwTextCursor(pTextFrame->GetTextNodeFirst())
{
CtorInitTextPainter( pTextFrame, pTextPaintInf );
}