commit 47d25dc5abe000ce751cb1e4dbd1f85f7198ca05
author Tomoyuki Kubota <himajin100000@gmail.com> Sat Apr 20 22:46:27 2019 +0900
committer Michael Stahl <Michael.Stahl@cib.de> Tue Apr 23 12:51:51 2019 +0200
tree 7c0fd093b90efa7697fd8ce9459c459d86646ab7
parent 3667031eb27620f86b7c1e281eae3543ef98175c

tdf#123043 make type character detection unicode-aware

Change-Id: I98886a7d13a43cc3202d45f96ceb5062f76f0784
Reviewed-on: https://gerrit.libreoffice.org/71013
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

basctl/source/basicide/baside2b.cxx

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b18ef9a..2e3425d 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -92,7 +92,7 @@
int const nScrollPage = 60;
int const DWBORDER = 3;

char const cSuffixes[] = "%&!#@$";
OUString const cSuffixes {"%&!#@$"};

} // namespace

@@ -166,13 +166,13 @@
    if ( !rVar.isEmpty() )
    {
        sal_uInt16 nLastChar = rVar.getLength()-1;
        if ( strchr( cSuffixes, rVar[ nLastChar ] ) )
        if ( cSuffixes.indexOf(rVar[ nLastChar ] ) >= 0 )
            rVar = rVar.replaceAt( nLastChar, 1, "" );
    }
    if ( !rIndex.isEmpty() )
    {
        sal_uInt16 nLastChar = rIndex.getLength()-1;
        if ( strchr( cSuffixes, rIndex[ nLastChar ] ) )
        if ( cSuffixes.indexOf(rIndex[ nLastChar ] ) >=0 )
            rIndex = rIndex.replaceAt( nLastChar, 1, "" );
    }
}
@@ -355,7 +355,7 @@
                if ( !aWord.isEmpty() && !comphelper::string::isdigitAsciiString(aWord) )
                {
                    sal_uInt16 nLastChar = aWord.getLength() - 1;
                    if ( strchr( cSuffixes, aWord[ nLastChar ] ) )
                    if ( cSuffixes.indexOf(aWord[ nLastChar ] ) >= 0 )
                        aWord = aWord.replaceAt( nLastChar, 1, "" );
                    SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
                    if (SbxVariable const* pVar = IsSbxVariable(pSBX))

basic/source/sbx/sbxvar.cxx

diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index ec67be8..bab30af 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -220,7 +220,7 @@

const OUString& SbxVariable::GetName( SbxNameType t ) const
{
    static const char cSuffixes[] = "  %&!#@ $";
    static const OUString cSuffixes { "  %&!#@ $" };
    if( t == SbxNameType::NONE )
    {
        return maName;