diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-08 09:09:23 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-08 10:07:41 +0100 |
| commit | 329e762db21f5f1250baf207da1b7b5b7477b4b0 (patch) | |
| tree | 181edccdd3e87b2aa39638279902966e748e2144 /sw/source/filter | |
| parent | b0e427d8aac1a54681a2a6d0acbd1b54394961b9 (diff) | |
sw: add RES_FLTR_RDFMARK
This is similar to RES_FLTR_ANNOTATIONMARK, except that it'll be used
for WW8 import's smart tag bookmark needs.
First just add code so that WW8 import can put this this attribute on
the import stack, the actual handling of the attribute has to be
implemented later.
Change-Id: I92e3fac02496e3f5e7a6ea27f0da91dcd47769cc
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index becc8ad52e5e..97ebd672793e 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -354,7 +354,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, } else if (nAttrId == rEntry.pAttr->Which()) { - if( nAttrId != RES_FLTR_BOOKMARK && nAttrId != RES_FLTR_ANNOTATIONMARK ) + if( nAttrId != RES_FLTR_BOOKMARK && nAttrId != RES_FLTR_ANNOTATIONMARK && nAttrId != RES_FLTR_RDFMARK ) { // query handle bF = true; @@ -363,7 +363,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, { bF = true; } - else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == static_cast<CntUInt16Item*>(rEntry.pAttr)->GetValue()) + else if ((nAttrId == RES_FLTR_ANNOTATIONMARK || nAttrId == RES_FLTR_RDFMARK) && nHand == static_cast<CntUInt16Item*>(rEntry.pAttr)->GetValue()) { bF = true; } @@ -610,6 +610,16 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SAL_WARN("sw", "failed to make book region or point"); } break; + case RES_FLTR_RDFMARK: + { + if (MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true)) + { + // TODO handle RDF mark + } + else + SAL_WARN("sw", "failed to make book region or point"); + } + break; case RES_FLTR_TOX: { MakePoint(rEntry, pDoc, aRegion); |