diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-04-27 18:40:09 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-05-11 16:58:54 +0200 |
| commit | bb7700d844152c7ba219ee7cfeee39ef1f6ca8d8 (patch) | |
| tree | 51e15cd08f589f9c832998567dbf13fe48d19204 | |
| parent | 37c21f3cc49e262d20bbc592dbbeefcd9ba1597d (diff) | |
sw: cosmetics
Change-Id: Ieed3c8251ab61d7c47314137f5f67cb736b1b158
| -rw-r--r-- | sw/source/core/doc/docedt.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 4c0b7e885148..a139293fec7c 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -348,7 +348,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) if( bJoinPrev ) { // We do not need to handle xmlids in this case, because - // it is only invoked if one paragraph is completely empty + // it is only invoked if one paragraph is/becomes completely empty // (see sw_GetJoinFlags) { // If PageBreaks are deleted/set, it must not be added to the Undo history! @@ -360,8 +360,9 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) // PageDesc, etc. we also have to change SwUndoDelete. // There, we copy the AUTO PageBreak from the GetMarkNode! - /* The GetMarkNode */ - if( ( pTextNd = aIdx.GetNode().GetTextNode())->HasSwAttrSet() ) + /* The MarkNode */ + pTextNd = aIdx.GetNode().GetTextNode(); + if (pTextNd->HasSwAttrSet()) { const SfxPoolItem* pItem; if( SfxItemState::SET == pTextNd->GetpSwAttrSet()->GetItemState( |