[Libreoffice-commits] core.git: basic/source

[Caolán McNamara]

 basic/source/comp/symtbl.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 9dacd849b6ba76bab36558ad9e5d5614cd9fa29e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 14 14:18:51 2014 +0000

    this is for detecting the type of a variable based on its name
    
    which means legal input is any character which a variable can
    start with
    
    Change-Id: I0c2d13a92ba374f8020e86e90e8e5f18ce8a9c90

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 594b1d3..99e02e3 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -318,6 +318,8 @@ void SbiSymDef::SetType( SbxDataType t )
 {
     if( t == SbxVARIANT && pIn )
     {
+        //See if there have been any deftype statements to set the default type
+        //of a variable based on its starting letter
         sal_Unicode cu = aName[0];
         if( cu < 256 )
         {
@@ -327,14 +329,9 @@ void SbiSymDef::SetType( SbxDataType t )
                 ch = 'Z';
             }
             int ch2 = toupper( ch );
-            unsigned char c = (unsigned char)ch2;
-            if( c > 0 && c < 128 )
-            {
-                int nIndex = ch2 - 'A';
-                assert(nIndex >= 0 && nIndex < N_DEF_TYPES);
-                if (nIndex >= 0 && nIndex < N_DEF_TYPES)
-                    t = pIn->pParser->eDefTypes[nIndex];
-            }
+            int nIndex = ch2 - 'A';
+            if (nIndex >= 0 && nIndex < N_DEF_TYPES)
+                t = pIn->pParser->eDefTypes[nIndex];
         }
     }
     eType = t;