summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-12-09 21:14:51 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-12-09 21:34:47 +0100
commitce6208a7d2f12fb5bf664d4c1ff1481c4f5c65bd (patch)
tree84186970d3076fda67a17740bfe9b90a81cd7ffc /sw/source
parentcfecdd6199710921f8fd921f615203c9e34c551e (diff)
sw: RES_FLTR_RDFMARK always implies SwFltRDFMark
Change-Id: Ic437cdbc6a21e84a0fa8f4ff68bc5d1202c9da7e
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/basflt/fltshell.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 6c378882f4e3..c80eab7701d0 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;
}