summaryrefslogtreecommitdiff
path: root/i18npool/source/transliteration/ignoreWidth.cxx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2018-06-22 13:27:08 +0200
committerLuboš Luňák <l.lunak@collabora.com>2018-06-26 11:58:47 +0200
commite9430571c41367625110cdcde168da178b8b30a9 (patch)
tree4fc083a81d97087aedfb2a2e0dbd7814a3875d39 /i18npool/source/transliteration/ignoreWidth.cxx
parent364af18d7394c113dc8624c0c84de28c2747a927 (diff)
remove the useOffset thread-unsafe hack from transliteration
And instead pass it as an argument to an implementation function. Otherwise this is thread-unsafe for Calc's threaded calculation, and transliteration is used in various places in Calc code. Change-Id: Ibdf95e4b6867ec251618f6ff91e605acb69667c0 Reviewed-on: https://gerrit.libreoffice.org/56290 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'i18npool/source/transliteration/ignoreWidth.cxx')
-rw-r--r--i18npool/source/transliteration/ignoreWidth.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 2317d2f00e24..e0e9ef7b701d 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -28,11 +28,11 @@ using namespace com::sun::star::lang;
namespace i18npool {
-OUString SAL_CALL
-ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
+OUString
+ignoreWidth::foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset )
{
rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth);
- return t1->transliterate(inStr, startPos, nCount, offset);
+ return t1->transliterateImpl(inStr, startPos, nCount, offset, useOffset);
}
Sequence< OUString > SAL_CALL