diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:08:00 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-29 09:16:52 +0200 |
| commit | 89d615360e80a13fff6bc69885e5780d8fedf149 (patch) | |
| tree | a93343dc81f421de68cc61f5df8b685f9887ac51 /sw/source/core/txtnode | |
| parent | c00760b1379023d8b45f54c0282051fcc7a240dd (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.
Change-Id: Ia8c97efda9c1e90ae3c27ddb8247e3f3203a63fb
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 2b8c0f5a1040..59205c288e8c 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -3446,6 +3446,7 @@ sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr ) { case RES_TXTATR_REFMARK: case RES_TXTATR_TOXMARK: + case RES_TXTATR_ANNOTATION: cRet = CH_TXTATR_INWORD; break; @@ -3454,7 +3455,6 @@ sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr ) case RES_TXTATR_FTN: case RES_TXTATR_META: case RES_TXTATR_METAFIELD: - case RES_TXTATR_ANNOTATION: { cRet = CH_TXTATR_BREAKWORD; } |