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/compat.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/compat.cxx')
-rw-r--r-- | cppuhelper/source/compat.cxx | 49 |
1 files changed, 39 insertions, 10 deletions
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 <rtl/ustring.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/reflection/XIdlClass.hpp> -using namespace ::com::sun::star; +#include <cstdlib> -// 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 } |