[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-6' - sw/source

[Oliver Specht]

 sw/source/core/txtnode/txtedt.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7cb9bf3b9bd858c0dcaff49894b84d667abc65cf
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Tue Mar 29 10:59:30 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/24367
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit ba86e97a55e2d6f8716681fb626a8dc3d691aa84)
    Reviewed-on: https://gerrit.libreoffice.org/24394
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index c256228..9426aef 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();