summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-29 10:59:30 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-04-26 18:56:33 +0000
commit7cb9bf3b9bd858c0dcaff49894b84d667abc65cf (patch)
tree4f212d5e4a352ba4a7906b39add9e4a67823ca76
parentdc5d3edc893ad3fcd555f28c0b1eaed3607df810 (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> (cherry picked from commit ba86e97a55e2d6f8716681fb626a8dc3d691aa84) Reviewed-on: https://gerrit.libreoffice.org/24394 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sw/source/core/txtnode/txtedt.cxx3
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();