From e3982fc537aa46595def41250526c331a02cd4e6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 20 Dec 2012 09:58:06 +0100 Subject: 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 --- cppuhelper/inc/cppuhelper/bootstrap.hxx | 51 --------------------------------- cppuhelper/source/compat.cxx | 49 ++++++++++++++++++++++++------- cppuhelper/source/servicefactory.cxx | 37 ++++-------------------- 3 files changed, 45 insertions(+), 92 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx index 995468a1220d..d76379a2f3e3 100644 --- a/cppuhelper/inc/cppuhelper/bootstrap.hxx +++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx @@ -28,41 +28,12 @@ namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } - namespace registry { class XSimpleRegistry; } namespace uno { class XComponentContext; } } } } namespace cppu { -/** Creates a simple registry service instance. - - @rBootstrapPath optional bootstrap path for initial components - @return simple registry service instance - - @deprecated Registry-based type/service information is successively - replaced with more modern formats; client code should exclusively use - ::cppu::defaultBootstrap_InitialComponentContext (or ::cppu::bootstrap). -*/ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > -SAL_CALL createSimpleRegistry( - const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) - SAL_THROW(()); - -/** Creates a nested registry service instance. - - @rBootstrapPath optional bootstrap path for initial components - @return nested registry service instance - - @deprecated Registry-based type/service information is successively - replaced with more modern formats; client code should exclusively use - ::cppu::defaultBootstrap_InitialComponentContext (or ::cppu::bootstrap). -*/ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > -SAL_CALL createNestedRegistry( - const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() ) - SAL_THROW(()); - /** Installs type description manager instance, i.e. registers a callback at cppu core. @param xTDMgr manager instance @@ -72,28 +43,6 @@ CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager( ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr ) SAL_THROW(()); -/** Bootstraps an initial component context with service manager upon a given registry. - This includes insertion of initial services: - - (registry) service manager, shared lib loader, - - simple registry, nested registry, - - implementation registration - - registry typedescription provider, typedescription manager (also installs it into cppu core) - - @param xRegistry registry for service manager and singleton objects of context (may be null) - @param rBootstrapPath optional bootstrap path for initial components - @return component context - - @deprecated Registry-based type/service information is successively - replaced with more modern formats; client code should exclusively use - ::cppu::defaultBootstrap_InitialComponentContext (or ::cppu::bootstrap). -*/ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL -bootstrap_InitialComponentContext( - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > const & xRegistry, - ::rtl::OUString const & rBootstrapPath = ::rtl::OUString() ) - SAL_THROW( (::com::sun::star::uno::Exception) ); - - /** Bootstraps an initial component context with service manager upon information from bootstrap variables. diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx index c24a8a846b39..70139548a8a8 100644 --- a/cppuhelper/source/compat.cxx +++ b/cppuhelper/source/compat.cxx @@ -18,19 +18,48 @@ */ #include "sal/config.h" -#include -#include -#include -using namespace ::com::sun::star; +#include -// Stubs for removed functionality, to be killed when we bump sal SONAME +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/Sequence.hxx" +#include "sal/types.h" -SAL_DLLPUBLIC_EXPORT -reflection::XIdlClass * SAL_CALL createStandardClassWithSequence( - const uno::Reference < lang::XMultiServiceFactory > &, const rtl::OUString &, - const uno::Reference < reflection::XIdlClass > &, const uno::Sequence < rtl::OUString > & ) - SAL_THROW( () ) +namespace com { namespace sun { namespace star { + namespace lang { class XMultiServiceFactory; } + namespace reflection { class XIdlClass; } + namespace registry { class XSimpleRegistry; } + namespace uno { class XComponentContext; } +} } } +namespace rtl { class OUString; } + +// Stubs for removed functionality, to be killed when we bump cppuhelper SONAME + +SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > SAL_CALL +bootstrap_InitialComponentContext( + css::uno::Reference< css::registry::XSimpleRegistry > const &, + rtl::OUString const &) SAL_THROW((css::uno::Exception)) +{ + for (;;) { std::abort(); } // avoid "must return a value" warnings +} + +SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry > +SAL_CALL createNestedRegistry(rtl::OUString const &) SAL_THROW(()) { + for (;;) { std::abort(); } // avoid "must return a value" warnings +} + +SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::registry::XSimpleRegistry > +SAL_CALL createSimpleRegistry(rtl::OUString const &) SAL_THROW(()) { + for (;;) { std::abort(); } // avoid "must return a value" warnings +} + +SAL_DLLPUBLIC_EXPORT css::reflection::XIdlClass * SAL_CALL +createStandardClassWithSequence( + css::uno::Reference< css::lang::XMultiServiceFactory > const &, + rtl::OUString const &, + css::uno::Reference< css::reflection::XIdlClass > const &, + css::uno::Sequence< rtl::OUString > const &) SAL_THROW(()) { for (;;) { std::abort(); } // avoid "must return a value" warnings } 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 #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: */ -- cgit