diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-19 12:47:59 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-30 12:38:20 +0100 |
| commit | 7a1a220af0624844d256d80f782974bcfae63849 (patch) | |
| tree | feb4981ecae2966eaebd4c982358001016cb5d7c | |
| parent | 58e226a1ea94228dd7830f5c93cfbbe04a029918 (diff) | |
sw_redlinehide_4a: ignore hidden nodes in SwEditShell::GetPaMAttr()
MergeValues would set everything to invalid.
Change-Id: I45795fe9bd113399e276ac42851cbf5a198c9694
| -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 65da45aca713..2171a4230115 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -159,7 +159,13 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet, if( pNd ) { if( pSet != &rSet ) - rSet.MergeValues( aSet ); + { + if (!GetLayout()->IsHideRedlines() + || pNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden) + { + rSet.MergeValues( aSet ); + } + } if( aSet.Count() ) aSet.ClearItem(); |