diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-19 12:47:59 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-07 10:32:27 +0100 |
| commit | 95ed9879737c850e8608a1a33f02ea594cbf7a78 (patch) | |
| tree | 92b7379ea05b07ac101c78261d3bf80c6ea311dc | |
| parent | 1957cfc2b4e14dba1274b062a85859f0ffd3a13a (diff) | |
sw_redlinehide_4a: ignore hidden nodes in SwEditShell::GetPaMAttr()
MergeValues would set everything to invalid.
Change-Id: I45795fe9bd113399e276ac42851cbf5a198c9694
(cherry picked from commit 2ad1767c58a46266401c07d4dd4625f1fc816ac2)
| -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(); |