Kaydet (Commit) 47d25dc5 authored tarafından Tomoyuki Kubota's avatar Tomoyuki Kubota Kaydeden (comit) Michael Stahl

tdf#123043 make type character detection unicode-aware

Change-Id: I98886a7d13a43cc3202d45f96ceb5062f76f0784
Reviewed-on: https://gerrit.libreoffice.org/71013
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 3667031e
...@@ -92,7 +92,7 @@ int const nScrollLine = 12; ...@@ -92,7 +92,7 @@ int const nScrollLine = 12;
int const nScrollPage = 60; int const nScrollPage = 60;
int const DWBORDER = 3; int const DWBORDER = 3;
char const cSuffixes[] = "%&!#@$"; OUString const cSuffixes {"%&!#@$"};
} // namespace } // namespace
...@@ -166,13 +166,13 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString& ...@@ -166,13 +166,13 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString&
if ( !rVar.isEmpty() ) if ( !rVar.isEmpty() )
{ {
sal_uInt16 nLastChar = rVar.getLength()-1; sal_uInt16 nLastChar = rVar.getLength()-1;
if ( strchr( cSuffixes, rVar[ nLastChar ] ) ) if ( cSuffixes.indexOf(rVar[ nLastChar ] ) >= 0 )
rVar = rVar.replaceAt( nLastChar, 1, "" ); rVar = rVar.replaceAt( nLastChar, 1, "" );
} }
if ( !rIndex.isEmpty() ) if ( !rIndex.isEmpty() )
{ {
sal_uInt16 nLastChar = rIndex.getLength()-1; sal_uInt16 nLastChar = rIndex.getLength()-1;
if ( strchr( cSuffixes, rIndex[ nLastChar ] ) ) if ( cSuffixes.indexOf(rIndex[ nLastChar ] ) >=0 )
rIndex = rIndex.replaceAt( nLastChar, 1, "" ); rIndex = rIndex.replaceAt( nLastChar, 1, "" );
} }
} }
...@@ -355,7 +355,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) ...@@ -355,7 +355,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
if ( !aWord.isEmpty() && !comphelper::string::isdigitAsciiString(aWord) ) if ( !aWord.isEmpty() && !comphelper::string::isdigitAsciiString(aWord) )
{ {
sal_uInt16 nLastChar = aWord.getLength() - 1; sal_uInt16 nLastChar = aWord.getLength() - 1;
if ( strchr( cSuffixes, aWord[ nLastChar ] ) ) if ( cSuffixes.indexOf(aWord[ nLastChar ] ) >= 0 )
aWord = aWord.replaceAt( nLastChar, 1, "" ); aWord = aWord.replaceAt( nLastChar, 1, "" );
SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord ); SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
if (SbxVariable const* pVar = IsSbxVariable(pSBX)) if (SbxVariable const* pVar = IsSbxVariable(pSBX))
......
...@@ -220,7 +220,7 @@ void SbxVariable::SetName( const OUString& rName ) ...@@ -220,7 +220,7 @@ void SbxVariable::SetName( const OUString& rName )
const OUString& SbxVariable::GetName( SbxNameType t ) const const OUString& SbxVariable::GetName( SbxNameType t ) const
{ {
static const char cSuffixes[] = " %&!#@ $"; static const OUString cSuffixes { " %&!#@ $" };
if( t == SbxNameType::NONE ) if( t == SbxNameType::NONE )
{ {
return maName; return maName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment