basic: String -> OUString

Change-Id: I42479b4bade5111e38d69f04c889c166f340d5ba

1 files changed, 107 insertions, 66 deletions

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index b2f5dc55080b..3a6c5c93d971 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -124,7 +124,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
                     Error( SbERR_SYNTAX );
                 else
                 {
-                    String aCompleteName = aSym;
+                    OUString aCompleteName = aSym;
 
                     // #52709 DIM AS NEW for Uno with full-qualified name
                     if( Peek() == DOT )
@@ -154,7 +154,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
                         break;
                     }
 
-                    // Take over in the String pool
+                    // Take over in the string pool
                     rDef.SetTypeId( aGblStrings.Add( aCompleteName ) );
 
                     if( rDef.IsNew() && pProc == NULL )
@@ -390,9 +390,11 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
         {
             if( !bCompatible && !pDef->IsNew() )
             {
-                String aTypeName( aGblStrings.Find( pDef->GetTypeId() ) );
+                OUString aTypeName( aGblStrings.Find( pDef->GetTypeId() ) );
                 if( rTypeArray->Find( aTypeName, SbxCLASS_OBJECT ) == NULL )
+                {
                     Error( SbERR_UNDEF_TYPE, aTypeName );
+                }
             }
 
             if( bConst )
@@ -595,9 +597,11 @@ void SbiParser::DefType( bool bPrivate )
         if( pElem )
         {
             SbxArray *pTypeMembers = pType->GetProperties();
-            String aElemName = pElem->GetName();
+            OUString aElemName = pElem->GetName();
             if( pTypeMembers->Find( aElemName, SbxCLASS_DONTCARE) )
+            {
                 Error (SbERR_VAR_DEFINED);
+            }
             else
             {
                 SbxDataType eElemType = pElem->GetType();
@@ -644,7 +648,7 @@ void SbiParser::DefType( bool bPrivate )
                     sal_uInt16 nElemTypeId = pElem->GetTypeId();
                     if( nElemTypeId != 0 )
                     {
-                        String aTypeName( aGblStrings.Find( nElemTypeId ) );
+                        OUString aTypeName( aGblStrings.Find( nElemTypeId ) );
                         SbxObject* pTypeObj = static_cast< SbxObject* >( rTypeArray->Find( aTypeName, SbxCLASS_OBJECT ) );
                         if( pTypeObj != NULL )
                         {
@@ -680,7 +684,7 @@ void SbiParser::DefEnum( bool bPrivate )
     if (!TestSymbol())
         return;
 
-    String aEnumName = aSym;
+    OUString aEnumName = aSym;
     if( rEnumArray->Find(aEnumName,SbxCLASS_OBJECT) )
     {
         Error( SbERR_VAR_DEFINED, aSym );
@@ -689,8 +693,9 @@ void SbiParser::DefEnum( bool bPrivate )
 
     SbxObject *pEnum = new SbxObject( aEnumName );
     if( bPrivate )
+    {
         pEnum->SetFlag( SBX_PRIVATE );
-
+    }
     SbiSymDef* pElem;
     SbiDimList* pDim;
     bool bDone = false;
@@ -812,7 +817,7 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
     bool bFunc = ( eCurTok == FUNCTION );
     bool bProp = ( eCurTok == GET || eCurTok == SET || eCurTok == LET );
     if( !TestSymbol() ) return NULL;
-    String aName( aSym );
+    OUString aName( aSym );
     SbxDataType eType = eScanType;
     SbiProcDef* pDef = new SbiProcDef( this, aName, true );
     pDef->SetType( eType );
@@ -847,22 +852,26 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
     if( !bDecl )
     {
         // CDECL, LIB and ALIAS are invalid
-        if( pDef->GetLib().Len() )
+        if( !pDef->GetLib().isEmpty() )
+        {
             Error( SbERR_UNEXPECTED, LIB );
-        if( pDef->GetAlias().Len() )
+        }
+        if( !pDef->GetAlias().isEmpty() )
+        {
             Error( SbERR_UNEXPECTED, ALIAS );
+        }
         if( pDef->IsCdecl() )
         {
             Error( SbERR_UNEXPECTED, _CDECL_ );
         }
         pDef->SetCdecl( false );
-        pDef->GetLib().Erase();
-        pDef->GetAlias().Erase();
+        pDef->GetLib() = "";
+        pDef->GetAlias() = "";
     }
-    else if( !pDef->GetLib().Len() )
+    else if( pDef->GetLib().isEmpty() )
     {
         // ALIAS and CDECL only together with LIB
-        if( pDef->GetAlias().Len() )
+        if( !pDef->GetAlias().isEmpty() )
         {
             Error( SbERR_UNEXPECTED, ALIAS );
         }
@@ -871,72 +880,104 @@ SbiProcDef* SbiParser::ProcDecl( bool bDecl )
             Error( SbERR_UNEXPECTED, _CDECL_ );
         }
         pDef->SetCdecl( false );
-        pDef->GetAlias().Erase();
+        pDef->GetAlias() = "";
     }
     // Brackets?
     if( Peek() == LPAREN )
     {
         Next();
         if( Peek() == RPAREN )
+        {
             Next();
+        }
         else
-          for(;;) {
-            bool bByVal = false;
-            bool bOptional = false;
-            bool bParamArray = false;
-            while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
-            {
-                if      ( Peek() == BYVAL )     Next(), bByVal = true;
-                else if ( Peek() == BYREF )     Next(), bByVal = false;
-                else if ( Peek() == _OPTIONAL_ )    Next(), bOptional = true;
-            }
-            if( bCompatible && Peek() == PARAMARRAY )
-            {
-                if( bByVal || bOptional )
-                    Error( SbERR_UNEXPECTED, PARAMARRAY );
-                Next();
-                bParamArray = true;
-            }
-            SbiSymDef* pPar = VarDecl( NULL, false, false );
-            if( !pPar )
-                break;
-            if( bByVal )
-                pPar->SetByVal();
-            if( bOptional )
-                pPar->SetOptional();
-            if( bParamArray )
-                pPar->SetParamArray();
-            pDef->GetParams().Add( pPar );
-            SbiToken eTok = Next();
-            if( eTok != COMMA && eTok != RPAREN )
+        {
+            for(;;)
             {
-                bool bError2 = true;
-                if( bOptional && bCompatible && eTok == EQ )
+                bool bByVal = false;
+                bool bOptional = false;
+                bool bParamArray = false;
+                while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
                 {
-                    SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
-                    SbxDataType eType2 = pDefaultExpr->GetType();
-
-                    sal_uInt16 nStringId;
-                    if( eType2 == SbxSTRING )
-                        nStringId = aGblStrings.Add( pDefaultExpr->GetString() );
-                    else
-                        nStringId = aGblStrings.Add( pDefaultExpr->GetValue(), eType2 );
+                    if( Peek() == BYVAL )
+                    {
+                        bByVal = true;
+                    }
+                    else if ( Peek() == BYREF )
+                    {
+                        bByVal = false;
+                    }
+                    else if ( Peek() == _OPTIONAL_ )
+                    {
+                        bOptional = true;
+                    }
+                    Next();
+                }
+                if( bCompatible && Peek() == PARAMARRAY )
+                {
+                    if( bByVal || bOptional )
+                    {
+                        Error( SbERR_UNEXPECTED, PARAMARRAY );
+                    }
+                    Next();
+                    bParamArray = true;
+                }
+                SbiSymDef* pPar = VarDecl( NULL, false, false );
+                if( !pPar )
+                {
+                    break;
+                }
+                if( bByVal )
+                {
+                    pPar->SetByVal();
+                }
+                if( bOptional )
+                {
+                    pPar->SetOptional();
+                }
+                if( bParamArray )
+                {
+                    pPar->SetParamArray();
+                }
+                pDef->GetParams().Add( pPar );
+                SbiToken eTok = Next();
+                if( eTok != COMMA && eTok != RPAREN )
+                {
+                    bool bError2 = true;
+                    if( bOptional && bCompatible && eTok == EQ )
+                    {
+                        SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
+                        SbxDataType eType2 = pDefaultExpr->GetType();
 
-                    pPar->SetDefaultId( nStringId );
-                    delete pDefaultExpr;
+                        sal_uInt16 nStringId;
+                        if( eType2 == SbxSTRING )
+                        {
+                            nStringId = aGblStrings.Add( pDefaultExpr->GetString() );
+                        }
+                        else
+                        {
+                            nStringId = aGblStrings.Add( pDefaultExpr->GetValue(), eType2 );
+                        }
+                        pPar->SetDefaultId( nStringId );
+                        delete pDefaultExpr;
 
-                    eTok = Next();
-                    if( eTok == COMMA || eTok == RPAREN )
-                        bError2 = false;
+                        eTok = Next();
+                        if( eTok == COMMA || eTok == RPAREN )
+                        {
+                            bError2 = false;
+                        }
+                    }
+                    if( bError2 )
+                    {
+                        Error( SbERR_EXPECTED, RPAREN );
+                        break;
+                    }
                 }
-                if( bError2 )
+                if( eTok == RPAREN )
                 {
-                    Error( SbERR_EXPECTED, RPAREN );
                     break;
                 }
             }
-            if( eTok == RPAREN )
-                break;
         }
     }
     TypeDecl( *pDef );
@@ -972,7 +1013,7 @@ void SbiParser::DefDeclare( bool bPrivate )
         SbiProcDef* pDef = ProcDecl( true );
         if( pDef )
         {
-            if( !pDef->GetLib().Len() )
+            if( pDef->GetLib().isEmpty() )
             {
                 Error( SbERR_EXPECTED, LIB );
             }
@@ -1002,7 +1043,7 @@ void SbiParser::DefDeclare( bool bPrivate )
                 pDef->SetPublic( !bPrivate );
 
                 // New declare handling
-                if( pDef->GetLib().Len() > 0 )
+                if( !pDef->GetLib().isEmpty())
                 {
                     if( bNewGblDefs && nGblChain == 0 )
                     {
@@ -1051,7 +1092,7 @@ void SbiParser::DefDeclare( bool bPrivate )
 
                     SbiOpcode eOp = pDef->IsCdecl() ? _CALLC : _CALL;
                     sal_uInt16 nId = pDef->GetId();
-                    if( pDef->GetAlias().Len() )
+                    if( !pDef->GetAlias().isEmpty() )
                     {
                         nId = ( nId & 0x8000 ) | aGblStrings.Add( pDef->GetAlias() );
                     }