diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-20 09:58:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-20 10:02:38 +0100 |
commit | e3982fc537aa46595def41250526c331a02cd4e6 (patch) | |
tree | 6cf9540a9540190be9ea63d2a7db48ad3aba9e9b /cppuhelper/source/servicefactory.cxx | |
parent | 6f1541dfb3b7732af6da3604c6d9e240eaf54cb4 (diff) |
API CHANGE: Remove deprecated cppuhelper/bootstrap.hxx functionality
cppu::createSimpleRegistry, cppu::createNestedRegistry, and
cppu::bootstrap_InitialComponentContext for registry-based type/service
information, superseded by cppu::defaultBootstrap_InitialComponentContext.
Aborting stubs for the three functions are left in cppuhelper/source/compat.cxx
to avoid having to incompatibly change cppuhelper/source/gcc3.map.
Change-Id: I8e714c021c246b15a6e6fb7f25d754dceff17c8a
Diffstat (limited to 'cppuhelper/source/servicefactory.cxx')
-rw-r--r-- | cppuhelper/source/servicefactory.cxx | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index ed873c6a3e15..d09bc20ba4bc 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -43,8 +43,7 @@ #include "com/sun/star/container/XSet.hpp" #include "com/sun/star/container/XHierarchicalNameAccess.hpp" #include "com/sun/star/registry/XSimpleRegistry.hpp" -#include "com/sun/star/registry/XImplementationRegistration.hpp" -#include "com/sun/star/security/XAccessController.hpp" +#include "com/sun/star/uno/SecurityException.hpp" #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -64,9 +63,6 @@ using namespace ::com::sun::star::uno; namespace cppu { -Reference< security::XAccessController > -createDefaultAccessController() SAL_THROW(()); - static Reference< XInterface > SAL_CALL createInstance( Reference< XInterface > const & xFactory, Reference< XComponentContext > const & xContext = @@ -91,7 +87,9 @@ static Reference< XInterface > SAL_CALL createInstance( Reference< XInterface >() ); } -Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( +namespace { + +Reference< registry::XSimpleRegistry > createSimpleRegistry( OUString const & rBootstrapPath ) SAL_THROW(()) { @@ -122,7 +120,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( return Reference< registry::XSimpleRegistry >(); } -Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( +Reference< registry::XSimpleRegistry > createNestedRegistry( OUString const & rBootstrapPath ) SAL_THROW(()) { @@ -153,6 +151,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( return Reference< registry::XSimpleRegistry >(); } +} /** bootstrap variables: @@ -671,30 +670,6 @@ Reference< lang::XMultiServiceFactory > SAL_CALL createRegistryServiceFactory( rWriteRegistry, rReadRegistry, bReadOnly, rBootstrapPath ), UNO_QUERY ); } -Reference< XComponentContext > SAL_CALL bootstrap_InitialComponentContext( - Reference< registry::XSimpleRegistry > const & xRegistry, - OUString const & rBootstrapPath ) - SAL_THROW( (Exception) ) -{ - Bootstrap bootstrap; - - Reference< lang::XMultiComponentFactory > xSF( - bootstrapInitialSF( rBootstrapPath ) ); - Reference< XComponentContext > xContext( - bootstrapInitialContext( - xSF, xRegistry, xRegistry, rBootstrapPath, bootstrap ) ); - - // initialize sf - Reference< lang::XInitialization > xInit( xSF, UNO_QUERY ); - OSL_ASSERT( xInit.is() ); - Sequence< Any > aSFInit( 2 ); - aSFInit[ 0 ] <<= xRegistry; - aSFInit[ 1 ] <<= xContext; // default context - xInit->initialize( aSFInit ); - - return xContext; -} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |