diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:38:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:38:01 +0000 |
| commit | 244d216efc060566a67970c6d5931e4275e29a2c (patch) | |
| tree | 4a07a6990692ff0e5743dff6a69e692e4c5f0bf5 /comphelper/source/officeinstdir | |
| parent | 220a15f4f4c91182a2ffaa6c423f056bfa23526b (diff) | |
INTEGRATION: CWS fwk77 (1.6.116); FILE MERGED
2007/10/18 12:48:29 mav 1.6.116.1: #i81435# introduce SeekableOutputStream implementation; use new registration
Diffstat (limited to 'comphelper/source/officeinstdir')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index bd7a79354541..bf9e44106e16 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -4,9 +4,9 @@ * * $RCSfile: officeinstallationdirectories.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 17:15:41 $ + * last change: $Author: obo $ $Date: 2008-01-04 16:38:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,30 +96,11 @@ rtl::OUString SAL_CALL OfficeInstallationDirectories_getSingletonServiceName() //========================================================================= uno::Reference< uno::XInterface > SAL_CALL OfficeInstallationDirectories_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & xSMgr ) + const uno::Reference< uno::XComponentContext > & rxContext ) throw( uno::Exception ) { - OSL_ENSURE( xSMgr.is(), "No service manager!" ); - - uno::Reference< uno::XComponentContext > xCtx; - uno::Reference< beans::XPropertySet > xPropSet( xSMgr, uno::UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ) - >>= xCtx; - } - - if ( !xCtx.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 OfficeInstallationDirectories( xCtx ) ); + new OfficeInstallationDirectories( rxContext ) ); } //========================================================================= |