diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-29 10:59:30 +0200 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-29 11:39:46 +0000 |
| commit | 07aa86973f4c312eac92e0d4b32b607f5f991ddb (patch) | |
| tree | e3dead9c5d41e6964fa7309035ce0dff5448c7fe | |
| parent | d1904070e749d38d7af6323d6dcb3c3c156a3853 (diff) | |
tdf#94449: special text attributes are not removed with paragraph style
commit 3c0805e1f4f4d14e92c7e655d59c87de5c207e48 introduced removal of
all character attributes applied to the complete paragraph if a paragraph
style was applied. This should not remove special attributes like index
entries, reference marks etc.
Change-Id: I6fe92066269da2cf10c871ca319faf6fda91f4be
Reviewed-on: https://gerrit.libreoffice.org/23591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index d96423cccf08..aea49647eb09 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -605,7 +605,8 @@ void SwTextNode::RstTextAttr( for (i = 0; i < m_pSwpHints->Count(); ++i) { SwTextAttr* pHint = m_pSwpHints->Get(i); - if (pHint->GetStart() != nStt) + if ( (isTXTATR_WITHEND(pHint->Which()) && RES_TXTATR_AUTOFMT != pHint->Which()) + || pHint->GetStart() != nStt) continue; const sal_Int32* pHintEnd = pHint->GetEnd(); |