diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-01-08 12:01:11 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-01-08 13:29:12 +0100 |
| commit | 519796c7bafdad4d8de3b59a0b8dedde91a8a0dc (patch) | |
| tree | 5b588763f8f3422ce4bc67b1d6b7b28cc873fdda /sw/source/filter/ww1/fltshell.cxx | |
| parent | 6ac8551e8135628597c195aa6ae3d51c9784e6fb (diff) | |
i#93570 DOC import: handle commented text ranges via RES_FLTR_ANNOTATIONMARK
backport from master:
271722d923610d128a358528e64d7233641ea0dc
677fdd4fa235466649911042577bc4980d42deb6
0ec0ec267986644084baaa5bda5ba917dc5744df
Diffstat (limited to 'sw/source/filter/ww1/fltshell.cxx')
| -rw-r--r-- | sw/source/filter/ww1/fltshell.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 5eca85e2b888..6fd4c3d434ca 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -30,6 +30,7 @@ #include <editeng/contouritem.hxx> #include <editeng/postitem.hxx> #include <editeng/crossedoutitem.hxx> +#include <svl/cintitem.hxx> #include <svl/stritem.hxx> #include <unotools/charclass.hxx> #include <txtftn.hxx> @@ -342,12 +343,16 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, } else if (nAttrId == rEntry.pAttr->Which()) { - if( nAttrId != RES_FLTR_BOOKMARK ) + if( nAttrId != RES_FLTR_BOOKMARK && nAttrId != RES_FLTR_ANNOTATIONMARK ) { // query handle bF = true; } - else if (nHand == ((SwFltBookmark*)(rEntry.pAttr))->GetHandle()) + else if (nAttrId == RES_FLTR_BOOKMARK && nHand == static_cast<SwFltBookmark*>(rEntry.pAttr)->GetHandle()) + { + bF = true; + } + else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == static_cast<CntUInt16Item*>(rEntry.pAttr)->GetValue()) { bF = true; } @@ -582,6 +587,12 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, } } break; + case RES_FLTR_ANNOTATIONMARK: + { + MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true); + pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion, OUString()); + } + break; case RES_FLTR_TOX: { MakePoint(rEntry, pDoc, aRegion); |