From 1543f1ec6deba898f71b04d242af8bed74dcd8d6 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Fri, 24 Feb 2012 14:22:54 +0000
Subject: basic: tolerate empty / missing dialog.xlc and script.xlc files

---
 basic/source/uno/namecont.cxx | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'basic/source/uno')

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index a76ff93faf39..fbc52eaf176e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -768,13 +768,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
             }
             catch(const Exception& )
             {
+                // Silently tolerate empty or missing files
                 xInput.clear();
-                if( nPass == 0 )
-                {
-                    SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
-                    ErrorHandler::HandleError( nErrorCode );
-                }
             }
 
             // Old variant?
@@ -793,9 +788,6 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                 catch(const Exception& )
                 {
                     xInput.clear();
-                    SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
-                    ErrorHandler::HandleError( nErrorCode );
                 }
             }
 
@@ -957,11 +949,6 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
 
             delete pLibArray;
         }
-        // Only in the first pass it's an error when no index file is found
-        else if( nPass == 0 )
-        {
-            return;
-        }
     }
 
     // #110009: END Scope to force the StorageRefs to be destructed
-- 
cgit