diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-12-11 11:17:18 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-12-11 11:17:18 +0000 |
| commit | b1f7f1382f58be2870df59c045dc288bec6139cc (patch) | |
| tree | 72571f552f3ff2efd776635e6a2265be2c6c5cd1 /basic | |
| parent | 0c2044e9bfc79f86ab11257bd472f8b8e130fa70 (diff) | |
CWS-TOOLING: integrate CWS fwk131
2009-12-09 14:31:58 +0100 cd r277766 : #161124# Fix problem with cpu frequency as float. Added context class loader code to fix problems with certain Java versions.
2009-12-04 12:06:17 +0100 mav r277732 : #i107440# in case of problems with extensions the office libraries still should be usable
2009-12-03 18:22:08 +0100 ab r277716 : #i107283# Pass config help path as argument to compileExtensionHelp()
2009-12-03 18:21:16 +0100 ab r277715 : #i107283# Pass config help path as argument to compileExtensionHelp()
2009-12-03 10:35:18 +0100 cd r277707 : #161124# Update service tag implementation for additional fields
2009-11-30 14:04:15 +0100 ab r277674 : #i107263 Fixed service ctor search algorithm
2009-11-27 10:59:04 +0100 cd r277666 : #161124# Update service tag sources
2009-11-26 15:14:53 +0100 cd r277659 : #i107087# Remove event listener from tab window on TabWindowService dtor
2009-11-25 15:05:01 +0100 cd r277637 : #i107087# TabWindowService must set member pointer to zero on VCLEVENT_OBJECT_DYING. The window life time is controlled by the docking window! Adding missing RemoveEventListener call.
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 3 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 8ee3df992e..70f2150a41 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3377,9 +3377,10 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType ) // Create and insert SbUnoServiceCtor SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor ); QuickInsert( (SbxVariable*)xSbCtorRef ); - pRes = xSbCtorRef; } } + + pRes = SbxObject::Find( rName, SbxCLASS_METHOD ); } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c15d937f9b..3ad2332d9a 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl( // #110009 if( !bStorage && meInitMode == DEFAULT ) - implScanExtensions(); + { + try + { + implScanExtensions(); + } + catch( uno::Exception& ) + { + // TODO: error handling? + OSL_ASSERT( "Cannot access extensions!" ); + } + } // #110009 Preload? { |