diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-29 10:59:30 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-26 09:51:26 +0000 |
| commit | ba86e97a55e2d6f8716681fb626a8dc3d691aa84 (patch) | |
| tree | fa389bfc455de3c1d093674214e65f77b1964ce2 | |
| parent | 17c61cc64278c006b06f8b152d79073c0ef16993 (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>
Reviewed-on: https://gerrit.libreoffice.org/24367
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -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 c2562280aba2..9426aefe1717 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -606,7 +606,8 @@ void SwTextNode::RstTextAttr( for (i = 0; i < m_pSwpHints->Count(); ++i) { SwTextAttr* pHint = m_pSwpHints->GetTextHint(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(); |