summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-05-29 13:07:32 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-06-08 21:51:33 +0200
commit5ab626004e6ed1f8eff9c9b5ebf4f17ef0203c00 (patch)
treed6c5a714dd6b47cac21096e67d0fb93579b6f4cc
parent991ba70cbe6ff8d6c4a3a0e05181a63824827789 (diff)
sw_redlinehide: add some checks in places that require the node
... that contains the first text of the frame. Change-Id: I8efc1acd87a7fcb9e4e38925f1ba91ec1a004dfd
-rw-r--r--sw/source/core/doc/docnum.cxx5
-rw-r--r--sw/source/core/text/itratr.cxx4
-rw-r--r--sw/source/core/text/txtdrop.cxx4
3 files changed, 10 insertions, 3 deletions
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index d38e0955d520..e61ae5bfdcbb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1114,8 +1114,11 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
SwTextNode* pTNd = *aTextNodeIter;
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pTNd);
for(SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next() )
- if( pFrame->HasAnimation() )
+ if (pFrame->HasAnimation() &&
+ (!pFrame->GetMergedPara() || pFrame->GetMergedPara()->pParaPropsNode == pTNd))
+ {
pFrame->StopAnimation( pOut );
+ }
}
}
}
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 64e8f3518e74..d1f77e062ee9 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -1394,7 +1394,9 @@ SwTwips SwTextNode::GetWidthOfLeadingTabs() const
for( SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next() )
{
// Only consider master frames:
- if ( !pFrame->IsFollow() )
+ if (!pFrame->IsFollow() &&
+ // sw_redlinehide: paraPropsNode has the first text of the frame
+ (!pFrame->GetMergedPara() || pFrame->GetMergedPara()->pParaPropsNode == this))
{
SwRectFnSet aRectFnSet(pFrame);
SwRect aRect;
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index b4a1b88c0a6d..317eb084a4c1 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -250,7 +250,9 @@ bool SwTextNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDesce
for( SwTextFrame* pLastFrame = aIter.First(); pLastFrame; pLastFrame = aIter.Next() )
{
// Only (master-) text frames can have a drop cap.
- if ( !pLastFrame->IsFollow() )
+ if (!pLastFrame->IsFollow() &&
+ // sw_redlinehide: paraPropsNode has the first text of the frame
+ (!pLastFrame->GetMergedPara() || pLastFrame->GetMergedPara()->pParaPropsNode == this))
{
if( !pLastFrame->HasPara() )