summaryrefslogtreecommitdiff
path: root/include/comphelper/uno3.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-19 12:51:29 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-20 07:05:25 +0000
commit1b62841b1859ae3443e2bf1ebe99ec3d6afb6cc2 (patch)
treee3b7af8a34c55d7aad95752ad5d642a271523d08 /include/comphelper/uno3.hxx
parentb1659c95b0620cfd1291f889eae767757f696ae1 (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/uno3.hxx')
-rw-r--r--include/comphelper/uno3.hxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index a2e1d3013f0d..a75a4abbb9d3 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -41,7 +41,7 @@ namespace comphelper
#define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
virtual void SAL_CALL acquire() throw() override { baseclass::acquire(); } \
virtual void SAL_CALL release() throw() override { baseclass::release(); } \
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override \
+ virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \
{ return baseclass::queryInterface(_rType); }
/** Use this macro to forward XComponent methods to base class
@@ -69,19 +69,19 @@ namespace comphelper
#define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \
virtual void SAL_CALL acquire() throw() override { baseclass::acquire(); } \
virtual void SAL_CALL release() throw() override { baseclass::release(); } \
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) override \
+ virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \
{ return baseclass::queryInterface(_rType); } \
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override \
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override \
{ \
implhelper::dispose(); \
} \
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) override \
+ css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \
{ \
implhelper::addEventListener(xListener); \
} \
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) override \
+ css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \
{ \
implhelper::removeEventListener(xListener); \
}
@@ -91,7 +91,7 @@ namespace comphelper
//= forwarding/merging XInterface funtionality
#define DECLARE_XINTERFACE( ) \
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; \
virtual void SAL_CALL acquire() throw() override; \
virtual void SAL_CALL release() throw() override;
@@ -101,9 +101,9 @@ namespace comphelper
#define IMPLEMENT_FORWARD_XINTERFACE2( classname, refcountbase, baseclass2 ) \
IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
- ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \
{ \
- ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
+ css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
if ( !aReturn.hasValue() ) \
aReturn = baseclass2::queryInterface( _rType ); \
return aReturn; \
@@ -111,9 +111,9 @@ namespace comphelper
#define IMPLEMENT_FORWARD_XINTERFACE3( classname, refcountbase, baseclass2, baseclass3 ) \
IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
- ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \
{ \
- ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
+ css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
if ( !aReturn.hasValue() ) \
{ \
aReturn = baseclass2::queryInterface( _rType ); \
@@ -127,17 +127,17 @@ namespace comphelper
//= forwarding/merging XTypeProvider funtionality
#define DECLARE_XTYPEPROVIDER( ) \
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; \
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override;
#define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \
- ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (css::uno::RuntimeException, std::exception) \
{ \
return css::uno::Sequence<sal_Int8>(); \
}
#define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) throw (css::uno::RuntimeException, std::exception) \
{ \
return ::comphelper::concatSequences( \
baseclass1::getTypes(), \
@@ -148,7 +148,7 @@ namespace comphelper
IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
#define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) throw (css::uno::RuntimeException, std::exception) \
{ \
return ::comphelper::concatSequences( \
baseclass1::getTypes(), \
@@ -168,15 +168,15 @@ namespace comphelper
....
*/
template <class iface>
- bool query_aggregation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxAggregate, ::com::sun::star::uno::Reference<iface>& _rxOut)
+ bool query_aggregation(const css::uno::Reference< css::uno::XAggregation >& _rxAggregate, css::uno::Reference<iface>& _rxOut)
{
_rxOut = static_cast<iface*>(NULL);
if (_rxAggregate.is())
{
- ::com::sun::star::uno::Any aCheck = _rxAggregate->queryAggregation(
+ css::uno::Any aCheck = _rxAggregate->queryAggregation(
cppu::UnoType<iface>::get());
if (aCheck.hasValue())
- _rxOut = *static_cast<const ::com::sun::star::uno::Reference<iface>*>(aCheck.getValue());
+ _rxOut = *static_cast<const css::uno::Reference<iface>*>(aCheck.getValue());
}
return _rxOut.is();
}