summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-07-29 09:08:00 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-08-18 09:24:38 +0000
commit3c6cdfe08420eefaa97d957c3908daf76b14e684 (patch)
tree98a6c5e5c826a0bb890c1f88d34c5340da57c7b4
parentc7498f49e981e91ae45da12bbc2823da254b9c5d (diff)
tdf#89954 sw: let annotation have CH_TXTATR_INWORD placeholder again
Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792: complete annotations on text ranges feature, 2013-12-19), the problem was that while sw wanted CH_TXTATR_INWORD as a placeholder character for anchor positions that do not count as a word boundary, the commit changed GetCharOfTextAttr() so that annotations have CH_TXTATR_BREAKWORD as the placeholder. Fix the problem by reverting the last hunk of sw/source/core/txtnode/thints.cxx changes in that commit. (cherry picked from commit 89d615360e80a13fff6bc69885e5780d8fedf149, testcase not backported as libreoffice-4-4 does not have LOK editing API yet) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Ia8c97efda9c1e90ae3c27ddb8247e3f3203a63fb Reviewed-on: https://gerrit.libreoffice.org/17826 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/txtnode/thints.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index a03b391a7440..d05efb03a4fc 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3443,6 +3443,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
{
case RES_TXTATR_REFMARK:
case RES_TXTATR_TOXMARK:
+ case RES_TXTATR_ANNOTATION:
cRet = CH_TXTATR_INWORD;
break;
@@ -3451,7 +3452,6 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
case RES_TXTATR_FTN:
case RES_TXTATR_META:
case RES_TXTATR_METAFIELD:
- case RES_TXTATR_ANNOTATION:
{
cRet = CH_TXTATR_BREAKWORD;
}