diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-20 18:00:27 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-07 13:08:56 +0100 |
| commit | ad7e544106a54f4f93555bd092e9b0aeb18cd56b (patch) | |
| tree | 813d7cb6ee1dfab961dde6baac85c7ea7cd6d844 | |
| parent | 91be5b7c91fa92011cdd4276f9fa4d7d0f57249e (diff) | |
sw_redlinehide_4a: adapt SwEditShell::GetPaMParAttr()
Change-Id: I97a2081a142fd1f74a5d6be534f094fdc4db45ab
(cherry picked from commit a382ecb5689ee425e77f830fd81b8696dc90a68b)
| -rw-r--r-- | sw/source/core/edit/edattr.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 4f3e26de89b5..53712252e315 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -216,10 +216,16 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const // get the node SwNode* pNd = GetDoc()->GetNodes()[ n ]; + if (GetLayout()->IsHideRedlines() + && pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden) + { + continue; + } + if( pNd->IsTextNode() ) { // get the node (paragraph) attributes - static_cast<SwContentNode*>(pNd)->GetAttr(*pSet); + sw::GetAttrMerged(*pSet, *pNd->GetTextNode(), GetLayout()); if( pSet != &rSet && aSet.Count() ) { |