String to rtl::OUString & reduce indent levels.

sc/source/core/data/globalx.cxx

@@ -58,76 +58,74 @@ void ScGlobal::InitAddIns()
 {
     // multi paths separated by semicolons
     SvtPathOptions aPathOpt;
-    String aMultiPath = aPathOpt.GetAddinPath();
-    if ( aMultiPath.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)
     {
-        xub_StrLen nTokens = comphelper::string::getTokenCount(aMultiPath, ';');
-        xub_StrLen nIndex = 0;
-        for ( xub_StrLen 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;
+        if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) )
+            aPath = aUrl;
+
+        INetURLObject aObj;
+        aObj.SetSmartURL( aPath );
+        aObj.setFinalSlash();
+        try
         {
-            String aPath( aMultiPath.GetToken( 0, ';', nIndex ) );
-            if ( aPath.Len() > 0 )
+            ::ucbhelper::Content aCnt( aObj.GetMainURL(INetURLObject::NO_DECODE),
+                Reference< XCommandEnvironment > () );
+            Reference< sdbc::XResultSet > xResultSet;
+            Sequence< rtl::OUString > aProps;
+            try
+            {
+                xResultSet = aCnt.createCursor(
+                    aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );
+            }
+            catch ( Exception& )
             {
-                //  use LocalFileHelper to convert the path to a URL that always points
-                //  to the file on the server
-                rtl::OUString aUrl;
-                if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) )
-                    aPath = aUrl;
-
-                INetURLObject aObj;
-                aObj.SetSmartURL( aPath );
-                aObj.setFinalSlash();
+                // ucb may throw different exceptions on failure now
+                // no assertion if AddIn directory doesn't exist
+            }
+
+            if ( xResultSet.is() )
+            {
+                Reference< sdbc::XRow > xRow( xResultSet, UNO_QUERY );
+                Reference< XContentAccess >
+                    xContentAccess( xResultSet, UNO_QUERY );
                 try
                 {
-                    ::ucbhelper::Content aCnt( aObj.GetMainURL(INetURLObject::NO_DECODE),
-                        Reference< XCommandEnvironment > () );
-                    Reference< sdbc::XResultSet > xResultSet;
-                    Sequence< rtl::OUString > aProps;
-                    try
-                    {
-                        xResultSet = aCnt.createCursor(
-                            aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY );
-                    }
-                    catch ( Exception& )
-                    {
-                        // ucb may throw different exceptions on failure now
-                        // no assertion if AddIn directory doesn't exist
-                    }
-
-                    if ( xResultSet.is() )
+                    if ( xResultSet->first() )
                     {
-                        Reference< sdbc::XRow > xRow( xResultSet, UNO_QUERY );
-                        Reference< XContentAccess >
-                            xContentAccess( xResultSet, UNO_QUERY );
-                        try
-                        {
-                            if ( xResultSet->first() )
-                            {
-                                do
-                                {
-                                    rtl::OUString aId( xContentAccess->queryContentIdentifierString() );
-                                    InitExternalFunc( aId );
-                                }
-                                while ( xResultSet->next() );
-                            }
-                        }
-                        catch ( Exception& )
+                        do
                         {
-                            OSL_FAIL( "ResultSetException catched!" );
+                            rtl::OUString aId = xContentAccess->queryContentIdentifierString();
+                            InitExternalFunc( aId );
                         }
+                        while ( xResultSet->next() );
                     }
                 }
                 catch ( Exception& )
                 {
-                    OSL_FAIL( "Exception catched!" );
-                }
-                catch ( ... )
-                {
-
-                    OSL_FAIL( "unexpected exception caught!" );
+                    OSL_FAIL( "ResultSetException caught!" );
                 }
             }
         }
+        catch ( Exception& )
+        {
+            OSL_FAIL( "Exception caught!" );
+        }
+        catch ( ... )
+        {
+            OSL_FAIL( "unexpected exception caught!" );
+        }
     }
 }