diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:37:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:37:37 +0000 |
| commit | b641ed9bec885fce03c5314b319193c287c90daf (patch) | |
| tree | 36ccd672ab926fa8c4e2a2c007c1909c7c96fb2b /comphelper | |
| parent | 40bccffd8536f61177f6e3fc26c14460d2b9ff5a (diff) | |
INTEGRATION: CWS fwk77 (1.5.116); FILE MERGED
2007/12/03 05:14:33 pb 1.5.116.2: RESYNC: (1.5-1.6); FILE MERGED
2007/10/18 12:48:29 mav 1.5.116.1: #i81435# introduce SeekableOutputStream implementation; use new registration
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/instancelocker.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 074ff0faf24b..3fa073ce8c5d 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -4,9 +4,9 @@ * * $RCSfile: instancelocker.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 17:27:42 $ + * last change: $Author: obo $ $Date: 2008-01-04 16:37:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -260,21 +260,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::impl_staticGetSupport // -------------------------------------------------------- uno::Reference< uno::XInterface > SAL_CALL OInstanceLocker::impl_staticCreateSelfInstance( - const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) + const uno::Reference< uno::XComponentContext >& rxContext ) { - uno::Reference< uno::XComponentContext > xContext; - uno::Reference< beans::XPropertySet > xPropSet( xServiceManager, uno::UNO_QUERY ); - if ( xPropSet.is() ) - xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) >>= xContext; - - if ( !xContext.is() ) - { - throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to obtain component context from service manager!" ) ), - uno::Reference< uno::XInterface >() ); - } - - return static_cast< cppu::OWeakObject * >( new OInstanceLocker( xContext ) ); + return static_cast< cppu::OWeakObject * >( new OInstanceLocker( rxContext ) ); } |