[Libreoffice-commits] core.git: 2 commits - sc/source

[Tor Lillqvist]

 sc/source/core/tool/interpr1.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit bae136770897c5e3fca186eba10fb4889ad0f34b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 29 16:46:38 2017 +0300

    Move lcl_getScriptClass into only caller
    
    Change-Id: I4f02f40abb26e9e00a0035793d593d1e0914e332

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c217ff819e1d..59730d7d7185 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8581,7 +8581,7 @@ static const UBlockScript scriptList[] = {
     {UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT},
     {UBLOCK_CJK_STROKES, UBLOCK_CJK_STROKES}
 };
-bool SAL_CALL lcl_getScriptClass(sal_uInt32 currentChar)
+bool IsDBCS(sal_Unicode currentChar)
 {
     // for the locale of ja-JP, character U+0x005c and U+0x20ac should be ScriptType::Asian
     if( (currentChar == 0x005c || currentChar == 0x20ac) &&
@@ -8596,10 +8596,6 @@ bool SAL_CALL lcl_getScriptClass(sal_uInt32 currentChar)
     bRet = (i < SAL_N_ELEMENTS(scriptList) && block >= scriptList[i].from);
     return bRet;
 }
-bool IsDBCS(sal_Unicode ch)
-{
-    return lcl_getScriptClass(ch);
-}
 sal_Int32 getLengthB(const OUString &str)
 {
     if(str.isEmpty())
commit f44265e2583b1c89b800e24f7c5db42dbcd4cb39
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 29 16:41:05 2017 +0300

    No need for this variable to be static
    
    Change-Id: Iaf3de050f622a12d896682ada4ad02beca28e1ff

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c69f16034dbd..c217ff819e1d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8588,7 +8588,7 @@ bool SAL_CALL lcl_getScriptClass(sal_uInt32 currentChar)
           (MsLangId::getSystemLanguage() == LANGUAGE_JAPANESE) )
         return true;
     sal_uInt16 i;
-    static bool bRet = false;
+    bool bRet = false;
     UBlockCode block = ublock_getCode(currentChar);
     for ( i = 0; i < SAL_N_ELEMENTS(scriptList); i++) {
         if (block <= scriptList[i].to) break;