sw/source/core/txtnode/thints.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c6cdfe08420eefaa97d957c3908daf76b14e684
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jul 29 09:08:00 2015 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..d05efb0 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
