diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-20 11:02:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-21 06:36:39 +0000 |
| commit | 08233bd25849cc7d5d092aa073362c7766cbcc19 (patch) | |
| tree | ef27b8d8b00e531e31eea084f7cce81b6cb0bcb2 | |
| parent | d4d18b8613ab3ae38fe1ce1e3300e23ee6d42d44 (diff) | |
com::sun::star->css in include/cppuhelper
Change-Id: I3d9dcd4cd756a3f0d9cedd894377a117c9dbeecc
Reviewed-on: https://gerrit.libreoffice.org/19486
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
50 files changed, 1516 insertions, 1526 deletions
diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 55404a9cc47d..464b95d2367c 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -31,7 +31,7 @@ namespace cppu */ class CPPUHELPER_DLLPUBLIC AccessControl { - ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController; + css::uno::Reference< css::security::XAccessController > m_xController; public: /** Ctor. @@ -39,15 +39,13 @@ public: @param xContext component context to retrieve access controller singleton */ AccessControl( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); /** Ctor. @param xController access controller */ AccessControl( - ::com::sun::star::uno::Reference< - ::com::sun::star::security::XAccessController > const & xController ); + css::uno::Reference< css::security::XAccessController > const & xController ); /** Copy ctor. @param ac another object @@ -63,15 +61,14 @@ public: @return access controller */ - inline ::com::sun::star::uno::Reference< - ::com::sun::star::security::XAccessController > const & SAL_CALL get() const + inline css::uno::Reference< css::security::XAccessController > const & SAL_CALL get() const { return m_xController; } /** Returns access to the access controller reference being used. @return access controller */ - inline ::com::sun::star::security::XAccessController * SAL_CALL operator -> () const + inline css::security::XAccessController * SAL_CALL operator -> () const { return m_xController.get(); } diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index debddcf18df2..e9a0c2d1c4f6 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -39,7 +39,7 @@ namespace cppu @return true, if successfully registered */ CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr ); + css::uno::Reference< css::container::XHierarchicalNameAccess > const & xTDMgr ); /** Bootstraps an initial component context with service manager upon information from bootstrap variables. @@ -54,7 +54,7 @@ CPPUHELPER_DLLPUBLIC sal_Bool SAL_CALL installTypeDescriptionManager( @return component context */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::uno::XComponentContext > SAL_CALL defaultBootstrap_InitialComponentContext(); @@ -72,7 +72,7 @@ defaultBootstrap_InitialComponentContext(); @param iniFile ini filename to get bootstrap variables @return component context */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::uno::XComponentContext > SAL_CALL defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile); /** @@ -133,7 +133,7 @@ private: * * @since UDK 3.2.0 */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::uno::XComponentContext > SAL_CALL bootstrap(); /// @cond INTERNAL @@ -149,7 +149,7 @@ SAL_CALL bootstrap(); * returned; expansion may lead to a string that is not a legal URI. Otherwise, * the uri is returned unchanged. * - * @exception com::sun::star::lang::IllegalArgumentException + * @exception css::lang::IllegalArgumentException * If uri is a vnd.sun.star.expand URL that contains unknown macros. * * @since UDK 3.2.8 diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx index 5d52aba68e22..767e302a5548 100644 --- a/include/cppuhelper/compbase.hxx +++ b/include/cppuhelper/compbase.hxx @@ -45,8 +45,8 @@ namespace osl { class Mutex; } namespace cppu { /** Implementation helper implementing interfaces - com::sun::star::uno::XInterface, com::sun::star::lang::XTypeProvider, and - com::sun::star::lang::XComponent. + css::uno::XInterface, css::lang::XTypeProvider, and + css::lang::XComponent. Like WeakComponentImplHelper, but does not define XComponent::add/removeEventListener. Use for classes deriving from multiple @@ -99,8 +99,8 @@ public: }; /** Implementation helper implementing interfaces - com::sun::star::uno::XInterface, com::sun::star::lang::XTypeProvider, and - com::sun::star::lang::XComponent. + css::uno::XInterface, css::lang::XTypeProvider, and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index b710eccb5cfe..998613d50f49 100644 --- a/include/cppuhelper/compbase1.hxx +++ b/include/cppuhelper/compbase1.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper1 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakComponentImplHelper1< Ifc1 > > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper1 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper1 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx index 2e9cb53570d0..66a624b94a64 100644 --- a/include/cppuhelper/compbase10.hxx +++ b/include/cppuhelper/compbase10.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper10 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper10 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper10 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx index 873fb1d1a91a..0b528a1ba8dd 100644 --- a/include/cppuhelper/compbase11.hxx +++ b/include/cppuhelper/compbase11.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper11 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper11 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper11 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx index 25222bf88318..f60ba0c268c9 100644 --- a/include/cppuhelper/compbase12.hxx +++ b/include/cppuhelper/compbase12.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper12 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper12 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, PartialWeakComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper12 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggComponentImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx index 02b7db3ec2e7..e82d1f688858 100644 --- a/include/cppuhelper/compbase2.hxx +++ b/include/cppuhelper/compbase2.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper2 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakComponentImplHelper2<Ifc1, Ifc2> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper2 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, PartialWeakComponentImplHelper2<Ifc1, Ifc2> > > {}; @@ -88,25 +88,25 @@ namespace cppu inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -121,7 +121,7 @@ namespace cppu template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper2 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggComponentImplHelper2<Ifc1, Ifc2> > > {}; @@ -129,17 +129,17 @@ namespace cppu inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx index e32deec53d5c..d05183cee60b 100644 --- a/include/cppuhelper/compbase3.hxx +++ b/include/cppuhelper/compbase3.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper3 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper3 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, PartialWeakComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper3 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggComponentImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx index de1a3b76a311..888614adae93 100644 --- a/include/cppuhelper/compbase4.hxx +++ b/include/cppuhelper/compbase4.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper4 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper4 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, PartialWeakComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper4 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggComponentImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx index 250b55740bcc..66b5e9900811 100644 --- a/include/cppuhelper/compbase5.hxx +++ b/include/cppuhelper/compbase5.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper5 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper5 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, PartialWeakComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper5 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggComponentImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx index 39c10e789a79..f117badd98a5 100644 --- a/include/cppuhelper/compbase6.hxx +++ b/include/cppuhelper/compbase6.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper6 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper6 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, PartialWeakComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper6 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggComponentImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx index 15c833005cf8..f92d4e74d3b0 100644 --- a/include/cppuhelper/compbase7.hxx +++ b/include/cppuhelper/compbase7.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper7 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper7 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, PartialWeakComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper7 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggComponentImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx index 2bbc00e242ce..9c45a53ddc5e 100644 --- a/include/cppuhelper/compbase8.hxx +++ b/include/cppuhelper/compbase8.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper8 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper8 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, PartialWeakComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; @@ -88,24 +88,24 @@ namespace cppu inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -120,7 +120,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper8 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggComponentImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; @@ -128,17 +128,17 @@ namespace cppu inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx index ac269a411b12..aff4d567bdfd 100644 --- a/include/cppuhelper/compbase9.hxx +++ b/include/cppuhelper/compbase9.hxx @@ -25,12 +25,12 @@ namespace cppu { - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. + css::uno::WeakReference. @attention The life-cycle of the passed mutex reference has to be longer than objects of this class. @@ -42,7 +42,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper9 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; @@ -50,21 +50,21 @@ namespace cppu inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; @@ -80,7 +80,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE PartialWeakComponentImplHelper9 : public WeakComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, PartialWeakComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; @@ -88,23 +88,23 @@ namespace cppu inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper supporting com::sun::star::lang::XTypeProvider and - com::sun::star::lang::XComponent. + /** Implementation helper supporting css::lang::XTypeProvider and + css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of this class can be held weakly, i.e. by a - com::sun::star::uno::WeakReference. Object of this class can be + css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -119,7 +119,7 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper9 : public WeakAggComponentImplHelperBase - , public ::com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggComponentImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; @@ -127,17 +127,17 @@ namespace cppu inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw () : WeakAggComponentImplHelperBase( rMutex ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelperBase::queryInterface( rType ); } - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { WeakAggComponentImplHelperBase::release(); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggComponentImplHelper_getTypes( cd::get() ); } - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index f902e53786c1..7c4179f96da2 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -32,11 +32,11 @@ namespace cppu { /** Implementation helper base class for components. Inherits from ::cppu::OWeakObject and - ::com::sun::star::lang::XComponent. + css::lang::XComponent. */ class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakComponentImplHelperBase : public ::cppu::OWeakObject - , public ::com::sun::star::lang::XComponent + , public css::lang::XComponent { protected: /** broadcast helper for disposing events @@ -67,29 +67,29 @@ public: inline static void SAL_CALL operator delete( void *, void * ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::lang::XEventListener > const & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::lang::XEventListener > const & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and - ::com::sun::star::lang::XComponent. + css::lang::XComponent. */ class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase : public ::cppu::OWeakAggObject - , public ::com::sun::star::lang::XComponent + , public css::lang::XComponent { protected: ::cppu::OBroadcastHelper rBHelper; @@ -112,48 +112,48 @@ public: inline static void SAL_CALL operator delete( void *, void * ) {} - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::lang::XEventListener > const & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::lang::XEventListener > const & xListener ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /** WeakComponentImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query( - ::com::sun::star::uno::Type const & rType, +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL WeakComponentImplHelper_query( + css::uno::Type const & rType, class_data * cd, void * that, ::cppu::WeakComponentImplHelperBase * pBase ); /** WeakComponentImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes( class_data * cd ); /** WeakAggComponentImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg( - ::com::sun::star::uno::Type const & rType, +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg( + css::uno::Type const & rType, class_data * cd, void * that, ::cppu::WeakAggComponentImplHelperBase * pBase ); /** WeakAggComponentImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes( +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes( class_data * cd ); } diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index ea140e453e78..0b43c488af11 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -33,9 +33,9 @@ namespace osl { class Mutex; } namespace cppu { -/** Deprecated. Helper for implementing com::sun::star::lang::XComponent. +/** Deprecated. Helper for implementing css::lang::XComponent. Upon disposing objects of this class, sub-classes receive a disposing() call. Objects of - this class can be held weakly, i.e. by a com::sun::star::uno::WeakReference. Object of + this class can be held weakly, i.e. by a css::uno::WeakReference. Object of this class can be aggregated, i.e. incoming queryInterface() calls are delegated. @attention @@ -44,8 +44,8 @@ namespace cppu */ class CPPUHELPER_DLLPUBLIC OComponentHelper : public ::cppu::OWeakAggObject - , public ::com::sun::star::lang::XTypeProvider - , public ::com::sun::star::lang::XComponent + , public css::lang::XTypeProvider + , public css::lang::XComponent { public: /** Constructor. @@ -60,12 +60,12 @@ public: virtual ~OComponentHelper(); // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() @@ -74,23 +74,23 @@ public: /** @attention XTypeProvider::getImplementationId() has to be implemented separately! */ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; /** @attention XTypeProvider::getTypes() has to be re-implemented! */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Called in dispose method after the listeners were notified. diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index 9baf861efad0..fe71106e2dbc 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -36,7 +36,7 @@ struct ContextEntry_Init { /** late init denotes a object that will be raised when first get() is calling for it - The context implementation expects either a com::sun::star::lang::XSingleComponentFactory + The context implementation expects either a css::lang::XSingleComponentFactory object as value (to instanciate the object) or a string as value for raising a service via the used service manager. */ @@ -46,7 +46,7 @@ struct ContextEntry_Init ::rtl::OUString name; /** context value */ - ::com::sun::star::uno::Any value; + css::uno::Any value; /** Default ctor. */ @@ -65,7 +65,7 @@ struct ContextEntry_Init */ inline ContextEntry_Init( ::rtl::OUString const & name_, - ::com::sun::star::uno::Any const & value_, + css::uno::Any const & value_, bool bLateInitService_ = false ) : bLateInitService( bLateInitService_ ), name( name_ ), @@ -80,11 +80,11 @@ struct ContextEntry_Init @param xDelegate delegation to further context, if value was not found @return new context object */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::uno::XComponentContext > SAL_CALL createComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xDelegate = - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ); + css::uno::Reference< css::uno::XComponentContext > const & xDelegate = + css::uno::Reference< css::uno::XComponentContext >() ); } diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx index 5aa387f7510b..3d54b59c269a 100644 --- a/include/cppuhelper/exc_hlp.hxx +++ b/include/cppuhelper/exc_hlp.hxx @@ -33,7 +33,7 @@ namespace cppu @param rExc exception to be thrown. */ -CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ); +CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const css::uno::Any & rExc ); /** Use this function to get the dynamic type of a caught C++-UNO exception; completes the above function throwing exceptions generically. @@ -43,14 +43,14 @@ CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno:: { ... } - catch (::com::sun::star::uno::RuntimeException &) + catch (css::uno::RuntimeException &) { // you ought not handle RuntimeExceptions: throw; } - catch (::com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { - ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); + css::uno::Any caught( ::cppu::getCaughtException() ); ... } @endcode @@ -84,7 +84,7 @@ CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno:: development, because the whole OOo code base is compiled using the same C++ compiler (and linking against one runtime library). */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL getCaughtException(); +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL getCaughtException(); } diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index a8b32c961885..6803c71bb6fc 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -121,9 +121,9 @@ namespace cppu @param xContext component context to be used @return component instance */ -typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( +typedef css::uno::Reference< css::uno::XInterface >( SAL_CALL * ComponentFactoryFunc)( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); /** Creates a single component factory supporting the XSingleComponentFactory interface. @@ -133,11 +133,11 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( @param pModCount a backwards-compatibility remainder of a removed library unloading feature; always set to null */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleComponentFactory > SAL_CALL createSingleComponentFactory( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, + css::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount = 0 ); /** Creates a single service factory which holds the instance created only once. @@ -150,11 +150,11 @@ SAL_CALL createSingleComponentFactory( @see createSingleComponentFactory */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFactory( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, + css::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount = 0 ); /** Deprecated. The type of the instanciate function used as argument of the create*Factory functions. @@ -163,8 +163,8 @@ createOneInstanceComponentFactory( @see createOneInstanceFactory @deprecated */ -typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SAL_CALL * ComponentInstantiation)( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager ); +typedef css::uno::Reference< css::uno::XInterface >(SAL_CALL * ComponentInstantiation)( + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager ); /** Deprecated. Creates a single service factory. @@ -180,12 +180,12 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA @see createOneInstanceFactory @deprecated */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createSingleFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rImplementationName, ComponentInstantiation pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames, + const css::uno::Sequence< ::rtl::OUString > & rServiceNames, rtl_ModuleCount * pModCount = 0 ); /** Deprecated. Creates a factory wrapping another one. @@ -202,10 +202,10 @@ createSingleFactory( @see createSingleFactory @deprecated */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createFactoryProxy( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > & rFactory ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, + const css::uno::Reference< css::lang::XSingleServiceFactory > & rFactory ); /** Deprecated. Creates a single service factory which holds the instance created only once. @@ -221,12 +221,12 @@ createFactoryProxy( @see createSingleFactory @deprecated */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createOneInstanceFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rComponentName, ComponentInstantiation pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rServiceNames, + const css::uno::Sequence< ::rtl::OUString > & rServiceNames, rtl_ModuleCount * pModCount = 0 ); /** Deprecated. Creates a single service factory based on a registry. @@ -238,11 +238,11 @@ createOneInstanceFactory( XSingleServiceFactory and XComponent. @deprecated */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rImplementationName, - const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ); + const css::uno::Reference< css::registry::XRegistryKey > & rImplementationKey ); /** Deprecated. Creates a single service factory which holds the instance created only once based on a registry. @@ -256,11 +256,11 @@ createSingleRegistryFactory( @see createSingleRegistryFactory @deprecated */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager, + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, const ::rtl::OUString & rComponentName, - const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey ); + const css::uno::Reference< css::registry::XRegistryKey > & rImplementationKey ); } diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index 7b3186c83268..37b6a1cacb14 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -74,8 +74,8 @@ template<typename Impl, typename... Ifc> struct ImplClassData { /// @endcond /** Implementation helper implementing interfaces - com::sun::star::uno::XInterface, com::sun::star::lang::XTypeProvider, and - com::sun::star::uno::XWeak (through cppu::OWeakObject). + css::uno::XInterface, css::lang::XTypeProvider, and + css::uno::XWeak (through cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as @@ -114,7 +114,7 @@ public: }; /** Implementation helper implementing interfaces - com::sun::star::uno::XInterface and com::sun::star::lang::XTypeProvider + css::uno::XInterface and css::lang::XTypeProvider inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon @@ -123,7 +123,7 @@ public: @attention The BaseClass has to be complete in the sense that - com::sun::star::uno::XInterface and com::sun::star::lang::XTypeProvider are + css::uno::XInterface and css::lang::XTypeProvider are implemented properly. @derive diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index 4180c9d63db5..6a518263c92a 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -45,7 +45,7 @@ namespace cppu { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { CPPUHELPER_DETAIL_TYPEENTRY(Ifc1), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -54,7 +54,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -64,16 +64,16 @@ namespace cppu */ template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper1 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -81,9 +81,9 @@ namespace cppu #endif ~ImplHelper1() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -96,27 +96,27 @@ namespace cppu template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT WeakImplHelper1 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -128,33 +128,33 @@ namespace cppu template< class Ifc1 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper1 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -197,9 +197,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper1() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -208,20 +208,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -265,11 +265,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper1() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -278,9 +278,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index 25477c5fff03..30af2e931534 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -55,7 +55,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc8), CPPUHELPER_DETAIL_TYPEENTRY(Ifc9), CPPUHELPER_DETAIL_TYPEENTRY(Ifc10), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -64,7 +64,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -74,16 +74,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper10 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -91,9 +91,9 @@ namespace cppu #endif ~ImplHelper10() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -102,27 +102,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper10 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -134,33 +134,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper10 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -203,9 +203,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper10() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -214,20 +214,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -271,11 +271,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper10() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -284,9 +284,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 24f3de212dfb..21ca4b1194e8 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -56,7 +56,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc9), CPPUHELPER_DETAIL_TYPEENTRY(Ifc10), CPPUHELPER_DETAIL_TYPEENTRY(Ifc11), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -65,7 +65,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -75,16 +75,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper11 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, ImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -92,9 +92,9 @@ namespace cppu #endif ~ImplHelper11() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -103,27 +103,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper11 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -135,33 +135,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper11 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData11< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, WeakAggImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -204,9 +204,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper11() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -215,20 +215,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -272,11 +272,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper11() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -285,9 +285,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index 1b977c472885..6ba5168bc5d4 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -57,7 +57,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc10), CPPUHELPER_DETAIL_TYPEENTRY(Ifc11), CPPUHELPER_DETAIL_TYPEENTRY(Ifc12), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -66,7 +66,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -76,16 +76,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper12 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -93,9 +93,9 @@ namespace cppu #endif ~ImplHelper12() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -104,27 +104,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper12 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -136,33 +136,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper12 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -205,9 +205,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper12() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -216,20 +216,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -273,11 +273,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper12() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -286,9 +286,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index b99d62cfb5cc..da99200746f9 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -58,7 +58,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc11), CPPUHELPER_DETAIL_TYPEENTRY(Ifc12), CPPUHELPER_DETAIL_TYPEENTRY(Ifc13), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -67,7 +67,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -77,16 +77,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper13 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, public Ifc13 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, ImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -94,9 +94,9 @@ namespace cppu #endif ~ImplHelper13() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -105,27 +105,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper13 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, public Ifc13 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, WeakImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -137,33 +137,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper13 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, public Ifc13 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, WeakAggImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -206,9 +206,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper13() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -217,20 +217,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -274,11 +274,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper13() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -287,9 +287,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index b76305facae3..6aa86e7ce2a7 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -46,7 +46,7 @@ namespace cppu { CPPUHELPER_DETAIL_TYPEENTRY(Ifc1), CPPUHELPER_DETAIL_TYPEENTRY(Ifc2), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -55,7 +55,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and queryInterface(), but no reference counting. @derive @@ -65,16 +65,16 @@ namespace cppu */ template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper2 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, ImplHelper2<Ifc1, Ifc2> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -82,9 +82,9 @@ namespace cppu #endif ~ImplHelper2() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -93,27 +93,27 @@ namespace cppu template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE SAL_DLLPUBLIC_EXPORT WeakImplHelper2 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakImplHelper2<Ifc1, Ifc2> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -125,33 +125,33 @@ namespace cppu template< class Ifc1, class Ifc2 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper2 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggImplHelper2<Ifc1, Ifc2> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -194,9 +194,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper2() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -205,20 +205,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -262,11 +262,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper2() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -275,9 +275,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 6f97475ea4e1..2e03cf4d2d60 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -47,7 +47,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc1), CPPUHELPER_DETAIL_TYPEENTRY(Ifc2), CPPUHELPER_DETAIL_TYPEENTRY(Ifc3), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -56,7 +56,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -66,16 +66,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper3 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, ImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -83,9 +83,9 @@ namespace cppu #endif ~ImplHelper3() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -94,27 +94,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper3 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -126,33 +126,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper3 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggImplHelper3<Ifc1, Ifc2, Ifc3> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. also has to have a default ctor. @@ -196,9 +196,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper3() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -207,20 +207,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -264,11 +264,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper3() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -277,9 +277,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index af064bd85454..0cd0881f5a66 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -49,7 +49,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc2), CPPUHELPER_DETAIL_TYPEENTRY(Ifc3), CPPUHELPER_DETAIL_TYPEENTRY(Ifc4), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -58,7 +58,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -68,16 +68,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper4 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -85,9 +85,9 @@ namespace cppu #endif ~ImplHelper4() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -96,27 +96,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper4 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -128,33 +128,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper4 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -197,9 +197,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper4() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -208,20 +208,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -265,11 +265,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper4() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -278,9 +278,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 891a09715889..de58cc44464e 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -50,7 +50,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc3), CPPUHELPER_DETAIL_TYPEENTRY(Ifc4), CPPUHELPER_DETAIL_TYPEENTRY(Ifc5), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -59,7 +59,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -69,16 +69,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper5 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, ImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -86,9 +86,9 @@ namespace cppu #endif ~ImplHelper5() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak thru ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -97,27 +97,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper5 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak thru ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak thru ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation thru ::cppu::OWeakAggObject). + (css::uno::XAggregation thru ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -129,33 +129,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper5 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -198,9 +198,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper5() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -209,20 +209,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -266,11 +266,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper5() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -279,9 +279,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 7a85bedfee91..6bc857465a58 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -51,7 +51,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc4), CPPUHELPER_DETAIL_TYPEENTRY(Ifc5), CPPUHELPER_DETAIL_TYPEENTRY(Ifc6), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -60,7 +60,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -70,16 +70,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper6 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, ImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -87,9 +87,9 @@ namespace cppu #endif ~ImplHelper6() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -98,27 +98,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper6 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -130,33 +130,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper6 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -199,9 +199,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper6() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -210,20 +210,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -267,11 +267,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper6() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -280,9 +280,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 9594a2786249..e0b5f7bafb99 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -52,7 +52,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc5), CPPUHELPER_DETAIL_TYPEENTRY(Ifc6), CPPUHELPER_DETAIL_TYPEENTRY(Ifc7), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -61,7 +61,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -71,16 +71,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper7 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, ImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -88,9 +88,9 @@ namespace cppu #endif ~ImplHelper7() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -99,27 +99,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper7 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -131,33 +131,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper7 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -200,9 +200,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper7() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -211,20 +211,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -268,11 +268,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper7() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -281,9 +281,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index d0168ea97699..6f14db5b4990 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -53,7 +53,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc6), CPPUHELPER_DETAIL_TYPEENTRY(Ifc7), CPPUHELPER_DETAIL_TYPEENTRY(Ifc8), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -62,7 +62,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -72,16 +72,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper8 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, ImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -89,9 +89,9 @@ namespace cppu #endif ~ImplHelper8() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -100,27 +100,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper8 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -132,33 +132,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper8 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -201,9 +201,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper8() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -212,20 +212,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -269,11 +269,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper8() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -282,9 +282,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index c429ba7e5401..507f2b71c9c2 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -54,7 +54,7 @@ namespace cppu CPPUHELPER_DETAIL_TYPEENTRY(Ifc7), CPPUHELPER_DETAIL_TYPEENTRY(Ifc8), CPPUHELPER_DETAIL_TYPEENTRY(Ifc9), - CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider) + CPPUHELPER_DETAIL_TYPEENTRY(css::lang::XTypeProvider) } }; return reinterpret_cast< class_data * >(&s_cd); @@ -63,7 +63,7 @@ namespace cppu /// @endcond - /** Implementation helper implementing interface com::sun::star::lang::XTypeProvider + /** Implementation helper implementing interface css::lang::XTypeProvider and method XInterface::queryInterface(), but no reference counting. @derive @@ -73,16 +73,16 @@ namespace cppu */ template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper9 - : public com::sun::star::lang::XTypeProvider + : public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, ImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_query( rType, cd::get(), this ); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } #if !defined _MSC_VER // public -> protected changes mangled names there @@ -90,9 +90,9 @@ namespace cppu #endif ~ImplHelper9() throw () {} }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakObject). @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). @@ -101,27 +101,27 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper9 : public OWeakObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface which supports weak mechanism to be held weakly - (supporting com::sun::star::uno::XWeak through ::cppu::OWeakAggObject). + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface which supports weak mechanism to be held weakly + (supporting css::uno::XWeak through ::cppu::OWeakAggObject). In addition, it supports also aggregation meaning object of this class can be aggregated - (com::sun::star::uno::XAggregation through ::cppu::OWeakAggObject). + (css::uno::XAggregation through ::cppu::OWeakAggObject). If a delegator is set (this object is aggregated), then incoming queryInterface() calls are delegated to the delegator object. If the delegator does not support the demanded interface, it calls queryAggregation() on its aggregated objects. @@ -133,33 +133,33 @@ namespace cppu template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 > class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper9 : public OWeakAggObject - , public com::sun::star::lang::XTypeProvider + , public css::lang::XTypeProvider , public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9 { struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {}; public: - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); } virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { OWeakAggObject::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return WeakAggImplHelper_getTypes( cd::get() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface - and com::sun::star::lang::XTypeProvider are implemented properly. The + The BaseClass has to be complete in a sense, that css::uno::XInterface + and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -202,9 +202,9 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: ImplInheritanceHelper9() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryInterface( rType ); @@ -213,20 +213,20 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; - /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and - com::sun::star::uno::XInterface inherting from a BaseClass. + /** Implementation helper implementing interfaces css::lang::XTypeProvider and + css::uno::XInterface inherting from a BaseClass. All acquire(), release() and queryInterface() calls are delegated to the BaseClass. Upon queryAggregation(), if a demanded interface is not supported by this class directly, the request is delegated to the BaseClass. @attention - The BaseClass has to be complete in a sense, that com::sun::star::uno::XInterface, - com::sun::star::uno::XAggregation and com::sun::star::lang::XTypeProvider + The BaseClass has to be complete in a sense, that css::uno::XInterface, + css::uno::XAggregation and css::lang::XTypeProvider are implemented properly. The BaseClass must have at least one ctor that can be called with six or fewer arguments, of which none is of non-const reference type. @@ -270,11 +270,11 @@ namespace cppu BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {} public: AggImplInheritanceHelper9() {} - virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return BaseClass::queryInterface( rType ); } - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE { - com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) ); if (aRet.hasValue()) return aRet; return BaseClass::queryAggregation( rType ); @@ -283,9 +283,9 @@ namespace cppu { BaseClass::acquire(); } virtual void SAL_CALL release() throw () SAL_OVERRIDE { BaseClass::release(); } - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE { return ImplHelper_getImplementationId( cd::get() ); } }; } diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index e2335fb6f326..ce8dfacd0647 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -42,7 +42,7 @@ namespace cppu /** function pointer signature for getCppuType */ -typedef ::com::sun::star::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ); +typedef css::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ); /** single type + object offset */ @@ -94,57 +94,57 @@ struct class_data /** ImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_query( - ::com::sun::star::uno::Type const & rType, +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL ImplHelper_query( + css::uno::Type const & rType, class_data * cd, void * that ); /** ImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface( - ::com::sun::star::uno::Type const & rType, +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL ImplHelper_queryNoXInterface( + css::uno::Type const & rType, class_data * cd, void * that ); /** ImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL ImplHelper_getTypes( class_data * cd ); /** ImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL ImplInhHelper_getTypes( class_data * cd, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > const & rAddTypes ); + css::uno::Sequence< css::uno::Type > const & rAddTypes ); /** ImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > +CPPUHELPER_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL ImplHelper_getImplementationId( class_data * cd ); /** WeakImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query( - ::com::sun::star::uno::Type const & rType, +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL WeakImplHelper_query( + css::uno::Type const & rType, class_data * cd, void * that, ::cppu::OWeakObject * pBase ); /** WeakImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL WeakImplHelper_getTypes( class_data * cd ); /** WeakAggImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any +CPPUHELPER_DLLPUBLIC css::uno::Any SAL_CALL WeakAggImplHelper_queryAgg( - ::com::sun::star::uno::Type const & rType, + css::uno::Type const & rType, class_data * cd, void * that, ::cppu::OWeakAggObject * pBase ); /** WeakAggImplHelper */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > +CPPUHELPER_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL WeakAggImplHelper_getTypes( class_data * cd ); diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx index 8db5ce1b9899..f244f3aa6f86 100644 --- a/include/cppuhelper/implbase_ex_post.hxx +++ b/include/cppuhelper/implbase_ex_post.hxx @@ -27,7 +27,7 @@ N +1, sal_False, sal_False, \ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, \ { \ __IFC_EX_TYPE_INIT##N( class_cast ), \ -__IFC_EX_TYPE_INIT_NAME( class_cast, ::com::sun::star::lang::XTypeProvider ) \ +__IFC_EX_TYPE_INIT_NAME( class_cast, css::lang::XTypeProvider ) \ } \ } @@ -44,16 +44,16 @@ struct class_data##N \ }; \ template< __CLASS_IFC##N > \ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper##N \ - : public ::com::sun::star::lang::XTypeProvider \ + : public css::lang::XTypeProvider \ , __PUBLIC_IFC##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_query( rType, (class_data *)&s_cd, this ); } \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -62,20 +62,20 @@ __DEF_CLASS_DATA_INIT_EX( N, (ImplHelper##N< __IFC##N > *) ); \ template< __CLASS_IFC##N > \ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper##N \ : public OWeakObject \ - , public ::com::sun::star::lang::XTypeProvider \ + , public css::lang::XTypeProvider \ , __PUBLIC_IFC##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakImplHelper_query( rType, (class_data *)&s_cd, this, static_cast<OWeakObject *>(this) ); } \ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakObject::acquire(); } \ virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakObject::release(); } \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -84,22 +84,22 @@ __DEF_CLASS_DATA_INIT_EX( N, (WeakImplHelper##N< __IFC##N > *) ); \ template< __CLASS_IFC##N > \ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper##N \ : public OWeakAggObject \ - , public ::com::sun::star::lang::XTypeProvider \ + , public css::lang::XTypeProvider \ , __PUBLIC_IFC##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return OWeakAggObject::queryInterface( rType ); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakAggImplHelper_queryAgg( rType, (class_data *)&s_cd, this, static_cast<OWeakAggObject *>(this) ); } \ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakAggObject::acquire(); } \ virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakAggObject::release(); } \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakAggImplHelper_getTypes( (class_data *)&s_cd ); } \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -112,9 +112,9 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplInheritanceHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ if (aRet.hasValue()) \ return aRet; \ return BaseClass::queryInterface( rType ); \ @@ -123,9 +123,9 @@ public: \ { BaseClass::acquire(); } \ virtual void SAL_CALL release() throw () \ { BaseClass::release(); } \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< class BaseClass, __CLASS_IFC##N > \ @@ -138,11 +138,11 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE AggImplInheritanceHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ { return BaseClass::queryInterface( rType ); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) \ { \ - ::com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ + css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, (class_data *)&s_cd, this ) ); \ if (aRet.hasValue()) \ return aRet; \ return BaseClass::queryAggregation( rType ); \ @@ -151,9 +151,9 @@ public: \ { BaseClass::acquire(); } \ virtual void SAL_CALL release() throw () \ { BaseClass::release(); } \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< class BaseClass, __CLASS_IFC##N > \ diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx index 533b729b22e2..d2d4bd6ab62c 100644 --- a/include/cppuhelper/implementationentry.hxx +++ b/include/cppuhelper/implementationentry.hxx @@ -51,18 +51,18 @@ struct ImplementationEntry /** Function that returns all supported servicenames of the implementation ( same as XServiceInfo.getSupportedServiceNames() ). */ - com::sun::star::uno::Sequence< rtl::OUString > MY_FN_PTR( getSupportedServiceNames ) (); + css::uno::Sequence< rtl::OUString > MY_FN_PTR( getSupportedServiceNames ) (); /** Function that creates a SingleComponentFactory. The pModCount parameter is a backwards-compatibility remainder of a removed library unloading feature; always set to null. */ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > + css::uno::Reference< css::lang::XSingleComponentFactory > MY_FN_PTR( createFactory )( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, + css::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount ); /** Backwards-compatibility remainder of a removed library unloading diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 458993ca844d..b1200c0e8f77 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -47,8 +47,8 @@ namespace detail { */ union element_alias { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > *pAsSequence; - ::com::sun::star::uno::XInterface * pAsInterface; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > *pAsSequence; + css::uno::XInterface * pAsInterface; element_alias() : pAsInterface(0) {} }; @@ -93,7 +93,7 @@ public: hasMoreElements() has returned false, is an error. Cast the returned pointer to the */ - ::com::sun::star::uno::XInterface * SAL_CALL next(); + css::uno::XInterface * SAL_CALL next(); /** Removes the current element (the last one returned by next()) from the underlying container. Calling this method before @@ -158,7 +158,7 @@ public: /** Return all interfaces added to this container. **/ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElements() const; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getElements() const; /** Inserts an element into the container. The position is not specified, thus it is not specified in which order events are fired. @@ -176,7 +176,7 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL addInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ); + sal_Int32 SAL_CALL addInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Removes an element from the container. It uses interface equality to remove the interface. @param rxIFace @@ -184,12 +184,12 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL removeInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ); + sal_Int32 SAL_CALL removeInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ); + void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt ); /** Clears the container without calling disposing(). */ @@ -198,13 +198,13 @@ public: /** Executes a functor for each contained listener of specified type, e.g. <code>forEach<awt::XPaintListener>(...</code>. - If a com::sun::star::lang::DisposedException occurs which relates to + If a css::lang::DisposedException occurs which relates to the called listener, then that listener is removed from the container. @tparam ListenerT listener type @tparam FuncT unary functor type, let your compiler deduce this for you @param func unary functor object expecting an argument of type - com::sun::star::uno::Reference<ListenerT> + css::uno::Reference<ListenerT> */ template <typename ListenerT, typename FuncT> inline void forEach( FuncT const& func ); @@ -214,7 +214,7 @@ public: The listener method must take a single argument of type EventT, and return <code>void</code>. - If a com::sun::star::lang::DisposedException occurs which relates to + If a css::lang::DisposedException occurs which relates to the called listener, then that listener is removed from the container. @tparam ListenerT UNO event listener type, let your compiler deduce this for you @@ -268,7 +268,7 @@ private: public: NotifySingleListener( NotificationMethod method, const EventT& event ) : m_pMethod( method ), m_rEvent( event ) { } - void operator()( const ::com::sun::star::uno::Reference<ListenerT>& listener ) const + void operator()( const css::uno::Reference<ListenerT>& listener ) const { (listener.get()->*m_pMethod)( m_rEvent ); } @@ -280,13 +280,12 @@ inline void OInterfaceContainerHelper::forEach( FuncT const& func ) { OInterfaceIteratorHelper iter( *this ); while (iter.hasMoreElements()) { - ::com::sun::star::uno::Reference<ListenerT> const xListener( - iter.next(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference<ListenerT> const xListener( iter.next(), css::uno::UNO_QUERY ); if (xListener.is()) { try { func( xListener ); } - catch (::com::sun::star::lang::DisposedException const& exc) { + catch (css::lang::DisposedException const& exc) { if (exc.Context == xListener) iter.remove(); } @@ -337,7 +336,7 @@ public: /** Return all id's under which at least one interface is added. */ - inline ::com::sun::star::uno::Sequence< key > SAL_CALL getContainedTypes() const; + inline css::uno::Sequence< key > SAL_CALL getContainedTypes() const; /** Return the container created under this key. @@ -367,7 +366,7 @@ public: */ inline sal_Int32 SAL_CALL addInterface( const key & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ); + const css::uno::Reference< css::uno::XInterface > & r ); /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. @@ -381,14 +380,14 @@ public: */ inline sal_Int32 SAL_CALL removeInterface( const key & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ); + const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Call disposing on all references in the container, that support XEventListener. Then clears the container. @param rEvt the event object which is passed during disposing() call */ - inline void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ); + inline void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt ); /** Remove all elements of all containers. Does not delete the container. */ @@ -459,7 +458,7 @@ struct OBroadcastHelperVar **/ inline void addListener( const keyType &key, - const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > &r ) + const css::uno::Reference < css::uno::XInterface > &r ) { ::osl::MutexGuard guard( rMutex ); OSL_ENSURE( !bInDispose, "do not add listeners in the dispose call" ); @@ -473,7 +472,7 @@ struct OBroadcastHelperVar **/ inline void removeListener( const keyType &key, - const ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > & r ) + const css::uno::Reference < css::uno::XInterface > & r ) { ::osl::MutexGuard guard( rMutex ); OSL_ENSURE( !bDisposed, "object is disposed" ); @@ -501,12 +500,12 @@ struct OBroadcastHelperVar // helper function call class struct hashType_Impl { - size_t operator()(const ::com::sun::star::uno::Type & s) const + size_t operator()(const css::uno::Type & s) const { return (size_t) s.getTypeName().hashCode(); } }; -/** Specialized class for key type com::sun::star::uno::Type, +/** Specialized class for key type css::uno::Type, without explicit usage of STL symbols. */ class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper @@ -538,14 +537,14 @@ public: /** Return all id's under which at least one interface is added. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getContainedTypes() const; + css::uno::Sequence< css::uno::Type > SAL_CALL getContainedTypes() const; /** Return the container created under this key. @return the container created under this key. If the container was not created, null was returned. */ - OInterfaceContainerHelper * SAL_CALL getContainer( const ::com::sun::star::uno::Type & rKey ) const; + OInterfaceContainerHelper * SAL_CALL getContainer( const css::uno::Type & rKey ) const; /** Inserts an element into the container with the specified key. The position is not specified, thus it is not specified in which order events are fired. @@ -566,8 +565,8 @@ public: the new count of elements in the container */ sal_Int32 SAL_CALL addInterface( - const ::com::sun::star::uno::Type & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ); + const css::uno::Type & rKey, + const css::uno::Reference< css::uno::XInterface > & r ); /** Removes an element from the container with the specified key. It uses interface equality to remove the interface. @@ -580,22 +579,22 @@ public: the new count of elements in the container */ sal_Int32 SAL_CALL removeInterface( - const ::com::sun::star::uno::Type & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ); + const css::uno::Type & rKey, + const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ); + void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt ); /** Remove all elements of all containers. Does not delete the container. */ void SAL_CALL clear(); - typedef ::com::sun::star::uno::Type keyType; + typedef css::uno::Type keyType; private: - void *m_pMap; + void * m_pMap; ::osl::Mutex & rMutex; OMultiTypeInterfaceContainerHelper( const OMultiTypeInterfaceContainerHelper & ) SAL_DELETED_FUNCTION; diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx index ac89d619773b..a87bdccc74cd 100644 --- a/include/cppuhelper/interfacecontainer.hxx +++ b/include/cppuhelper/interfacecontainer.hxx @@ -50,13 +50,13 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMu template< class key , class hashImpl , class equalImpl > -inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const +inline css::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const { ::osl::MutexGuard aGuard( rMutex ); typename InterfaceMap::size_type nSize = m_pMap->size(); if( nSize != 0 ) { - ::com::sun::star::uno::Sequence< key > aInterfaceTypes( nSize ); + css::uno::Sequence< key > aInterfaceTypes( nSize ); key * pArray = aInterfaceTypes.getArray(); typename InterfaceMap::iterator iter = m_pMap->begin(); @@ -73,11 +73,11 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper } if( i != nSize ) { // may be empty container, reduce the sequence to the right size - aInterfaceTypes = ::com::sun::star::uno::Sequence<key>( pArray, i ); + aInterfaceTypes = css::uno::Sequence<key>( pArray, i ); } return aInterfaceTypes; } - return ::com::sun::star::uno::Sequence<key>(); + return css::uno::Sequence<key>(); } @@ -97,7 +97,7 @@ OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperVar< key , hashImp template< class key , class hashImpl , class equalImpl > sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::addInterface( const key & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) + const css::uno::Reference< css::uno::XInterface > & rListener ) { ::osl::MutexGuard aGuard( rMutex ); typename InterfaceMap::iterator iter = find( rKey ); @@ -115,7 +115,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::a template< class key , class hashImpl , class equalImpl > inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::removeInterface( const key & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rListener ) + const css::uno::Reference< css::uno::XInterface > & rListener ) { ::osl::MutexGuard aGuard( rMutex ); @@ -132,7 +132,7 @@ inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalIm template< class key , class hashImpl , class equalImpl > void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::disposeAndClear( - const ::com::sun::star::lang::EventObject & rEvt ) + const css::lang::EventObject & rEvt ) { typename InterfaceMap::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 56a5a17d6eb6..0320da13cc21 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -85,9 +85,9 @@ template< typename T > class PropertySetMixin; #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif class CPPUHELPER_DLLPUBLIC PropertySetMixinImpl: - public com::sun::star::beans::XPropertySet, - public com::sun::star::beans::XFastPropertySet, - public com::sun::star::beans::XPropertyAccess + public css::beans::XPropertySet, + public css::beans::XFastPropertySet, + public css::beans::XPropertyAccess { protected: /** @@ -98,20 +98,20 @@ protected: enum Implements { /** @short Flag specifying that the UNO interface type - <code>com::sun::star::beans::XPropertySet</code> shall be supported. + <code>css::beans::XPropertySet</code> shall be supported. */ IMPLEMENTS_PROPERTY_SET = 1, /** @short Flag specifying that the UNO interface type - <code>com::sun::star::beans::XFastPropertySet</code> shall be + <code>css::beans::XFastPropertySet</code> shall be supported. */ IMPLEMENTS_FAST_PROPERTY_SET = 2, /** @short Flag specifying that the UNO interface type - <code>com::sun::star::beans::XPropertyAccess</code> shall be + <code>css::beans::XPropertyAccess</code> shall be supported. */ IMPLEMENTS_PROPERTY_ACCESS = 4 @@ -147,9 +147,9 @@ protected: /** @short Notifies any - <code>com::sun::star::beans::XPropertyChangeListener</code>s. + <code>css::beans::XPropertyChangeListener</code>s. - May throw <code>com::sun::star::uno::RuntimeException</code> + May throw <code>css::uno::RuntimeException</code> and <code>std::bad_alloc</code>. See <code>cppu::PropertySetMixinImpl::prepareSet</code> @@ -174,14 +174,14 @@ protected: First, this function checks whether this instance has already been disposed (see <code>cppu::PropertySetMixinImpl::dispose</code>), - and throws a <code>com::sun::star::lang::DisposedException</code> if + and throws a <code>css::lang::DisposedException</code> if applicable. For a constrained attribute (whose setter can explicitly - raise <code>com::sun::star::beans::PropertyVetoException</code>), this + raise <code>css::beans::PropertyVetoException</code>), this function notifies any - <code>com::sun::star::beans::XVetoableChangeListener</code>s. For a + <code>css::beans::XVetoableChangeListener</code>s. For a bound attribute, this function modifies the passed-in <code>boundListeners</code> so that it can afterwards be used to notify - any <code>com::sun::star::beans::XPropertyChangeListener</code>s. This + any <code>css::beans::XPropertyChangeListener</code>s. This function should be called before storing the new attribute value, and <code>boundListeners->notify()</code> should be called exactly once after storing the new attribute value (in case the attribute is bound; @@ -190,9 +190,9 @@ protected: to be called from the same thread. May throw - <code>com::sun::star::beans::PropertyVetoException</code>, - <code>com::sun::star::uno::RuntimeException</code> (and - <code>com::sun::star::lang::DisposedException</code> in particular), and + <code>css::beans::PropertyVetoException</code>, + <code>css::uno::RuntimeException</code> (and + <code>css::lang::DisposedException</code> in particular), and <code>std::bad_alloc</code>. @param propertyName the name of the property (which is the same as the @@ -200,24 +200,24 @@ protected: @param oldValue the property value corresponding to the old attribute value. This is only used as - <code>com::sun::star::beans::PropertyChangeEvent::OldValue</code>, which + <code>css::beans::PropertyChangeEvent::OldValue</code>, which is rather useless, anyway (see “Using the Observer Pattern” in <a href="http://tools.openoffice.org/CodingGuidelines.sxw"> OpenOffice.org Coding Guidelines</a>). If the attribute that is going to be set is neither bound nor constrained, or if - <code>com::sun::star::beans::PropertyChangeEvent::OldValue</code> should + <code>css::beans::PropertyChangeEvent::OldValue</code> should not be set, a <code>VOID</code> <code>Any</code> can be used instead. @param newValue the property value corresponding to the new attribute value. This is only used as - <code>com::sun::star::beans::PropertyChangeEvent::NewValue</code>, which + <code>css::beans::PropertyChangeEvent::NewValue</code>, which is rather useless, anyway (see “Using the Observer Pattern” in <a href="http://tools.openoffice.org/CodingGuidelines.sxw"> OpenOffice.org Coding Guidelines</a>), <em>unless</em> the attribute that is going to be set is constrained. If the attribute that is going to be set is neither bound nor constrained, or if it is only bound but - <code>com::sun::star::beans::PropertyChangeEvent::NewValue</code> should + <code>css::beans::PropertyChangeEvent::NewValue</code> should not be set, a <code>VOID</code> <code>Any</code> can be used instead. @param boundListeners a pointer to a fresh @@ -228,22 +228,22 @@ protected: */ void prepareSet( rtl::OUString const & propertyName, - com::sun::star::uno::Any const & oldValue, - com::sun::star::uno::Any const & newValue, + css::uno::Any const & oldValue, + css::uno::Any const & newValue, BoundListeners * boundListeners); /** @short Mark this instance as being disposed. - See <code>com::sun::star::lang::XComponent</code> for the general + See <code>css::lang::XComponent</code> for the general concept of disposing UNO objects. On the first call to this function, all registered listeners - (<code>com::sun::star::beans::XPropertyChangeListener</code>s and - <code>com::sun::star::beans::XVetoableChangeListener</code>s) are + (<code>css::beans::XPropertyChangeListener</code>s and + <code>css::beans::XVetoableChangeListener</code>s) are notified of the disposing source. Any subsequent calls to this function are ignored. - May throw <code>com::sun::star::uno::RuntimeException</code> and + May throw <code>css::uno::RuntimeException</code> and <code>std::bad_alloc</code>. */ void dispose(); @@ -251,146 +251,140 @@ protected: /** @short A function used by subclasses of <code>cppu::PropertySetMixin</code> when implementing - <code>com::sun::star::uno::XInterface::queryInterface</code>. + <code>css::uno::XInterface::queryInterface</code>. This function checks for support of any of the UNO interface types specified in the call of the <code>cppu::PropertySetMixin</code> constructor. It does not check for any other UNO interface types (not - even for <code>com::sun::star::uno::XInterface</code>), and should not + even for <code>css::uno::XInterface</code>), and should not be used directly as the implementation of - <code>com::sun::star::uno::XInterface::queryInterface</code> of this UNO + <code>css::uno::XInterface::queryInterface</code> of this UNO object. */ - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - com::sun::star::uno::Type const & type) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & type) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertySet::getPropertySetInfo - virtual - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // @see css::beans::XPropertySet::getPropertySetInfo + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertySet::setPropertyValue + // @see css::beans::XPropertySet::setPropertyValue virtual void SAL_CALL setPropertyValue( rtl::OUString const & propertyName, - com::sun::star::uno::Any const & value) + css::uno::Any const & value) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::PropertyVetoException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // @see com::sun::star::beans::XPropertySet::getPropertyValue - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( + css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // @see css::beans::XPropertySet::getPropertyValue + virtual css::uno::Any SAL_CALL getPropertyValue( rtl::OUString const & propertyName) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @short Adds a - <code>com::sun::star::beans::XPropertyChangeListener</code>. + <code>css::beans::XPropertyChangeListener</code>. If a listener is added more than once, it will receive all relevant notifications multiple times. - @see com::sun::star::beans::XPropertySet::addPropertyChangeListener + @see css::beans::XPropertySet::addPropertyChangeListener */ virtual void SAL_CALL addPropertyChangeListener( rtl::OUString const & propertyName, - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertyChangeListener > const & listener) + css::uno::Reference< + css::beans::XPropertyChangeListener > const & listener) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertySet::removePropertyChangeListener + // @see css::beans::XPropertySet::removePropertyChangeListener virtual void SAL_CALL removePropertyChangeListener( rtl::OUString const & propertyName, - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertyChangeListener > const & listener) + css::uno::Reference< + css::beans::XPropertyChangeListener > const & listener) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** @short Adds a - <code>com::sun::star::beans::XVetoableChangeListener</code>. + <code>css::beans::XVetoableChangeListener</code>. If a listener is added more than once, it will receive all relevant notifications multiple times. - @see com::sun::star::beans::XPropertySet::addVetoableChangeListener + @see css::beans::XPropertySet::addVetoableChangeListener */ virtual void SAL_CALL addVetoableChangeListener( rtl::OUString const & propertyName, - com::sun::star::uno::Reference< - com::sun::star::beans::XVetoableChangeListener > const & listener) + css::uno::Reference< + css::beans::XVetoableChangeListener > const & listener) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertySet::removeVetoableChangeListener + // @see css::beans::XPropertySet::removeVetoableChangeListener virtual void SAL_CALL removeVetoableChangeListener( rtl::OUString const & propertyName, - com::sun::star::uno::Reference< - com::sun::star::beans::XVetoableChangeListener > const & listener) + css::uno::Reference< + css::beans::XVetoableChangeListener > const & listener) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XFastPropertySet::setFastPropertyValue + // @see css::beans::XFastPropertySet::setFastPropertyValue virtual void SAL_CALL setFastPropertyValue( - sal_Int32 handle, com::sun::star::uno::Any const & value) + sal_Int32 handle, css::uno::Any const & value) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::PropertyVetoException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // @see com::sun::star::beans::XFastPropertySet::getFastPropertyValue - virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue( + css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // @see css::beans::XFastPropertySet::getFastPropertyValue + virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 handle) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertyAccess::getPropertyValues - virtual - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // @see css::beans::XPropertyAccess::getPropertyValues + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // @see com::sun::star::beans::XPropertyAccess::setPropertyValues + // @see css::beans::XPropertyAccess::setPropertyValues virtual void SAL_CALL setPropertyValues( - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - const & props) + css::uno::Sequence< css::beans::PropertyValue > const & props) throw ( - com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::PropertyVetoException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PropertySetMixinImpl( const PropertySetMixinImpl&) SAL_DELETED_FUNCTION; void operator=( const PropertySetMixinImpl&) SAL_DELETED_FUNCTION; PropertySetMixinImpl( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context, + css::uno::Reference< css::uno::XComponentContext > const & context, Implements implements, - com::sun::star::uno::Sequence< rtl::OUString > const & absentOptional, - com::sun::star::uno::Type const & type); + css::uno::Sequence< rtl::OUString > const & absentOptional, + css::uno::Type const & type); class Impl; Impl * m_impl; @@ -420,7 +414,7 @@ protected: /** @short The constructor. - May throw <code>com::sun::star::uno::RuntimeException</code> and + May throw <code>css::uno::RuntimeException</code> and <code>std::bad_alloc</code>. @param context the component context used by this class template; must @@ -433,35 +427,34 @@ protected: @param absentOptional a list of optional properties that are not present, and should thus not be visible via - <code>com::sun::star::beans::XPropertySet::getPropertySetInfo</code>, - <code>com::sun::star::beans::XPropertySet::addPropertyChangeListener<!-- - --></code>, <code>com::sun::star::beans::XPropertySet::<!-- + <code>css::beans::XPropertySet::getPropertySetInfo</code>, + <code>css::beans::XPropertySet::addPropertyChangeListener<!-- + --></code>, <code>css::beans::XPropertySet::<!-- -->removePropertyChangeListener</code>, - <code>com::sun::star::beans::XPropertySet::addVetoableChangeListener<!-- - --></code>, and <code>com::sun::star::beans::XPropertySet::<!-- + <code>css::beans::XPropertySet::addVetoableChangeListener<!-- + --></code>, and <code>css::beans::XPropertySet::<!-- -->removeVetoableChangeListener</code>. For consistency reasons, the given <code>absentOptional</code> should only contain the names of attributes that represent optional properties that are not present (that is, the attribute getters and setters always throw a - <code>com::sun::star::beans::UnknownPropertyException</code>), and should + <code>css::beans::UnknownPropertyException</code>), and should contain each such name only once. If an optional property is not present (that is, the corresponding attribute getter and setter always throw a - <code>com::sun::star::beans::UnknownPropertyException</code>) but is not + <code>css::beans::UnknownPropertyException</code>) but is not contained in the given <code>absentOptional</code>, then it will be visible via - <code>com::sun::star::beans::XPropertySet::getPropertySetInfo</code> as a - <code>com::sun::star::beans::Property</code> with a set - <code>com::sun::star::beans::PropertyAttribute::OPTIONAL</code>. If the + <code>css::beans::XPropertySet::getPropertySetInfo</code> as a + <code>css::beans::Property</code> with a set + <code>css::beans::PropertyAttribute::OPTIONAL</code>. If the given <code>implements</code> specifies that - <code>com::sun::star::beans::XPropertySet</code> is not supported, then + <code>css::beans::XPropertySet</code> is not supported, then the given <code>absentOptional</code> is effectively ignored and can be empty. */ PropertySetMixin( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context, + css::uno::Reference< css::uno::XComponentContext > const & context, Implements implements, - com::sun::star::uno::Sequence< rtl::OUString > const & absentOptional): + css::uno::Sequence< rtl::OUString > const & absentOptional): PropertySetMixinImpl( context, implements, absentOptional, T::static_type()) {} diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index d7a641561c14..792cbe29c9c5 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -77,15 +77,15 @@ public: /** Return the sequence of properties. The sequence is sorted by name. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() = 0; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() = 0; /** Return the property with the name rPropertyName. @param rPropertyName the name of the property. @exception UnknownPropertyException thrown if the property name is unknown. */ - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( + virtual css::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& rPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException) = 0; + throw (css::beans::UnknownPropertyException) = 0; /** Return true if the property with the name rPropertyName exist, otherwise false. @param rPropertyName the name of the property. @@ -103,7 +103,7 @@ public: indicates an unknown property name. */ virtual sal_Int32 SAL_CALL fillHandles( - /*out*/ sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ) = 0; + /*out*/ sal_Int32 * pHandles, const css::uno::Sequence< ::rtl::OUString > & rPropNames ) = 0; }; /** @@ -122,7 +122,7 @@ public: @param bSorted indicates that the elements are sorted. *********/ OPropertyArrayHelper( - ::com::sun::star::beans::Property *pProps, + css::beans::Property *pProps, sal_Int32 nElements , sal_Bool bSorted = sal_True ); @@ -133,7 +133,7 @@ public: @param bSorted indicates that the elements are sorted. */ OPropertyArrayHelper( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > & aProps, + const css::uno::Sequence< css::beans::Property > & aProps, sal_Bool bSorted = sal_True ); /** @@ -157,15 +157,15 @@ public: /** Return the sequence of properties. The sequence is sorted by name. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() SAL_OVERRIDE; /** Return the property with the name rPropertyName. @param rPropertyName the name of the property. @exception UnknownPropertyException thrown if the property name is unknown. */ - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( + virtual css::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& rPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + throw (css::beans::UnknownPropertyException) SAL_OVERRIDE; /** Return true if the property with the name rPropertyName exist, otherwise false. @param rPropertyName the name of the property. @@ -183,7 +183,7 @@ public: indicates an unknown property name. */ virtual sal_Int32 SAL_CALL fillHandles( - /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames ) SAL_OVERRIDE; + /*out*/sal_Int32 * pHandles, const css::uno::Sequence< ::rtl::OUString > & rPropNames ) SAL_OVERRIDE; protected: /** reserved for future use. do not use. @@ -194,7 +194,7 @@ private: void init( sal_Bool bSorted ); /** The sequence generated from the pProperties array. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aInfos; + css::uno::Sequence< css::beans::Property > aInfos; /** True, If the values of the handles are sorted in the same way as the names @@ -250,7 +250,7 @@ public: /** Return all id's under which at least one interface is added. */ - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getContainedTypes() const; + css::uno::Sequence< sal_Int32 > SAL_CALL getContainedTypes() const; /** Return the container created under this key. @@ -268,7 +268,7 @@ public: */ sal_Int32 SAL_CALL addInterface( const sal_Int32 & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & r ); + const css::uno::Reference< css::uno::XInterface > & r ); /** Remove an element from the container specified with the key. @@ -279,13 +279,13 @@ public: */ sal_Int32 SAL_CALL removeInterface( const sal_Int32 & rKey, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rxIFace ); + const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Call disposing on all objects in the container that support XEventListener. Then clear the container. */ - void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ); + void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt ); /** Remove all elements of all containers. Does not delete the container. */ @@ -293,7 +293,7 @@ public: typedef sal_Int32 keyType; private: - void *m_pMap; + void * m_pMap; ::osl::Mutex & rMutex; OMultiTypeInterfaceContainerHelperInt32( const OMultiTypeInterfaceContainerHelperInt32 & ) SAL_DELETED_FUNCTION; @@ -356,9 +356,9 @@ protected: */ class CPPUHELPER_DLLPUBLIC OPropertySetHelper : - public ::com::sun::star::beans::XMultiPropertySet, - public ::com::sun::star::beans::XFastPropertySet, - public ::com::sun::star::beans::XPropertySet + public css::beans::XMultiPropertySet, + public css::beans::XFastPropertySet, + public css::beans::XPropertySet { public: /** @@ -420,13 +420,13 @@ public: Only returns a reference to XMultiPropertySet, XFastPropertySet, XPropertySet and XEventListener. */ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** eases implementing XTypeProvider::getTypes, returns the types of XMultiPropertySet, XFastPropertySet, XPropertySet */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getTypes() - throw(::com::sun::star::uno::RuntimeException); + css::uno::Sequence< css::uno::Type > getTypes() + throw(css::uno::RuntimeException); /** Send a disposing notification to the listeners in the conatiners aBoundLC @@ -441,37 +441,37 @@ public: rPropertyName does not exist or is readonly. Otherwise rPropertyName is changed to its handle value and setFastPropertyValue is called. */ - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Throw UnknownPropertyException if the property with the name rPropertyName does not exist. */ - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not bound. */ virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not bound. */ virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertyChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference < css::beans::XPropertyChangeListener >& aListener) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not constrained. */ virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Ignored if the property is not constrained. */ virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Throw UnknownPropertyException or PropertyVetoException if the property with the name @@ -480,44 +480,44 @@ public: is changed with the setFastPropertyValue_NoBroadcast method and the bound listeners are notified. */ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** - @exception com::sun::star::beans::UnknownPropertyException + @exception css::beans::UnknownPropertyException if the property with the handle nHandle does not exist. */ - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Sequence< ::rtl::OUString >& PropertyNames, + const css::uno::Sequence< css::uno::Any >& Values ) + throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( + const css::uno::Sequence< ::rtl::OUString >& PropertyNames ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Sequence< ::rtl::OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertiesChangeListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > & Listener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Sequence< ::rtl::OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener > & Listener ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The property sequence is created in the call. The interface isn't used after the call. */ - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + static css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( IPropertyArrayHelper & rProperties ); protected: /** @@ -531,8 +531,8 @@ protected: */ void SAL_CALL fire( sal_Int32 * pnHandles, - const ::com::sun::star::uno::Any * pNewValues, - const ::com::sun::star::uno::Any * pOldValues, + const css::uno::Any * pNewValues, + const css::uno::Any * pOldValues, sal_Int32 nCount, sal_Bool bVetoable ); @@ -548,7 +548,7 @@ protected: void SAL_CALL setFastPropertyValues( sal_Int32 nSeqLen, sal_Int32 * pHandles, - const ::com::sun::star::uno::Any * pValues, + const css::uno::Any * pValues, sal_Int32 nHitCount ); /** @@ -570,10 +570,10 @@ protected: @return true if the value converted. */ virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) + const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) = 0; @@ -585,11 +585,11 @@ protected: @attention Although you are permitted to throw any UNO exception, only the following are valid for usage: - -- com::sun::star::beans::UnknownPropertyException - -- com::sun::star::beans::PropertyVetoException - -- com::sun::star::lang::IllegalArgumentException - -- com::sun::star::lang::WrappedTargetException - -- com::sun::star::uno::RuntimeException + -- css::beans::UnknownPropertyException + -- css::beans::PropertyVetoException + -- css::lang::IllegalArgumentException + -- css::lang::WrappedTargetException + -- css::uno::RuntimeException @param nHandle handle @@ -598,8 +598,8 @@ protected: */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) = 0; /** The same as getFastProperyValue, but return the value through rValue and nHandle @@ -607,7 +607,7 @@ protected: The method is not implemented in this class. */ virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const = 0; /** sets an dependent property's value @@ -630,7 +630,7 @@ protected: */ void setDependentFastPropertyValue( sal_Int32 i_handle, - const ::com::sun::star::uno::Any& i_value + const css::uno::Any& i_value ); /** The common data of a broadcaster. Use the mutex, disposing state and the listener container. */ @@ -660,8 +660,8 @@ private: */ void impl_fireAll( sal_Int32* i_handles, - const ::com::sun::star::uno::Any * i_newValues, - const ::com::sun::star::uno::Any * i_oldValues, + const css::uno::Any * i_newValues, + const css::uno::Any * i_oldValues, sal_Int32 i_count ); @@ -692,7 +692,7 @@ protected: XPropertySetOption. */ class CPPUHELPER_DLLPUBLIC OPropertySetHelper2 : public OPropertySetHelper, - public ::com::sun::star::beans::XPropertySetOption + public css::beans::XPropertySetOption { public: /** Constructor. @@ -705,12 +705,12 @@ public: bool bIgnoreRuntimeExceptionsWhileFiring = false); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySetOption virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h index ac1e075e6300..cda2401cd033 100644 --- a/include/cppuhelper/proptypehlp.h +++ b/include/cppuhelper/proptypehlp.h @@ -29,27 +29,27 @@ namespace cppu { Any class, except that it throws an IllegalArgumentException in case of failures (the value cannot be extracted without data loss ) - @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted. + @exception css::lang::IllegalArgumentException when the type could not be converted. */ template < class target > -inline void SAL_CALL convertPropertyValue( target &value , const ::com::sun::star::uno::Any & a); +inline void SAL_CALL convertPropertyValue( target &value , const css::uno::Any & a); template < class target > -inline void SAL_CALL convertPropertyValue( target &value , ::com::sun::star::uno::Any & a); +inline void SAL_CALL convertPropertyValue( target &value , css::uno::Any & a); /** conversion of basic types */ -inline void SAL_CALL convertPropertyValue( sal_Int64 & target , const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_Int16 & target , const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_uInt16 & target, const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( sal_Int8 & target , const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( float & target , const ::com::sun::star::uno::Any & source ); -inline void SAL_CALL convertPropertyValue( double &target , const ::com::sun::star::uno::Any &source ); -inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target , const ::com::sun::star::uno::Any &source ); +inline void SAL_CALL convertPropertyValue( sal_Int64 & target , const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_uInt64 & target, const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_Int32 & target , const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_uInt32 & target, const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_Int16 & target , const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_uInt16 & target, const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( sal_Int8 & target , const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( float & target , const css::uno::Any & source ); +inline void SAL_CALL convertPropertyValue( double &target , const css::uno::Any &source ); +inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target , const css::uno::Any &source ); } // end namespace cppu diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx index feaa51ba36bc..199a055bc093 100644 --- a/include/cppuhelper/proptypehlp.hxx +++ b/include/cppuhelper/proptypehlp.hxx @@ -31,478 +31,478 @@ namespace cppu Any class, except that it throws an IllegalArgumentException in case of failures (the value cannot be extracted without data loss ) - @exception com::sun::star::lang::IllegalArgumentException when the type could not be converted. + @exception css::lang::IllegalArgumentException when the type could not be converted. */ template < class target > -inline void SAL_CALL convertPropertyValue( target &value , const ::com::sun::star::uno::Any & a) +inline void SAL_CALL convertPropertyValue( target &value , const css::uno::Any & a) { if( !( a >>= value ) ) { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } // This template is needed at least for msci4 compiler template < class target > -inline void SAL_CALL convertPropertyValue( target &value , ::com::sun::star::uno::Any & a) +inline void SAL_CALL convertPropertyValue( target &value , css::uno::Any & a) { - convertPropertyValue( value , (const ::com::sun::star::uno::Any & ) a ); + convertPropertyValue( value , (const css::uno::Any & ) a ); } /** conversion of basic types */ -inline void SAL_CALL convertPropertyValue( sal_Bool & b , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Bool & b , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if( ::com::sun::star::uno::TypeClass_LONG == tc ) { + if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32 = 0; a >>= i32; b = i32 != 0; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c = *static_cast<sal_Unicode const *>(a.getValue()); b = c != 0; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; b = i16 != 0; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { b = *static_cast<sal_Bool const *>(a.getValue()); } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; b = i8 != 0; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; b = i16 != 0; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; a >>= i32; b = i32 != 0; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { + if( css::uno::TypeClass_HYPER == tc ) { a >>= i; } - else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { + else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64 = 0; a >>= i64; i = ( sal_Int64 ) i64; } - else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { + else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32 = 0; a >>= i32; i = ( sal_Int64 )i32; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_Int64 ) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; i = ( sal_Int64 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_Int64 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; i = ( sal_Int64 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; i = ( sal_Int64 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; a >>= i32; i = ( sal_Int64 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { + if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { a >>= i; } - if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { + if( css::uno::TypeClass_HYPER == tc ) { sal_Int64 i64; a >>= i64; i = ( sal_uInt64 ) i64; } - else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { + else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32; a >>= i32; i = ( sal_uInt64 )i32; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_uInt64 ) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; i = ( sal_uInt64 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_uInt64 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; i = ( sal_uInt64 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; a >>= i16; i = ( sal_uInt64 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32; a >>= i32; i = ( sal_uInt64 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } // the basic types // sal_Int32 -inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if( ::com::sun::star::uno::TypeClass_LONG == tc ) { + if( css::uno::TypeClass_LONG == tc ) { a >>= i; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_Int32 ) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; i = ( sal_Int32 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_Int32 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; i = ( sal_Int32 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; i = ( sal_Int32 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; a >>= i32; i = ( sal_Int32 ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { a >>= i; } - else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { + else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32; a >>= i32; i = (sal_uInt32 ) i32; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_uInt32 ) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; i = ( sal_uInt32 ) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_uInt32 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; i = ( sal_uInt32 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; a >>= i16; i = ( sal_uInt32 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_Int16 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int16 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + if ( css::uno::TypeClass_SHORT == tc ) { a >>= i; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_Int16 ) c; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_Int16 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; i = ( sal_Int16 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; i = ( sal_Int16 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { a >>= i; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); i = ( sal_Int16 ) c; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_Int16 ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; i = ( sal_Int16 ) i8; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; i = ( sal_Int16 ) i16; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( sal_Int8 & i , const ::com::sun::star::uno::Any & a ) +inline void SAL_CALL convertPropertyValue( sal_Int8 & i , const css::uno::Any & a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + if ( css::uno::TypeClass_BYTE == tc ) { a >>= i; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); i = ( sal_Int8 ) b; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( float &f , const ::com::sun::star::uno::Any &a ) +inline void SAL_CALL convertPropertyValue( float &f , const css::uno::Any &a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if ( ::com::sun::star::uno::TypeClass_FLOAT == tc ) { + if ( css::uno::TypeClass_FLOAT == tc ) { a >>= f; } - else if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) { + else if( css::uno::TypeClass_DOUBLE == tc ) { double d = 0; a >>= d; f = ( float ) d; } - else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { + else if( css::uno::TypeClass_HYPER == tc ) { sal_Int64 i64 = 0; a >>= i64; f = ( float ) i64; } // msci 4 does not support this conversion -/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { +/* else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64; a >>= i64; f = ( float ) i64; } -*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { +*/ else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32 = 0; a >>= i32; f = ( float )i32; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); f = ( float ) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16 = 0; a >>= i16; f = ( float ) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); f = ( float ) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8 = 0; a >>= i8; f = ( float ) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16 = 0; a >>= i16; f = ( float ) i16; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32 = 0; a >>= i32; f = ( float ) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( double &d , const ::com::sun::star::uno::Any &a ) +inline void SAL_CALL convertPropertyValue( double &d , const css::uno::Any &a ) { - const enum ::com::sun::star::uno::TypeClass tc = a.getValueType().getTypeClass(); + const enum css::uno::TypeClass tc = a.getValueType().getTypeClass(); - if( ::com::sun::star::uno::TypeClass_DOUBLE == tc ) { + if( css::uno::TypeClass_DOUBLE == tc ) { float f; a >>= f; d = ( double ) f; } - else if ( ::com::sun::star::uno::TypeClass_FLOAT == tc ) { + else if ( css::uno::TypeClass_FLOAT == tc ) { float f; a >>= f; d = (double) f; } - else if( ::com::sun::star::uno::TypeClass_HYPER == tc ) { + else if( css::uno::TypeClass_HYPER == tc ) { sal_Int64 i64; a >>= i64; d = (double) i64; } // msci 4 does not support this -/* else if( ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER == tc ) { +/* else if( css::uno::TypeClass_UNSIGNED_HYPER == tc ) { sal_uInt64 i64; a >>= i64; d = (double) i64; } -*/ else if( ::com::sun::star::uno::TypeClass_LONG == tc ) { +*/ else if( css::uno::TypeClass_LONG == tc ) { sal_Int32 i32; a >>= i32; d = (double)i32; } - else if ( ::com::sun::star::uno::TypeClass_CHAR == tc ) { + else if ( css::uno::TypeClass_CHAR == tc ) { sal_Unicode c; c = *static_cast<sal_Unicode const *>(a.getValue()); d = (double) c; } - else if ( ::com::sun::star::uno::TypeClass_SHORT == tc ) { + else if ( css::uno::TypeClass_SHORT == tc ) { sal_Int16 i16; a >>= i16; d = (double) i16; } - else if ( ::com::sun::star::uno::TypeClass_BOOLEAN == tc ) { + else if ( css::uno::TypeClass_BOOLEAN == tc ) { bool b; b = *static_cast<sal_Bool const *>(a.getValue()); d = (double) b; } - else if ( ::com::sun::star::uno::TypeClass_BYTE == tc ) { + else if ( css::uno::TypeClass_BYTE == tc ) { sal_Int8 i8; a >>= i8; d = (double) i8; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_SHORT == tc ) { sal_uInt16 i16; a >>= i16; d = (double) i16; } - else if ( ::com::sun::star::uno::TypeClass_UNSIGNED_LONG == tc ) { + else if ( css::uno::TypeClass_UNSIGNED_LONG == tc ) { sal_uInt32 i32; a >>= i32; d = (double) i32; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } -inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const ::com::sun::star::uno::Any &a ) +inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const css::uno::Any &a ) { - if( ::com::sun::star::uno::TypeClass_STRING == a.getValueType().getTypeClass() ) { + if( css::uno::TypeClass_STRING == a.getValueType().getTypeClass() ) { a >>= ow; } else { - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } } diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx index 9ec02e0f1daa..0fe2f5a99605 100644 --- a/include/cppuhelper/queryinterface.hxx +++ b/include/cppuhelper/queryinterface.hxx @@ -36,14 +36,14 @@ namespace cppu @return acquired interface of demanded type or empty Any */ template< class Interface1 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -55,16 +55,16 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( @return acquired interface of demanded type or empty Any */ template< class Interface1, class Interface2 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -78,18 +78,18 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( @return acquired interface of demanded type or empty Any */ template< class Interface1, class Interface2, class Interface3 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -105,20 +105,20 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( @return acquired interface of demanded type or empty Any */ template< class Interface1, class Interface2, class Interface3, class Interface4 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -136,22 +136,22 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( @return acquired interface of demanded type or empty Any */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -172,25 +172,25 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -213,27 +213,27 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -258,29 +258,29 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else if (rType == Interface8::static_type()) - return ::com::sun::star::uno::Any( &p8, rType ); + return css::uno::Any( &p8, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -307,31 +307,31 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else if (rType == Interface8::static_type()) - return ::com::sun::star::uno::Any( &p8, rType ); + return css::uno::Any( &p8, rType ); else if (rType == Interface9::static_type()) - return ::com::sun::star::uno::Any( &p9, rType ); + return css::uno::Any( &p9, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -360,33 +360,33 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else if (rType == Interface8::static_type()) - return ::com::sun::star::uno::Any( &p8, rType ); + return css::uno::Any( &p8, rType ); else if (rType == Interface9::static_type()) - return ::com::sun::star::uno::Any( &p9, rType ); + return css::uno::Any( &p9, rType ); else if (rType == Interface10::static_type()) - return ::com::sun::star::uno::Any( &p10, rType ); + return css::uno::Any( &p10, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -418,36 +418,36 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, class Interface11 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else if (rType == Interface8::static_type()) - return ::com::sun::star::uno::Any( &p8, rType ); + return css::uno::Any( &p8, rType ); else if (rType == Interface9::static_type()) - return ::com::sun::star::uno::Any( &p9, rType ); + return css::uno::Any( &p9, rType ); else if (rType == Interface10::static_type()) - return ::com::sun::star::uno::Any( &p10, rType ); + return css::uno::Any( &p10, rType ); else if (rType == Interface11::static_type()) - return ::com::sun::star::uno::Any( &p11, rType ); + return css::uno::Any( &p11, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** Compares demanded type to given template argument types. @@ -481,38 +481,38 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, class Interface11, class Interface12 > -inline ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType, +inline css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType, Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5, Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10, Interface11 * p11, Interface12 * p12 ) { if (rType == Interface1::static_type()) - return ::com::sun::star::uno::Any( &p1, rType ); + return css::uno::Any( &p1, rType ); else if (rType == Interface2::static_type()) - return ::com::sun::star::uno::Any( &p2, rType ); + return css::uno::Any( &p2, rType ); else if (rType == Interface3::static_type()) - return ::com::sun::star::uno::Any( &p3, rType ); + return css::uno::Any( &p3, rType ); else if (rType == Interface4::static_type()) - return ::com::sun::star::uno::Any( &p4, rType ); + return css::uno::Any( &p4, rType ); else if (rType == Interface5::static_type()) - return ::com::sun::star::uno::Any( &p5, rType ); + return css::uno::Any( &p5, rType ); else if (rType == Interface6::static_type()) - return ::com::sun::star::uno::Any( &p6, rType ); + return css::uno::Any( &p6, rType ); else if (rType == Interface7::static_type()) - return ::com::sun::star::uno::Any( &p7, rType ); + return css::uno::Any( &p7, rType ); else if (rType == Interface8::static_type()) - return ::com::sun::star::uno::Any( &p8, rType ); + return css::uno::Any( &p8, rType ); else if (rType == Interface9::static_type()) - return ::com::sun::star::uno::Any( &p9, rType ); + return css::uno::Any( &p9, rType ); else if (rType == Interface10::static_type()) - return ::com::sun::star::uno::Any( &p10, rType ); + return css::uno::Any( &p10, rType ); else if (rType == Interface11::static_type()) - return ::com::sun::star::uno::Any( &p11, rType ); + return css::uno::Any( &p11, rType ); else if (rType == Interface12::static_type()) - return ::com::sun::star::uno::Any( &p12, rType ); + return css::uno::Any( &p12, rType ); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } } diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index 3a62ef5ff1d1..8fec1fd4e6bd 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -41,15 +41,16 @@ namespace cppu @param xMgr service manager to be provided to the component @param xKey deprecated, must be null @return - factory instance (com::sun::star::lang::XSingleComponentFactory or legacy - com::sun::star::lang::XSingleServiceFactory) + factory instance (css::lang::XSingleComponentFactory or legacy + css::lang::XSingleServiceFactory) */ -CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +CPPUHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SAL_CALL loadSharedLibComponentFactory( - ::rtl::OUString const & uri, ::rtl::OUString const & rPath, + ::rtl::OUString const & uri, + ::rtl::OUString const & rPath, ::rtl::OUString const & rImplName, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & xMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey ); + css::uno::Reference< css::lang::XMultiServiceFactory > const & xMgr, + css::uno::Reference< css::registry::XRegistryKey > const & xKey ); /** Invokes component_writeInfo() function of specified component library. You can give either a fully qualified libname or single lib name. The libname need not be pre/postfixed @@ -67,9 +68,10 @@ SAL_CALL loadSharedLibComponentFactory( */ CPPUHELPER_DLLPUBLIC void SAL_CALL writeSharedLibComponentInfo( - ::rtl::OUString const & uri, ::rtl::OUString const & rPath, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & xMgr, - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > const & xKey ); + ::rtl::OUString const & uri, + ::rtl::OUString const & rPath, + css::uno::Reference< css::lang::XMultiServiceFactory > const & xMgr, + css::uno::Reference< css::registry::XRegistryKey > const & xKey ); } // end namespace cppu diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx index 10dcfb553b38..0a1bee42f926 100644 --- a/include/cppuhelper/supportsservice.hxx +++ b/include/cppuhelper/supportsservice.hxx @@ -24,9 +24,9 @@ namespace cppu { /** A helper for implementations of com.sun.star.lang.XServiceInfo. This function is supposed to be called from implementations of - com::sun::star::lang::XServiceInfo::supportsService (and therefore, for + css::lang::XServiceInfo::supportsService (and therefore, for easier coding takes the caller's this pointer by pointer rather than by - com::sun::star::uno::Reference). + css::uno::Reference). @param implementation points to the service implementation whose getSupportedServices method is consulted; must be non-null @@ -39,7 +39,7 @@ namespace cppu { @since LibreOffice 4.0 */ bool CPPUHELPER_DLLPUBLIC supportsService( - com::sun::star::lang::XServiceInfo * implementation, + css::lang::XServiceInfo * implementation, rtl::OUString const & name); } diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index 50344096d772..c98e260c3bdd 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -27,12 +27,12 @@ namespace cppu { -/** Helper class to implement com::sun::star::lang::XTypeProvider. Construct a static object +/** Helper class to implement css::lang::XTypeProvider. Construct a static object of this class with your UNO object's supported types. */ class CPPUHELPER_DLLPUBLIC OTypeCollection { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes; + css::uno::Sequence< css::uno::Type > _aTypes; public: /// @cond INTERNAL @@ -51,113 +51,113 @@ public: : _aTypes( rCollection._aTypes ) {} OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Type & rType8, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Type & rType8, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Type & rType8, - const ::com::sun::star::uno::Type & rType9, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Type & rType8, + const css::uno::Type & rType9, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Type & rType8, - const ::com::sun::star::uno::Type & rType9, - const ::com::sun::star::uno::Type & rType10, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Type & rType8, + const css::uno::Type & rType9, + const css::uno::Type & rType10, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Type & rType8, - const ::com::sun::star::uno::Type & rType9, - const ::com::sun::star::uno::Type & rType10, - const ::com::sun::star::uno::Type & rType11, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Type & rType8, + const css::uno::Type & rType9, + const css::uno::Type & rType10, + const css::uno::Type & rType11, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); OTypeCollection( - const ::com::sun::star::uno::Type & rType1, - const ::com::sun::star::uno::Type & rType2, - const ::com::sun::star::uno::Type & rType3, - const ::com::sun::star::uno::Type & rType4, - const ::com::sun::star::uno::Type & rType5, - const ::com::sun::star::uno::Type & rType6, - const ::com::sun::star::uno::Type & rType7, - const ::com::sun::star::uno::Type & rType8, - const ::com::sun::star::uno::Type & rType9, - const ::com::sun::star::uno::Type & rType10, - const ::com::sun::star::uno::Type & rType11, - const ::com::sun::star::uno::Type & rType12, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > & rAddTypes = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >() ); + const css::uno::Type & rType1, + const css::uno::Type & rType2, + const css::uno::Type & rType3, + const css::uno::Type & rType4, + const css::uno::Type & rType5, + const css::uno::Type & rType6, + const css::uno::Type & rType7, + const css::uno::Type & rType8, + const css::uno::Type & rType9, + const css::uno::Type & rType10, + const css::uno::Type & rType11, + const css::uno::Type & rType12, + const css::uno::Sequence< css::uno::Type > & rAddTypes = css::uno::Sequence< css::uno::Type >() ); /** Called upon XTypeProvider::getTypes(). @return type collection */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() { return _aTypes; } }; @@ -166,7 +166,7 @@ public: */ class CPPUHELPER_DLLPUBLIC OImplementationId { - mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq; + mutable css::uno::Sequence< sal_Int8 > * _pSeq; sal_Bool _bUseEthernetAddress; public: @@ -198,12 +198,12 @@ public: @param rSeq implementation id */ - inline OImplementationId( const ::com::sun::star::uno::Sequence< sal_Int8 > & rSeq ) - : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rSeq ) ) + inline OImplementationId( const css::uno::Sequence< sal_Int8 > & rSeq ) + : _pSeq( new css::uno::Sequence< sal_Int8 >( rSeq ) ) , _bUseEthernetAddress( false ) {} inline OImplementationId( const OImplementationId & rId ) - : _pSeq( new ::com::sun::star::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) + : _pSeq( new css::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) , _bUseEthernetAddress( false ) {} @@ -211,7 +211,7 @@ public: @return implementation id */ - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() const; }; } diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 9719db1a2e62..c3e8be579edd 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -32,14 +32,14 @@ namespace cppu class OWeakConnectionPoint; /** Base class to implement an UNO object supporting weak references, i.e. the object can be held - weakly (by a ::com::sun::star::uno::WeakReference). + weakly (by a css::uno::WeakReference). This implementation copes with reference counting. Upon last release(), the virtual dtor is called. @derive Inherit from this class and delegate acquire()/ release() calls. */ -class CPPUHELPER_DLLPUBLIC OWeakObject : public ::com::sun::star::uno::XWeak +class CPPUHELPER_DLLPUBLIC OWeakObject : public css::uno::XWeak { friend class OWeakConnectionPoint; @@ -109,7 +109,7 @@ public: @param rObj dummy param */ inline OWeakObject( const OWeakObject & rObj ) - : com::sun::star::uno::XWeak() + : css::uno::XWeak() , m_refCount( 0 ) , m_pWeakConnectionPoint( 0 ) , m_pReserved(0) @@ -123,15 +123,15 @@ public: inline OWeakObject & SAL_CALL operator = ( const OWeakObject &) { return *this; } - /** Basic queryInterface() implementation supporting \::com::sun::star::uno::XWeak and - \::com::sun::star::uno::XInterface. + /** Basic queryInterface() implementation supporting \css::uno::XWeak and + \css::uno::XInterface. @param rType demanded type @return demanded type or empty any */ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** increasing m_refCount */ virtual void SAL_CALL acquire() @@ -143,16 +143,16 @@ public: /** XWeak::queryAdapter() implementation - @return a \::com::sun::star::uno::XAdapter reference + @return a \css::uno::XAdapter reference */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Cast operator to XInterface reference. @return XInterface reference */ - inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () + inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () { return this; } }; @@ -168,7 +168,7 @@ public: @param instance Newly created instance that should be acquired. */ -static inline ::com::sun::star::uno::XInterface * acquire(OWeakObject * instance) +static inline css::uno::XInterface * acquire(OWeakObject * instance) { assert(instance != 0); instance->acquire(); diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index 6f2577bc6cde..c08f00408e37 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -29,7 +29,7 @@ namespace cppu { /** Base class to implement an UNO object supporting weak references, i.e. the object can be held - weakly (by a ::com::sun::star::uno::WeakReference) and aggregation, i.e. the object can be + weakly (by a css::uno::WeakReference) and aggregation, i.e. the object can be aggregated by another (delegator). This implementation copes with reference counting. Upon last release(), the virtual dtor is called. @@ -40,7 +40,7 @@ namespace cppu */ class CPPUHELPER_DLLPUBLIC OWeakAggObject : public ::cppu::OWeakObject - , public ::com::sun::star::uno::XAggregation + , public css::uno::XAggregation { public: /** Constructor. No delegator set. @@ -64,22 +64,22 @@ public: @return demanded type or empty any @see queryAggregation. */ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Set the delegator. The delegator member reference is a weak reference. @param Delegator the object that delegate its queryInterface to this aggregate. */ - virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDelegator( const css::uno::Reference< css::uno::XInterface > & Delegator ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Called by the delegator or queryInterface. Re-implement this method instead of queryInterface. @see queryInterface */ - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Virtual dtor. Called when reference count is 0. @@ -92,7 +92,7 @@ protected: /** weak reference to delegator. */ - ::com::sun::star::uno::WeakReferenceHelper xDelegator; + css::uno::WeakReferenceHelper xDelegator; private: OWeakAggObject( const OWeakAggObject & rObj ) SAL_DELETED_FUNCTION; OWeakAggObject & operator = ( const OWeakAggObject & rObj ) diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx index 01ee4c8671e5..018454e4ffca 100644 --- a/include/cppuhelper/weakref.hxx +++ b/include/cppuhelper/weakref.hxx @@ -36,7 +36,7 @@ namespace uno class OWeakRefListener; /** The WeakReferenceHelper holds a weak reference to an object. This object must implement - the com::sun::star::uno::XWeak interface. The implementation is thread safe. + the css::uno::XWeak interface. The implementation is thread safe. */ class CPPUHELPER_DLLPUBLIC WeakReferenceHelper { @@ -57,7 +57,7 @@ public: @param xInt another hard interface reference */ - WeakReferenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt ); + WeakReferenceHelper( const css::uno::Reference< css::uno::XInterface > & xInt ); /** Releases this reference. */ ~WeakReferenceHelper(); @@ -75,8 +75,7 @@ public: @param xInt another hard reference */ WeakReferenceHelper & SAL_CALL operator = ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > & xInt ); + const css::uno::Reference< css::uno::XInterface > & xInt ); /** Returns true if both weak refs reference to the same object. @@ -90,7 +89,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL get() const; + css::uno::Reference< css::uno::XInterface > SAL_CALL get() const; /** Gets a hard reference to the object. @return hard reference or null, if the weakly referenced interface has gone @@ -111,7 +110,7 @@ protected: }; /** The WeakReference<> holds a weak reference to an object. This object must implement - the com::sun::star::uno::XWeak interface. The implementation is thread safe. + the css::uno::XWeak interface. The implementation is thread safe. @tparam interface_type type of interface */ @@ -142,7 +141,7 @@ public: @since UDK 3.2.12 */ WeakReference & SAL_CALL operator = ( - const ::com::sun::star::uno::Reference< interface_type > & xInt ) + const css::uno::Reference< interface_type > & xInt ) { WeakReferenceHelper::operator=(xInt); return *this; } /** Gets a hard reference to the object. |