diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-06-12 11:22:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-06-12 16:27:57 +0200 |
| commit | c1399e497191f295b9c3db95d126ff6a4fa5891d (patch) | |
| tree | 09a9ca2c668d67b10959ca588a43c1fb24e71eb7 /editeng/source/editeng/impedit2.cxx | |
| parent | 47dbbe214641b9a28871d0c82f71b2afb9c5943c (diff) | |
Move isIVSSelector, isCJKIVSCharacter to i18nutil/unicode.hxx
6a7db071c75609093fc3a9cbc297b8069726a33e "tdf#125497 allow backspace to remove
CJK IVS" had moved these functions from sw/source/uibase/wrtsh/delete.cxx to
rtl/character.hxx, but the latter appears to be a less than ideal home for them:
For one, it is part of the stable URE interface, which makes it harder to
maintain (e.g., later versions of Unicode have added CJK Extension C--F code
blocks, which the current implementation of isCJKIVSCharacter does not reflect).
And for another, besides details of legacy/ubiquitous ASCII, it only deals with
the "hard" structure of Unicode (isUnicodeCodePoint, isSurrogate, etc.), not
with any specific code blocks or character classifications (which can change
over time). Internal i18nutil/unicode.hxx appears to be better suited.
Change-Id: I88b3e4e2488411f988c1a20f79b8a58626d93dce
Reviewed-on: https://gerrit.libreoffice.org/73873
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'editeng/source/editeng/impedit2.cxx')
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 58629d811b1b..472a3d78de14 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -60,7 +60,7 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <svl/asiancfg.hxx> -#include <rtl/character.hxx> +#include <i18nutil/unicode.hxx> #include <comphelper/lok.hxx> #include <unotools/configmgr.hxx> @@ -2308,8 +2308,8 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n { const OUString& rString = aCurPos.GetNode()->GetString(); sal_Int32 nCode = rString.iterateCodePoints(&nIndex, -1); - if (rtl::isIVSSelector(nCode) && nIndex > 0 && - rtl::isCJKIVSCharacter(rString.iterateCodePoints(&nIndex, -1))) + if (unicode::isIVSSelector(nCode) && nIndex > 0 && + unicode::isCJKIVSCharacter(rString.iterateCodePoints(&nIndex, -1))) { nCharMode = i18n::CharacterIteratorMode::SKIPCELL; } |