summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-29 10:59:30 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-14 13:54:07 +0000
commitaf103f2c0425777afcb616bd1a2c582cfd256b25 (patch)
tree15c5878d481fa200318a5e328a09e5d81ed50dd1
parentc9d5d68a2617f54f38222fc147183d91017b3b99 (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> (cherry picked from commit 07aa86973f4c312eac92e0d4b32b607f5f991ddb) Reviewed-on: https://gerrit.libreoffice.org/24087 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.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 5064e0081de9..01e55e4f6901 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->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();