String to rtl::OUString & reduce indent levels.

sc/source/core/data/globalx.cxx

@@ -58,16 +58,17 @@ void ScGlobal::InitAddIns()
 {
     // multi paths separated by semicolons
     SvtPathOptions aPathOpt;
-    String aMultiPath = aPathOpt.GetAddinPath();
-    if ( aMultiPath.Len() > 0 )
-    {
-        xub_StrLen nTokens = comphelper::string::getTokenCount(aMultiPath, ';');
-        xub_StrLen nIndex = 0;
-        for ( xub_StrLen j=0; j<nTokens; j++ )
-        {
-            String aPath( aMultiPath.GetToken( 0, ';', nIndex ) );
-            if ( aPath.Len() > 0 )
+    rtl::OUString aMultiPath = aPathOpt.GetAddinPath();
+    if (aMultiPath.isEmpty())
+        return;
+
+    sal_Int32 nTokens = comphelper::string::getTokenCount(aMultiPath, ';');
+    for (sal_Int32 j = 0; j < nTokens; ++j)
     {
+        rtl::OUString aPath = comphelper::string::getToken(aMultiPath, j, ';');
+        if (aPath.isEmpty())
+            continue;
+
         //  use LocalFileHelper to convert the path to a URL that always points
         //  to the file on the server
         rtl::OUString aUrl;
@@ -105,7 +106,7 @@ void ScGlobal::InitAddIns()
                     {
                         do
                         {
-                                    rtl::OUString aId( xContentAccess->queryContentIdentifierString() );
+                            rtl::OUString aId = xContentAccess->queryContentIdentifierString();
                             InitExternalFunc( aId );
                         }
                         while ( xResultSet->next() );
@@ -113,22 +114,19 @@ void ScGlobal::InitAddIns()
                 }
                 catch ( Exception& )
                 {
-                            OSL_FAIL( "ResultSetException catched!" );
+                    OSL_FAIL( "ResultSetException caught!" );
                 }
             }
         }
         catch ( Exception& )
         {
-                    OSL_FAIL( "Exception catched!" );
+            OSL_FAIL( "Exception caught!" );
         }
         catch ( ... )
         {
-
             OSL_FAIL( "unexpected exception caught!" );
         }
     }
-        }
-    }
 }