summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-02-24 14:22:54 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-24 16:46:47 +0000
commit1543f1ec6deba898f71b04d242af8bed74dcd8d6 (patch)
tree9fa2f45a8f1eb040358d5755f1feaa6f97255827
parent1dc601f1b62485e50fe43a8037aa5eb59c60cfe9 (diff)
basic: tolerate empty / missing dialog.xlc and script.xlc files
-rw-r--r--basic/source/uno/namecont.cxx15
1 files changed, 1 insertions, 14 deletions
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,
768 } 768 }
769 catch(const Exception& ) 769 catch(const Exception& )
770 { 770 {
771 // Silently tolerate empty or missing files
771 xInput.clear(); 772 xInput.clear();
772 if( nPass == 0 )
773 {
774 SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
775 sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
776 ErrorHandler::HandleError( nErrorCode );
777 }
778 } 773 }
779 774
780 // Old variant? 775 // Old variant?
@@ -793,9 +788,6 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
793 catch(const Exception& ) 788 catch(const Exception& )
794 { 789 {
795 xInput.clear(); 790 xInput.clear();
796 SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
797 sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
798 ErrorHandler::HandleError( nErrorCode );
799 } 791 }
800 } 792 }
801 793
@@ -957,11 +949,6 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
957 949
958 delete pLibArray; 950 delete pLibArray;
959 } 951 }
960 // Only in the first pass it's an error when no index file is found
961 else if( nPass == 0 )
962 {
963 return;
964 }
965 } 952 }
966 953
967 // #110009: END Scope to force the StorageRefs to be destructed 954 // #110009: END Scope to force the StorageRefs to be destructed