android/qa/desktop/Makefile | 4 +++ basic/source/inc/namecont.hxx | 8 +++--- basic/source/uno/namecont.cxx | 39 ++++++++----------------------- test/Package_unittest.mk | 2 - test/user-template/user/basic/dialog.xlc | 4 --- test/user-template/user/basic/script.xlc | 4 --- toolkit/source/awt/vclxtoolkit.cxx | 8 +++++- 7 files changed, 26 insertions(+), 43 deletions(-)
New commits: commit 1c7c2c032301247416d977af17ddd4183cd339f4 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Feb 24 16:11:18 2012 +0000 test: remove, now redundant dummy dialog.xlc / script.xlc diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index ce48f68..b861c93 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -28,8 +28,6 @@ $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template)) $(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/basic/dialog.xlc,user/basic/dialog.xlc)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/basic/script.xlc,user/basic/script.xlc)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/en-US.dic,user/wordbook/en-US.dic)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/technical.dic,user/wordbook/technical.dic)) diff --git a/test/user-template/user/basic/dialog.xlc b/test/user-template/user/basic/dialog.xlc deleted file mode 100644 index aed4ac2..0000000 --- a/test/user-template/user/basic/dialog.xlc +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> -<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> -</library:libraries> diff --git a/test/user-template/user/basic/script.xlc b/test/user-template/user/basic/script.xlc deleted file mode 100644 index aed4ac2..0000000 --- a/test/user-template/user/basic/script.xlc +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> -<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> -</library:libraries> commit 3bc31727bb7107e770f48871cf7700a16e9bbc68 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Feb 24 15:07:37 2012 +0000 android: package more useful sounding libraries diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 528174b..8c07351 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -121,6 +121,7 @@ copy-stuff: buildrcs freetype \ fsstorage.uno \ gcc3_uno \ + hypenlo \ i18nisolang1gcc3 \ i18npaperlo \ i18npool.uno \ @@ -132,6 +133,8 @@ copy-stuff: buildrcs jvmaccessgcc3 \ jvmfwk \ lnglo \ + introspection.uno \ + lnth \ localebe1.uno \ localedata_en \ localedata_es \ @@ -146,6 +149,7 @@ copy-stuff: buildrcs sclo \ scfiltlo \ sotlo \ + spelllo \ stocservices.uno \ store \ svllo \ commit 63ac26703974f8481b112b1a881329fa7a8bca96 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Feb 24 15:06:52 2012 +0000 toolkit: fix module name for svt to 'merged' when using mergedlibs diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 3a8e2c6..fe21cc6 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1094,7 +1094,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( // try to load the lib if ( !fnSvtCreateWindow && !hSvToolsLib ) { - ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "svt", sal_True ); + ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( +#ifdef LIBO_MERGELIBS + "merged", +#else + "svt", +#endif + sal_True ); hSvToolsLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hSvToolsLib ) commit 1543f1ec6deba898f71b04d242af8bed74dcd8d6 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Feb 24 14:22:54 2012 +0000 basic: tolerate empty / missing dialog.xlc and script.xlc files diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index a76ff93..fbc52ea 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 commit 1dc601f1b62485e50fe43a8037aa5eb59c60cfe9 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Feb 24 14:17:11 2012 +0000 basic: remove un-used return value indicating failure diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 26f04f8..8f585b5 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -348,8 +348,8 @@ protected: BasicManager* getBasicManager( void ); ::rtl::OUString createAppLibraryFolder( SfxLibrary* pLib, const ::rtl::OUString& aName ); - sal_Bool init( const ::rtl::OUString& rInitialDocumentURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); + void init( const ::rtl::OUString& rInitialDocumentURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); virtual const sal_Char* SAL_CALL getInfoFileName() const = 0; virtual const sal_Char* SAL_CALL getOldInfoFileName() const = 0; @@ -383,8 +383,8 @@ protected: virtual void SAL_CALL disposing(); private: - sal_Bool init_Impl( const ::rtl::OUString& rInitialDocumentURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); + void init_Impl( const ::rtl::OUString& rInitialDocumentURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); void implScanExtensions( void ); public: diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index db72a4f..a76ff93 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -586,20 +586,18 @@ static void createVariableURL( OUString& rStr, const OUString& rLibName, rStr += OUString(RTL_CONSTASCII_USTRINGPARAM(".xlb/")); } -sal_Bool SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) +void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) { // this might be called from within the ctor, and the impl_init might (indirectly) create // an UNO reference to ourself. // Ensure that we're not destroyed while we're in here osl_incrementInterlockedCount( &m_refCount ); - sal_Bool bSuccess = init_Impl( rInitialDocumentURL, rxInitialStorage ); + init_Impl( rInitialDocumentURL, rxInitialStorage ); osl_decrementInterlockedCount( &m_refCount ); - - return bSuccess; } -sal_Bool SfxLibraryContainer::init_Impl( - const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage ) +void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, + const uno::Reference< embed::XStorage >& rxInitialStorage ) { uno::Reference< embed::XStorage > xStorage = rxInitialStorage; @@ -632,8 +630,8 @@ sal_Bool SfxLibraryContainer::init_Impl( meInitMode = LIBRARY_INIT_FILE; uno::Reference< embed::XStorage > xDummyStor; ::xmlscript::LibDescriptor aLibDesc; - sal_Bool bReadIndexFile = implLoadLibraryIndexFile( NULL, aLibDesc, xDummyStor, aInitFileName ); - return bReadIndexFile; + implLoadLibraryIndexFile( NULL, aLibDesc, xDummyStor, aInitFileName ); + return; } else { @@ -643,7 +641,7 @@ sal_Bool SfxLibraryContainer::init_Impl( { meInitMode = OLD_BASIC_STORAGE; importFromOldStorage( aInitFileName ); - return sal_True; + return; } else { @@ -670,7 +668,7 @@ sal_Bool SfxLibraryContainer::init_Impl( if( !xParser.is() ) { SAL_WARN("basic", "couldn't create sax parser component"); - return sal_False; + return; } uno::Reference< io::XInputStream > xInput; @@ -821,12 +819,12 @@ sal_Bool SfxLibraryContainer::init_Impl( catch ( const xml::sax::SAXException& e ) { SAL_WARN("basic", e.Message); - return sal_False; + return; } catch ( const io::IOException& e ) { SAL_WARN("basic", e.Message); - return sal_False; + return; } sal_Int32 nLibCount = pLibArray->mnLibCount; @@ -962,7 +960,7 @@ sal_Bool SfxLibraryContainer::init_Impl( // Only in the first pass it's an error when no index file is found else if( nPass == 0 ) { - return sal_False; + return; } } @@ -1225,8 +1223,6 @@ sal_Bool SfxLibraryContainer::init_Impl( {} } } - - return sal_True; } void SfxLibraryContainer::implScanExtensions( void ) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits