[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/basflt/fltshell.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ce6208a7d2f12fb5bf664d4c1ff1481c4f5c65bd
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 9 21:14:51 2015 +0100

    sw: RES_FLTR_RDFMARK always implies SwFltRDFMark
    
    Change-Id: Ic437cdbc6a21e84a0fa8f4ff68bc5d1202c9da7e

diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 6c37888..c80eab7 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -372,7 +372,11 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos,
                 {
                     bF = true;
                 }
-                else if ((nAttrId == RES_FLTR_ANNOTATIONMARK || nAttrId == RES_FLTR_RDFMARK) && nHand == static_cast<CntUInt16Item*>(rEntry.pAttr)->GetValue())
+                else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == static_cast<CntUInt16Item*>(rEntry.pAttr)->GetValue())
+                {
+                    bF = true;
+                }
+                else if (nAttrId == RES_FLTR_RDFMARK && nHand == static_cast<SwFltRDFMark*>(rEntry.pAttr)->GetHandle())
                 {
                     bF = true;
                 }