diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-19 12:51:29 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-20 07:05:25 +0000 |
commit | 1b62841b1859ae3443e2bf1ebe99ec3d6afb6cc2 (patch) | |
tree | e3b7af8a34c55d7aad95752ad5d642a271523d08 /include/comphelper/servicehelper.hxx | |
parent | b1659c95b0620cfd1291f889eae767757f696ae1 (diff) |
com::sun::star->css in include/comphelper
Change-Id: Ice569b724732da1fd67a18a4ccf2f92f530cd689
Reviewed-on: https://gerrit.libreoffice.org/19459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/comphelper/servicehelper.hxx')
-rw-r--r-- | include/comphelper/servicehelper.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx index b0ef7aaf3232..3d825b10fadf 100644 --- a/include/comphelper/servicehelper.hxx +++ b/include/comphelper/servicehelper.hxx @@ -27,13 +27,13 @@ class UnoTunnelIdInit { private: - ::com::sun::star::uno::Sequence< sal_Int8 > m_aSeq; + css::uno::Sequence< sal_Int8 > m_aSeq; public: UnoTunnelIdInit() : m_aSeq(16) { rtl_createUuid( reinterpret_cast<sal_uInt8*>(m_aSeq.getArray()), 0, sal_True ); } - const ::com::sun::star::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; } + const css::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; } }; /** the UNO3_GETIMPLEMENTATION_* macros implement a static helper function @@ -46,28 +46,28 @@ public: Usage: Put a UNO3_GETIMPLEMENTATION_DECL( classname ) inside your class definitian and UNO3_GETIMPLEMENTATION_IMPL( classname ) inside - your cxx file. Your class must inherit ::com::sun::star::lang::XUnoTunnel + your cxx file. Your class must inherit css::lang::XUnoTunnel and export it with queryInterface. Implementation of XUnoTunnel is done by this macro. */ #define UNO3_GETIMPLEMENTATION_DECL( classname ) \ - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); \ - static classname* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ); \ - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); \ + static classname* getImplementation( const css::uno::Reference< css::uno::XInterface >& xInt ); \ + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; #define UNO3_GETIMPLEMENTATION_BASE_IMPL( classname ) \ namespace \ { \ class the##classname##UnoTunnelId : public rtl::Static< UnoTunnelIdInit, the##classname##UnoTunnelId> {}; \ } \ -const ::com::sun::star::uno::Sequence< sal_Int8 > & classname::getUnoTunnelId() throw() \ +const css::uno::Sequence< sal_Int8 > & classname::getUnoTunnelId() throw() \ { \ return the##classname##UnoTunnelId::get().getSeq(); \ } \ \ classname* classname::getImplementation( const uno::Reference< uno::XInterface >& xInt ) \ { \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); \ + css::uno::Reference< css::lang::XUnoTunnel > xUT( xInt, css::uno::UNO_QUERY ); \ if( xUT.is() ) \ return reinterpret_cast<classname*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( classname::getUnoTunnelId() ))); \ else \ @@ -76,7 +76,7 @@ classname* classname::getImplementation( const uno::Reference< uno::XInterface > #define UNO3_GETIMPLEMENTATION_IMPL( classname )\ UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\ -sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ { \ if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \ rId.getConstArray(), 16 ) ) \ @@ -88,7 +88,7 @@ sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequenc #define UNO3_GETIMPLEMENTATION2_IMPL( classname, baseclass )\ UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\ -sal_Int64 SAL_CALL classname::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ { \ if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \ rId.getConstArray(), 16 ) ) \ |