From b2d99944c55acbdd4204db37079cde476d6388be Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Thu, 22 May 2014 08:43:59 +0200 Subject: stoc: remove using namespace from headers Change-Id: I1bee29ddcef66cb38ef2619507ad66c886f6f20d --- stoc/source/corereflection/base.hxx | 218 ++++++++++++++++----------------- stoc/source/corereflection/crarray.cxx | 9 +- stoc/source/corereflection/crbase.cxx | 13 +- stoc/source/corereflection/crcomp.cxx | 15 ++- stoc/source/corereflection/crefl.cxx | 12 +- stoc/source/corereflection/crenum.cxx | 13 +- stoc/source/corereflection/criface.cxx | 37 +++--- 7 files changed, 163 insertions(+), 154 deletions(-) (limited to 'stoc') diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 29935bdb5ef2..83c5f8194d5b 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -46,14 +46,6 @@ #include #include -using namespace std; -using namespace osl; -using namespace cppu; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::reflection; -using namespace com::sun::star::container; - namespace stoc_corefl { @@ -63,7 +55,7 @@ extern ClassNameList g_aClassNames; #endif -Mutex & getMutexAccess(); +::osl::Mutex & getMutexAccess(); inline bool td_equals( typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType ) @@ -82,45 +74,45 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName ) return pTypeDescr; } -typedef boost::unordered_map< OUString, WeakReference< XIdlField >, - FctHashOUString, equal_to< OUString > > OUString2Field; -typedef boost::unordered_map< OUString, WeakReference< XIdlMethod >, - FctHashOUString, equal_to< OUString > > OUString2Method; +typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >, + FctHashOUString, std::equal_to< OUString > > OUString2Field; +typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >, + FctHashOUString, std::equal_to< OUString > > OUString2Method; class IdlReflectionServiceImpl - : public OComponentHelper - , public XIdlReflection - , public XHierarchicalNameAccess - , public XServiceInfo + : public ::cppu::OComponentHelper + , public css::reflection::XIdlReflection + , public css::container::XHierarchicalNameAccess + , public css::lang::XServiceInfo { - Mutex _aComponentMutex; - Reference< XMultiServiceFactory > _xMgr; - Reference< XHierarchicalNameAccess > _xTDMgr; + ::osl::Mutex _aComponentMutex; + css::uno::Reference< css::lang::XMultiServiceFactory > _xMgr; + css::uno::Reference< css::container::XHierarchicalNameAccess > _xTDMgr; // caching LRU_CacheAnyByOUString _aElements; - Mapping _aCpp2Uno; - Mapping _aUno2Cpp; + css::uno::Mapping _aCpp2Uno; + css::uno::Mapping _aUno2Cpp; - inline Reference< XIdlClass > constructClass( typelib_TypeDescription * pTypeDescr ); + inline css::uno::Reference< css::reflection::XIdlClass > constructClass( typelib_TypeDescription * pTypeDescr ); public: - Reference< XHierarchicalNameAccess > getTDMgr() const + css::uno::Reference< css::container::XHierarchicalNameAccess > getTDMgr() const { return _xTDMgr; } - Reference< XMultiServiceFactory > getSMgr() const + css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const { return _xMgr; } - const Mapping & getCpp2Uno() throw(::com::sun::star::uno::RuntimeException); - const Mapping & getUno2Cpp() throw(::com::sun::star::uno::RuntimeException); - uno_Interface * mapToUno( const Any & rObj, typelib_InterfaceTypeDescription * pTo ) throw(::com::sun::star::uno::RuntimeException); + const css::uno::Mapping & getCpp2Uno() throw(::com::sun::star::uno::RuntimeException); + const css::uno::Mapping & getUno2Cpp() throw(::com::sun::star::uno::RuntimeException); + uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo ) throw(::com::sun::star::uno::RuntimeException); // ctor/ dtor - IdlReflectionServiceImpl( const Reference< XComponentContext > & xContext ); + IdlReflectionServiceImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~IdlReflectionServiceImpl(); // XInterface - virtual Any SAL_CALL queryInterface( const 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(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; @@ -130,32 +122,32 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIdlReflection - virtual Reference< XIdlClass > SAL_CALL forName( const OUString & rTypeName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlClass > SAL_CALL getType( const Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL forName( const OUString & rTypeName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getType( const css::uno::Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHierarchicalNameAccess - virtual Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Reference< XIdlClass > forType( typelib_TypeDescription * pTypeDescr ) throw(::com::sun::star::uno::RuntimeException); - Reference< XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescription * pTypeDescr ) throw(::com::sun::star::uno::RuntimeException); + css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(::com::sun::star::uno::RuntimeException); }; class IdlClassImpl - : public WeakImplHelper1< XIdlClass > + : public ::cppu::WeakImplHelper1< css::reflection::XIdlClass > { IdlReflectionServiceImpl * _pReflection; OUString _aName; - TypeClass _eTypeClass; + css::uno::TypeClass _eTypeClass; typelib_TypeDescription * _pTypeDescr; @@ -164,9 +156,9 @@ public: { return _pTypeDescr; } IdlReflectionServiceImpl * getReflection() const { return _pReflection; } - Reference< XMultiServiceFactory > getSMgr() const + css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const { return _pReflection->getSMgr(); } - Reference< XHierarchicalNameAccess > getTDMgr() const + css::uno::Reference< css::container::XHierarchicalNameAccess > getTDMgr() const { return getReflection()->getTDMgr(); } // Ctor @@ -176,39 +168,39 @@ public: virtual ~IdlClassImpl(); // XIdlClassImpl default implementation - virtual TypeClass SAL_CALL getTypeClass() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::TypeClass SAL_CALL getTypeClass() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL equals( const Reference< XIdlClass >& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL equals( const css::uno::Reference< css::reflection::XIdlClass >& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // def impl ???? - virtual Sequence< Reference< XIdlClass > > SAL_CALL getClasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlClass > SAL_CALL getClass( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlClass > > SAL_CALL getInterfaces() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getClasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getClass( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getInterfaces() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // structs, interfaces - virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // structs - virtual Reference< XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // interfaces - virtual Uik SAL_CALL getUik() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlMethod > > SAL_CALL getMethods() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Uik SAL_CALL getUik() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // array - virtual Reference< XIdlClass > SAL_CALL getComponentType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class InterfaceIdlClassImpl : public IdlClassImpl { - typedef pair< OUString, typelib_TypeDescription * > MemberInit; + typedef std::pair< OUString, typelib_TypeDescription * > MemberInit; - Sequence< Reference< XIdlClass > > _xSuperClasses; + css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > _xSuperClasses; MemberInit * _pSortedMemberInit; // first methods, then attributes OUString2Field _aName2Field; @@ -234,23 +226,23 @@ public: virtual ~InterfaceIdlClassImpl(); // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Uik SAL_CALL getUik() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlMethod > > SAL_CALL getMethods() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Uik SAL_CALL getUik() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class CompoundIdlClassImpl : public IdlClassImpl { - Reference< XIdlClass > _xSuperClass; + css::uno::Reference< css::reflection::XIdlClass > _xSuperClass; - Sequence< Reference< XIdlField > > * _pFields; + css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > * _pFields; OUString2Field _aName2Field; public: @@ -267,16 +259,16 @@ public: virtual ~CompoundIdlClassImpl(); // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class ArrayIdlClassImpl : public IdlClassImpl - , public XIdlArray + , public css::reflection::XIdlArray { public: typelib_IndirectTypeDescription * getTypeDescr() const @@ -289,31 +281,31 @@ public: : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr ) {} - virtual Any SAL_CALL queryInterface( const 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(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IdlClassImpl modifications - virtual sal_Bool SAL_CALL isAssignableFrom( const Reference< XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlClass > SAL_CALL getComponentType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIdlArray - virtual void SAL_CALL realloc( Any & rArray, sal_Int32 nLen ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getLen( const Any & rArray ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL get( const Any & rArray, sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL set( Any & rArray, sal_Int32 nIndex, const Any & rNewValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL realloc( css::uno::Any & rArray, sal_Int32 nLen ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getLen( const css::uno::Any & rArray ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL get( const css::uno::Any & rArray, sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL set( css::uno::Any & rArray, sal_Int32 nIndex, const css::uno::Any & rNewValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class EnumIdlClassImpl : public IdlClassImpl { - Sequence< Reference< XIdlField > > * _pFields; + css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > * _pFields; OUString2Field _aName2Field; public: @@ -330,14 +322,14 @@ public: virtual ~EnumIdlClassImpl(); // IdlClassImpl modifications - virtual Reference< XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Reference< XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createObject( Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class IdlMemberImpl - : public WeakImplHelper1< XIdlMember > + : public ::cppu::WeakImplHelper1< css::reflection::XIdlMember > { IdlReflectionServiceImpl * _pReflection; OUString _aName; @@ -346,12 +338,12 @@ class IdlMemberImpl typelib_TypeDescription * _pDeclTypeDescr; protected: - Reference< XIdlClass > _xDeclClass; + css::uno::Reference< css::reflection::XIdlClass > _xDeclClass; public: IdlReflectionServiceImpl * getReflection() const { return _pReflection; } - Reference< XMultiServiceFactory > getSMgr() const + css::uno::Reference< css::lang::XMultiServiceFactory > getSMgr() const { return _pReflection->getSMgr(); } typelib_TypeDescription * getTypeDescr() const { return _pTypeDescr; } @@ -364,7 +356,7 @@ public: virtual ~IdlMemberImpl(); // XIdlMember - virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -372,8 +364,8 @@ public: // coerces to type descr pTo else queries for it: the interface pointer is returned via rDest // ## type to XidlClass coercion possible inline bool extract( - const Any & rObj, typelib_InterfaceTypeDescription * pTo, - Reference< XInterface > & rDest, + const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo, + css::uno::Reference< css::uno::XInterface > & rDest, IdlReflectionServiceImpl * pRefl ) { rDest.clear(); @@ -381,18 +373,18 @@ inline bool extract( { if (! rObj.hasValue()) return true; - if (rObj.getValueTypeClass() == TypeClass_INTERFACE) + if (rObj.getValueTypeClass() == css::uno::TypeClass_INTERFACE) { return ::uno_type_assignData( &rDest, ((typelib_TypeDescription *)pTo)->pWeakRef, const_cast< void * >( rObj.getValue() ), rObj.getValueTypeRef(), - reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), - reinterpret_cast< uno_AcquireFunc >(cpp_acquire), - reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); + reinterpret_cast< uno_QueryInterfaceFunc >(css::uno::cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(css::uno::cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(css::uno::cpp_release) ); } - else if (rObj.getValueTypeClass() == TypeClass_TYPE) + else if (rObj.getValueTypeClass() == css::uno::TypeClass_TYPE) { - rDest = pRefl->forType( reinterpret_cast< const Type * >( rObj.getValue() )->getTypeLibType() ); + rDest = pRefl->forType( reinterpret_cast< const css::uno::Type * >( rObj.getValue() )->getTypeLibType() ); return rDest.is(); } } @@ -400,19 +392,19 @@ inline bool extract( } inline bool coerce_assign( - void * pDest, typelib_TypeDescription * pTD, const Any & rSource, + void * pDest, typelib_TypeDescription * pTD, const css::uno::Any & rSource, IdlReflectionServiceImpl * pRefl ) { if (pTD->eTypeClass == typelib_TypeClass_INTERFACE) { - Reference< XInterface > xVal; + css::uno::Reference< css::uno::XInterface > xVal; if (extract( rSource, (typelib_InterfaceTypeDescription *)pTD, xVal, pRefl )) { - if (*(XInterface **)pDest) - (*(XInterface **)pDest)->release(); - *(XInterface **)pDest = xVal.get(); - if (*(XInterface **)pDest) - (*(XInterface **)pDest)->acquire(); + if (*(css::uno::XInterface **)pDest) + (*(css::uno::XInterface **)pDest)->release(); + *(css::uno::XInterface **)pDest = xVal.get(); + if (*(css::uno::XInterface **)pDest) + (*(css::uno::XInterface **)pDest)->acquire(); return true; } return false; @@ -422,18 +414,18 @@ inline bool coerce_assign( return uno_assignData( pDest, pTD, (void *)&rSource, pTD, - reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), - reinterpret_cast< uno_AcquireFunc >(cpp_acquire), - reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); + reinterpret_cast< uno_QueryInterfaceFunc >(css::uno::cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(css::uno::cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(css::uno::cpp_release) ); } else { return uno_type_assignData( pDest, pTD->pWeakRef, (void *)rSource.getValue(), rSource.getValueTypeRef(), - reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), - reinterpret_cast< uno_AcquireFunc >(cpp_acquire), - reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); + reinterpret_cast< uno_QueryInterfaceFunc >(css::uno::cpp_queryInterface), + reinterpret_cast< uno_AcquireFunc >(css::uno::cpp_acquire), + reinterpret_cast< uno_ReleaseFunc >(css::uno::cpp_release) ); } } diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx index 2ff8d23a817b..e03e8a16a0ed 100644 --- a/stoc/source/corereflection/crarray.cxx +++ b/stoc/source/corereflection/crarray.cxx @@ -22,6 +22,9 @@ #include "base.hxx" +using namespace css::lang; +using namespace css::reflection; +using namespace css::uno; namespace stoc_corefl { @@ -50,13 +53,13 @@ void ArrayIdlClassImpl::release() throw() Sequence< Type > ArrayIdlClassImpl::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { - static OTypeCollection * s_pTypes = 0; + static ::cppu::OTypeCollection * s_pTypes = 0; if (! s_pTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! s_pTypes) { - static OTypeCollection s_aTypes( + static ::cppu::OTypeCollection s_aTypes( ::getCppuType( (const Reference< XIdlArray > *)0 ), IdlClassImpl::getTypes() ); s_pTypes = &s_aTypes; diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx index 17fe62cb25ff..7b02efd14c74 100644 --- a/stoc/source/corereflection/crbase.cxx +++ b/stoc/source/corereflection/crbase.cxx @@ -22,6 +22,9 @@ #include "base.hxx" +using namespace css::reflection; +using namespace css::uno; + namespace stoc_corefl { @@ -30,15 +33,15 @@ ClassNameList g_aClassNames; #endif -Mutex & getMutexAccess() +::osl::Mutex & getMutexAccess() { - static Mutex * s_pMutex = 0; + static ::osl::Mutex * s_pMutex = 0; if (! s_pMutex) { - MutexGuard aGuard( Mutex::getGlobalMutex() ); + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if (! s_pMutex) { - static Mutex s_aMutex; + static ::osl::Mutex s_aMutex; s_pMutex = &s_aMutex; } } @@ -263,7 +266,7 @@ Reference< XIdlClass > IdlMemberImpl::getDeclaringClass() if (! _xDeclClass.is()) { Reference< XIdlClass > xDeclClass( getReflection()->forType( getDeclTypeDescr() ) ); - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) _xDeclClass = xDeclClass; } diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index c5a6e225ad80..3ea5c9cc53e6 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -25,6 +25,9 @@ #include "base.hxx" +using namespace css::lang; +using namespace css::reflection; +using namespace css::uno; namespace stoc_corefl { @@ -92,13 +95,13 @@ void IdlCompFieldImpl::release() throw() Sequence< Type > IdlCompFieldImpl::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { - static OTypeCollection * s_pTypes = 0; + static ::cppu::OTypeCollection * s_pTypes = 0; if (! s_pTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! s_pTypes) { - static OTypeCollection s_aTypes( + static ::cppu::OTypeCollection s_aTypes( ::getCppuType( (const Reference< XIdlField2 > *)0 ), ::getCppuType( (const Reference< XIdlField > *)0 ), IdlMemberImpl::getTypes() ); @@ -121,7 +124,7 @@ Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass() { if (! _xDeclClass.is()) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) { typelib_CompoundTypeDescription * pTD = @@ -311,7 +314,7 @@ Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses() { if (! _xSuperClass.is()) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _xSuperClass.is()) { typelib_CompoundTypeDescription * pCompTypeDescr = getTypeDescr()->pBaseTypeDescription; @@ -341,7 +344,7 @@ Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName ) Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pFields) { sal_Int32 nAll = 0; diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 00e5ac483654..3f74dc4b0e71 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -27,9 +27,11 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include -using namespace com::sun::star; -using namespace com::sun::star::lang; -using namespace com::sun::star::registry; +using namespace css; +using namespace css::uno; +using namespace css::lang; +using namespace css::reflection; +using namespace css::registry; using namespace cppu; using namespace osl; @@ -298,7 +300,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName ) _aElements.setValue( rName, aRet ); else { - throw NoSuchElementException( rName, Reference< XInterface >() ); + throw container::NoSuchElementException( rName, Reference< XInterface >() ); } } return aRet; @@ -311,7 +313,7 @@ sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName { return getByHierarchicalName( rName ).hasValue(); } - catch (NoSuchElementException &) + catch (container::NoSuchElementException &) { } return sal_False; diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 40f5d0fcf797..df3666e5eb4d 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -17,9 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "base.hxx" +using namespace css::lang; +using namespace css::reflection; +using namespace css::uno; + namespace stoc_corefl { @@ -90,13 +93,13 @@ void IdlEnumFieldImpl::release() throw() Sequence< Type > IdlEnumFieldImpl::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { - static OTypeCollection * s_pTypes = 0; + static ::cppu::OTypeCollection * s_pTypes = 0; if (! s_pTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! s_pTypes) { - static OTypeCollection s_aTypes( + static ::cppu::OTypeCollection s_aTypes( ::getCppuType( (const Reference< XIdlField2 > *)0 ), ::getCppuType( (const Reference< XIdlField > *)0 ), IdlMemberImpl::getTypes() ); @@ -193,7 +196,7 @@ Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields() { if (! _pFields) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pFields) { sal_Int32 nFields = getTypeDescr()->nEnumValues; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index ec79ebe4de46..f4ae9f366f50 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #ifdef SAL_UNX #include @@ -35,6 +34,10 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "cppuhelper/exc_hlp.hxx" +using namespace css::lang; +using namespace css::reflection; +using namespace css::uno; + namespace stoc_corefl { @@ -104,13 +107,13 @@ void IdlAttributeFieldImpl::release() throw() Sequence< Type > IdlAttributeFieldImpl::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { - static OTypeCollection * s_pTypes = 0; + static ::cppu::OTypeCollection * s_pTypes = 0; if (! s_pTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! s_pTypes) { - static OTypeCollection s_aTypes( + static ::cppu::OTypeCollection s_aTypes( ::getCppuType( (const Reference< XIdlField2 > *)0 ), ::getCppuType( (const Reference< XIdlField > *)0 ), IdlMemberImpl::getTypes() ); @@ -133,7 +136,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass() { if (! _xDeclClass.is()) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) { OUString aName(getAttributeTypeDescr()->aBase.aBase.pTypeName); @@ -399,13 +402,13 @@ void IdlInterfaceMethodImpl::release() throw() Sequence< Type > IdlInterfaceMethodImpl::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { - static OTypeCollection * s_pTypes = 0; + static ::cppu::OTypeCollection * s_pTypes = 0; if (! s_pTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! s_pTypes) { - static OTypeCollection s_aTypes( + static ::cppu::OTypeCollection s_aTypes( ::getCppuType( (const Reference< XIdlMethod > *)0 ), IdlMemberImpl::getTypes() ); s_pTypes = &s_aTypes; @@ -427,7 +430,7 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass() { if (! _xDeclClass.is()) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _xDeclClass.is()) { OUString aName(getMethodTypeDescr()->aBase.aBase.pTypeName); @@ -458,7 +461,7 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes() { if (! _pExceptionTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pExceptionTypes) { sal_Int32 nExc = getMethodTypeDescr()->nExceptions; @@ -484,7 +487,7 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes() { if (! _pParamTypes) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pParamTypes) { sal_Int32 nParams = getMethodTypeDescr()->nParams; @@ -510,7 +513,7 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos() { if (! _pParamInfos) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pParamInfos) { sal_Int32 nParams = getMethodTypeDescr()->nParams; @@ -778,7 +781,7 @@ InterfaceIdlClassImpl::~InterfaceIdlClassImpl() Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses() throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard(getMutexAccess()); + ::osl::MutexGuard aGuard(getMutexAccess()); if (_xSuperClasses.getLength() == 0) { typelib_InterfaceTypeDescription * pType = getTypeDescr(); _xSuperClasses.realloc(pType->nBaseTypes); @@ -853,7 +856,7 @@ Uik InterfaceIdlClassImpl::getUik() Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods() throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) initMembers(); @@ -873,7 +876,7 @@ Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods() Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields() throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) initMembers(); @@ -893,7 +896,7 @@ Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields() Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) initMembers(); @@ -923,7 +926,7 @@ Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - MutexGuard aGuard( getMutexAccess() ); + ::osl::MutexGuard aGuard( getMutexAccess() ); if (! _pSortedMemberInit) initMembers(); -- cgit