diff options
Diffstat (limited to 'include')
78 files changed, 1130 insertions, 1137 deletions
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index 895479333fa9..7dda618c41b1 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -53,15 +53,15 @@ namespace comphelper namespace comphelper { - class COMPHELPER_DLLPUBLIC ChainablePropertySet : public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::beans::XMultiPropertySet + class COMPHELPER_DLLPUBLIC ChainablePropertySet : public css::beans::XPropertySet, + public css::beans::XPropertyState, + public css::beans::XMultiPropertySet { friend class MasterPropertySet; protected: ChainablePropertySetInfo *mpInfo; SolarMutex* mpMutex; - ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySetInfo > mxInfo; + css::uno::Reference < css::beans::XPropertySetInfo > mxInfo; virtual void _preSetValues () throw (css::beans::UnknownPropertyException, @@ -69,7 +69,7 @@ namespace comphelper css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) = 0; - virtual void _setSingleValue(const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue) + virtual void _setSingleValue(const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, @@ -89,24 +89,24 @@ namespace comphelper css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) = 0; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) = 0; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0; static void _preGetPropertyState () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - static void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) - throw(::com::sun::star::beans::UnknownPropertyException ); + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ); + static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState ) + throw(css::beans::UnknownPropertyException ); static void _postGetPropertyState () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ); static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) - throw(::com::sun::star::beans::UnknownPropertyException ); - static ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(css::beans::UnknownPropertyException ); + static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ); public: ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = NULL ) @@ -115,42 +115,42 @@ namespace comphelper throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const 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) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, 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) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, 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) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) + throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx index c5ee4a62e17e..e7bcefe09857 100644 --- a/include/comphelper/ChainablePropertySetInfo.hxx +++ b/include/comphelper/ChainablePropertySetInfo.hxx @@ -34,8 +34,7 @@ namespace comphelper { class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo: - public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySetInfo > + public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > { public: ChainablePropertySetInfo( PropertyInfo const * pMap ); @@ -47,15 +46,15 @@ namespace comphelper throw(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - PropertyInfoHash maMap; - com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; + PropertyInfoHash maMap; + css::uno::Sequence < css::beans::Property > maProperties; friend class ChainablePropertySet; friend class MasterPropertySet; diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx index 482c62668e42..0af1cdaddf4a 100644 --- a/include/comphelper/InlineContainer.hxx +++ b/include/comphelper/InlineContainer.hxx @@ -37,11 +37,11 @@ namespace comphelper uno::Sequence< t >( MakeSequence< t >( t_1 )( t_2 )...( t_n ) ); */ template < typename T > -class MakeSequence : public ::com::sun::star::uno::Sequence< T > +class MakeSequence : public css::uno::Sequence< T > { public: explicit MakeSequence(const T &a) - : ::com::sun::star::uno::Sequence< T >( 1 ) + : css::uno::Sequence< T >( 1 ) { this->operator[](0) = a; } diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index 0b795f457bf4..73d96ae1f469 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -33,9 +33,10 @@ namespace comphelper class ChainablePropertySet; struct SlaveData { - ChainablePropertySet * mpSlave; - ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxSlave; - bool mbInit; + ChainablePropertySet * mpSlave; + css::uno::Reference < css::beans::XPropertySet > mxSlave; + bool mbInit; + SlaveData ( ChainablePropertySet *pSlave); inline bool IsInit () { return mbInit;} inline void SetInit ( bool bInit) { mbInit = bInit; } @@ -55,46 +56,46 @@ typedef std::map < sal_uInt8, comphelper::SlaveData* > SlaveMap; */ namespace comphelper { - class COMPHELPER_DLLPUBLIC MasterPropertySet : public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::beans::XMultiPropertySet + class COMPHELPER_DLLPUBLIC MasterPropertySet : public css::beans::XPropertySet, + public css::beans::XPropertyState, + public css::beans::XMultiPropertySet { protected: MasterPropertySetInfo *mpInfo; SolarMutex* mpMutex; sal_uInt8 mnLastId; SlaveMap maSlaveMap; - ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySetInfo > mxInfo; + css::uno::Reference < css::beans::XPropertySetInfo > mxInfo; virtual void _preSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0; + virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0; virtual void _postSetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0; virtual void _preGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0; + virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) = 0; virtual void _postGetValues () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0; static void _preGetPropertyState () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - static void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) - throw(::com::sun::star::beans::UnknownPropertyException ); + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ); + static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState ) + throw(css::beans::UnknownPropertyException ); static void _postGetPropertyState () - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ); static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) - throw(::com::sun::star::beans::UnknownPropertyException ); - static ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + throw(css::beans::UnknownPropertyException ); + static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ); public: MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, SolarMutex* pMutex = NULL ) @@ -105,42 +106,42 @@ namespace comphelper throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const 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) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, 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) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, 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) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) + throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } #endif diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx index 0ef6585a0ae0..80c1b32ad35e 100644 --- a/include/comphelper/MasterPropertySetInfo.hxx +++ b/include/comphelper/MasterPropertySetInfo.hxx @@ -27,8 +27,7 @@ namespace comphelper { class COMPHELPER_DLLPUBLIC MasterPropertySetInfo: - public ::cppu::WeakImplHelper< - ::com::sun::star::beans::XPropertySetInfo > + public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > { public: MasterPropertySetInfo( PropertyInfo const * pMap ); @@ -40,15 +39,15 @@ namespace comphelper void add( PropertyInfoHash &rHash, sal_uInt8 nMapId ); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() + throw(css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - PropertyDataHash maMap; - com::sun::star::uno::Sequence < com::sun::star::beans::Property > maProperties; + PropertyDataHash maMap; + css::uno::Sequence < css::beans::Property > maProperties; friend class MasterPropertySet; }; diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index 71681cb352db..5844f70f896b 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -52,9 +52,9 @@ namespace comphelper : m_pAdapter(NULL), m_rMutex(_rMutex) { } virtual ~OSelectionChangeListener(); - virtual void _selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) - throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void _selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException) = 0; + virtual void _disposing(const css::lang::EventObject& _rSource) + throw (css::uno::RuntimeException, std::exception); protected: // pseudo-private. Making it private now could break compatibility @@ -65,27 +65,27 @@ namespace comphelper //= OSelectionChangeMultiplexer /// multiplexer for selection changes - class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer :public cppu::WeakImplHelper< ::com::sun::star::view::XSelectionChangeListener> + class COMPHELPER_DLLPUBLIC OSelectionChangeMultiplexer :public cppu::WeakImplHelper< css::view::XSelectionChangeListener> { friend class OSelectionChangeListener; - ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier> m_xSet; - OSelectionChangeListener* m_pListener; - sal_Int32 m_nLockCount; - bool m_bListening : 1; - bool m_bAutoSetRelease : 1; + css::uno::Reference< css::view::XSelectionSupplier> m_xSet; + OSelectionChangeListener* m_pListener; + sal_Int32 m_nLockCount; + bool m_bListening : 1; + bool m_bAutoSetRelease : 1; OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) = delete; OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) = delete; protected: virtual ~OSelectionChangeMultiplexer(); public: - OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet = true); + OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const css::uno::Reference< css::view::XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet = true); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception) override; // XSelectionChangeListener - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; /// incremental lock void lock(); diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx index 0124ffb4ab70..5bc33644b4d1 100644 --- a/include/comphelper/SettingsHelper.hxx +++ b/include/comphelper/SettingsHelper.hxx @@ -30,9 +30,9 @@ namespace comphelper { typedef cppu::WeakImplHelper < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XMultiPropertySet, - ::com::sun::star::lang::XServiceInfo + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::lang::XServiceInfo > HelperBaseNoState; class ChainableHelperNoState : @@ -44,7 +44,7 @@ namespace comphelper : ChainablePropertySet ( pInfo, pMutex ) {} virtual ~ChainableHelperNoState () throw( ) {} - com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) override + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override { return HelperBaseNoState::queryInterface( aType ); } void SAL_CALL acquire( ) throw () override { HelperBaseNoState::acquire( ); } @@ -52,43 +52,43 @@ namespace comphelper { HelperBaseNoState::release( ); } // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + throw(css::uno::RuntimeException, std::exception) override { return ChainablePropertySet::getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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) override + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); } - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return ChainablePropertySet::getPropertyValue ( PropertyName ); } - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); } - virtual void SAL_CALL removePropertyChangeListener( const 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) override + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); } - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, 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) override + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); } - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, 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) override + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); } // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) + throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); } - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) + throw(css::uno::RuntimeException, std::exception) override { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); } - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); } - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override { ChainablePropertySet::removePropertiesChangeListener ( xListener ); } - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + throw(css::uno::RuntimeException, std::exception) override { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); } }; } diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index d15c8339a3dd..9e80e94526cf 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -54,11 +54,11 @@ namespace comphelper note: getLocationOnScreen relies on a valid parent (XAccessibleContext::getParent()->getAccessibleContext()), which itself implements XAccessibleComponent */ - bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException); + css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException); + css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException); + css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException); + css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException); }; @@ -66,7 +66,7 @@ namespace comphelper struct OAccessibleComponentHelper_Base : - public ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleComponent > + public ::cppu::ImplHelper1< css::accessibility::XAccessibleComponent > { protected: ~OAccessibleComponentHelper_Base() {} @@ -89,18 +89,18 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - default implementations - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; }; //= OAccessibleExtendedComponentHelper - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleExtendedComponent + typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleExtendedComponent > OAccessibleExtendedComponentHelper_Base; /** a helper class for implementing an AccessibleContext which at the same time @@ -120,11 +120,11 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - default implementations - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 798d434445a0..4eae0f781bd1 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -76,8 +76,8 @@ namespace comphelper class OContextHelper_Impl; - typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster + typedef ::cppu::WeakAggComponentImplHelper2 < css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster > OAccessibleContextHelper_Base; /** helper class for implementing an AccessibleContext @@ -133,11 +133,11 @@ namespace comphelper XAccessible, we can compare it with all the children, instead of asking all children for their context and comparing this context with ourself.</p> */ - void lateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccessible ); + void lateInit( const css::uno::Reference< css::accessibility::XAccessible >& _rxAccessible ); /** retrieves the creator previously set with <method>lateInit</method> */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > getAccessibleCreator( ) const; private: @@ -152,30 +152,30 @@ namespace comphelper public: // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override = 0; // XAccessibleContext - default implementations /** default implementation for retrieving the index of this object within the parent <p>This basic implementation here returns the index <code>i</code> of the child for which <code><parent>.getAccessibleChild( i )</code> equals our creator.</p> */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; /** default implementation for retrieving the locale <p>This basic implementation returns the locale of the parent context, as retrieved via getAccessibleParent()->getAccessibleContext.</p> */ - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; public: // helper struct for granting selective access rights @@ -211,8 +211,8 @@ namespace comphelper */ void NotifyAccessibleEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ); // life time control @@ -229,7 +229,7 @@ namespace comphelper /** shortcut for retrieving the context of the parent (returned by getAccessibleParent) */ - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > implGetParentContext(); // access to the base class' broadcast helper/mutex diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index 0cef8ed1487c..9ed47cf2dcad 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -82,7 +82,7 @@ namespace comphelper */ static void revokeClientNotifyDisposing( const TClientId _nClient, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxEventSource + const css::uno::Reference< css::uno::XInterface >& _rxEventSource ); /** registers a listener for the given client @@ -94,7 +94,7 @@ namespace comphelper */ static sal_Int32 addEventListener( const TClientId _nClient, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& _rxListener + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& _rxListener ); /** revokes a listener for the given client @@ -106,7 +106,7 @@ namespace comphelper */ static sal_Int32 removeEventListener( const TClientId _nClient, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& _rxListener + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& _rxListener ); /** adds an event, which is to be braodcasted, to the queue @@ -116,7 +116,7 @@ namespace comphelper */ static void addEvent( const TClientId _nClient, - const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent + const css::accessibility::AccessibleEventObject& _rEvent ); }; diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index c11cfc6fcb29..cbe81a38a7d1 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -37,7 +37,7 @@ namespace comphelper // OAccessibleKeyBindingHelper - typedef ::cppu::WeakImplHelper < ::com::sun::star::accessibility::XAccessibleKeyBinding + typedef ::cppu::WeakImplHelper < css::accessibility::XAccessibleKeyBinding > OAccessibleKeyBindingHelper_Base; /** a helper class for implementing an accessible keybinding @@ -45,7 +45,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OAccessibleKeyBindingHelper : public OAccessibleKeyBindingHelper_Base { private: - typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > > KeyBindings; + typedef ::std::vector< css::uno::Sequence< css::awt::KeyStroke > > KeyBindings; KeyBindings m_aKeyBindings; @@ -58,12 +58,12 @@ namespace comphelper OAccessibleKeyBindingHelper(); OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper ); - void AddKeyBinding( const ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke >& rKeyBinding ) throw (::com::sun::star::uno::RuntimeException); - void AddKeyBinding( const ::com::sun::star::awt::KeyStroke& rKeyStroke ) throw (::com::sun::star::uno::RuntimeException); + void AddKeyBinding( const css::uno::Sequence< css::awt::KeyStroke >& rKeyBinding ) throw (css::uno::RuntimeException); + void AddKeyBinding( const css::awt::KeyStroke& rKeyStroke ) throw (css::uno::RuntimeException); // XAccessibleKeyBinding - virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 84011e103340..ca6edea1e98e 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -51,14 +51,14 @@ namespace comphelper protected: // access to context - still waiting to be overwritten - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + virtual css::uno::Reference< css::accessibility::XAccessibleContext > implGetAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ) = 0; + throw ( css::uno::RuntimeException ) = 0; // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (css::uno::RuntimeException) = 0; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void @@ -69,20 +69,20 @@ namespace comphelper /** non-virtual versions of the methods which can be implemented using <method>implIsSelected</method> and <method>implSelect</method> */ - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException); + void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException); + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); }; //= OAccessibleSelectionHelper - typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base; + typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > OAccessibleSelectionHelper_Base; /** a helper class for implementing an AccessibleSelection which at the same time supports an XAccessibleSelection interface. @@ -97,7 +97,7 @@ namespace comphelper OAccessibleSelectionHelper( IMutex* _pExternalLock ); // return ourself here by default - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( css::uno::RuntimeException ) override; public: @@ -106,13 +106,13 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleSelection - default implementations - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 24716e9e3cdd..ed9e6ac2221a 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -43,39 +43,39 @@ namespace comphelper class COMPHELPER_DLLPUBLIC OCommonAccessibleText { private: - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > m_xBreakIter; - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > m_xCharClass; + css::uno::Reference < css::i18n::XBreakIterator > m_xBreakIter; + css::uno::Reference < css::i18n::XCharacterClassification > m_xCharClass; protected: OCommonAccessibleText(); virtual ~OCommonAccessibleText(); - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); - ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); - static bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); + css::uno::Reference < css::i18n::XBreakIterator > implGetBreakIterator(); + css::uno::Reference < css::i18n::XCharacterClassification > implGetCharacterClassification(); + static bool implIsValidBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nLength ); static bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); static bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); virtual OUString implGetText() = 0; - virtual ::com::sun::star::lang::Locale implGetLocale() = 0; + virtual css::lang::Locale implGetLocale() = 0; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; - void implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - bool implGetWordBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - void implGetSentenceBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetGlyphBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + bool implGetWordBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + void implGetSentenceBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetParagraphBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetLineBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nIndex ); /** non-virtual versions of the methods */ - sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException); + OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException); + sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException); + sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException); + OUString SAL_CALL getText() throw (css::uno::RuntimeException); + OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException); + css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException); public: @@ -86,14 +86,14 @@ namespace comphelper @returns true if there are differences between the two strings and false if both are equal - @see ::com::sun::star::accessibility::AccessibleEventId - ::com::sun::star::accessibility::TextSegment + @see css::accessibility::AccessibleEventId + css::accessibility::TextSegment */ static bool implInitTextChangedEvent( const OUString& rOldString, const OUString& rNewString, - /*out*/ ::com::sun::star::uno::Any& rDeleted, - /*out*/ ::com::sun::star::uno::Any& rInserted); // throw() + /*out*/ css::uno::Any& rDeleted, + /*out*/ css::uno::Any& rInserted); // throw() }; @@ -101,7 +101,7 @@ namespace comphelper // OAccessibleTextHelper - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleText + typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleText > OAccessibleTextHelper_Base; /** a helper class for implementing an AccessibleExtendedComponent which at the same time @@ -123,16 +123,16 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleText - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; }; diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index 16854cbd44b5..f9b48e8c2e25 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -54,7 +54,7 @@ namespace comphelper class OWrappedAccessibleChildrenManager; struct OAccessibleWrapper_Base : - public ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessible > + public ::cppu::ImplHelper1 < css::accessibility::XAccessible > { protected: ~OAccessibleWrapper_Base() {} @@ -68,13 +68,13 @@ namespace comphelper { private: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xParentAccessible; - ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::WeakReference< css::accessibility::XAccessibleContext > m_aContext; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xInnerAccessible; public: @@ -89,27 +89,27 @@ namespace comphelper The XAccessible which is our parent */ OAccessibleWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxInnerAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::accessibility::XAccessible >& _rxInnerAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParentAccessible ); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() // returns the context without creating it - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > getContextNoCreate( ) const; protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL + getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > getParent() const { return m_xParentAccessible; } // own overridables virtual OAccessibleContextWrapper* createAccessibleContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerContext + const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxInnerContext ); protected: @@ -124,7 +124,7 @@ namespace comphelper //= OAccessibleContextWrapperHelper - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleEventListener + typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleEventListener > OAccessibleContextWrapperHelper_Base; /** Helper for wrapping an XAccessibleContext by aggregating a proxy for it. @@ -148,13 +148,13 @@ namespace comphelper { protected: /// the context we're wrapping (properly typed, in opposite to OComponentProxyAggregationHelper::m_xInner) - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + css::uno::Reference< css::accessibility::XAccessibleContext > m_xInnerContext; /// the XAccessible which created this context - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xOwningAccessible; /// the XAccessible which is to be returned in getAccessibleParent - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > m_xParentAccessible; OWrappedAccessibleChildrenManager* m_pChildMapper; // for mapping children from our inner context to our callers @@ -178,11 +178,11 @@ namespace comphelper The XAccessible to return in the getAccessibleParent call */ OAccessibleContextWrapperHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, ::cppu::OBroadcastHelper& _rBHelper, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerAccessibleContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible + const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxInnerAccessibleContext, + const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParentAccessible ); /// to be called from within your ctor - does the aggregation of a proxy for m_xInnerContext @@ -193,24 +193,24 @@ namespace comphelper protected: // XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - sal_Int32 baseGetAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > baseGetAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 baseGetAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception); + css::uno::Reference< css::accessibility::XAccessible > baseGetAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + css::uno::Reference< css::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception); // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XComponent/OComponentProxyAggregationHelper - 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; // own overridables /** notify an accessible event which has been translated (if necessary) @@ -221,7 +221,7 @@ namespace comphelper <p>The mutex of the BroadcastHelper passed to the instance's ctor is <em>not</em> locked when calling into this method</p> */ - virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) = 0; protected: virtual ~OAccessibleContextWrapperHelper( ); @@ -234,8 +234,8 @@ namespace comphelper //= OAccessibleContextWrapper - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessibleEventBroadcaster - , ::com::sun::star::accessibility::XAccessibleContext + typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessibleEventBroadcaster + , css::accessibility::XAccessibleContext > OAccessibleContextWrapper_CBase; class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper @@ -265,10 +265,10 @@ namespace comphelper The XAccessible to return in the getAccessibleParent call */ OAccessibleContextWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerAccessibleContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxInnerAccessibleContext, + const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible, + const css::uno::Reference< css::accessibility::XAccessible >& _rxParentAccessible ); // XInterface @@ -277,27 +277,27 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // OAccessibleContextWrapper - virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException) override; + virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) override; // OComponentHelper using OAccessibleContextWrapperHelper::disposing; - virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) override; protected: virtual ~OAccessibleContextWrapper(); @@ -311,30 +311,30 @@ namespace comphelper //= OWrappedAccessibleChildrenManager - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - , ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - , OInterfaceCompare< ::com::sun::star::accessibility::XAccessible > + typedef ::std::map < css::uno::Reference< css::accessibility::XAccessible > + , css::uno::Reference< css::accessibility::XAccessible > + , OInterfaceCompare< css::accessibility::XAccessible > > AccessibleMap; // TODO: think about if we should hold these objects weak - typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener + typedef ::cppu::WeakImplHelper< css::lang::XEventListener > OWrappedAccessibleChildrenManager_Base; /** manages wrapping XAccessible's to XAccessible's */ class COMPHELPER_DLLPUBLIC OWrappedAccessibleChildrenManager : public OWrappedAccessibleChildrenManager_Base { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > + css::uno::WeakReference< css::accessibility::XAccessible > m_aOwningAccessible; // the XAccessible which belongs to the XAccessibleContext which we work for AccessibleMap m_aChildrenMap; // for caching children - bool m_bTransientChildren; // are we prohibited to cache our children? + bool m_bTransientChildren; // are we prohibited to cache our children? public: /// ctor OWrappedAccessibleChildrenManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); /** specifies if the children are to be consideren transient (i.e.: not cached) @@ -345,17 +345,17 @@ namespace comphelper /** sets the XAccessible which belongs to the XAccessibleContext which we work for <p>to be called only once per lifetime</p> */ - void setOwningAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAcc ); + void setOwningAccessible( const css::uno::Reference< css::accessibility::XAccessible >& _rxAcc ); /// retrieves a wrapper for the given accessible - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > getAccessibleWrapperFor( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey, + const css::uno::Reference< css::accessibility::XAccessible >& _rxKey, bool _bCreate = true ); /// erases the given key from the map (if it is present there) - void removeFromCache( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxKey ); + void removeFromCache( const css::uno::Reference< css::accessibility::XAccessible >& _rxKey ); /// invalidates (i.e. empties) the map void invalidateAll( ); @@ -369,22 +369,22 @@ namespace comphelper /** handles a notification as got from the parent of the children we're managing <p>This applies only to the notifications which have a direct impact on our map.</p> */ - void handleChildNotification( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ); + void handleChildNotification( const css::accessibility::AccessibleEventObject& _rEvent ); /** translates events as got from the parent of the children we're managing <p>This applies only to the notifications which deal with child objects which we manage.</p> */ void translateAccessibleEvent( - const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent, - ::com::sun::star::accessibility::AccessibleEventObject& _rTranslatedEvent + const css::accessibility::AccessibleEventObject& _rEvent, + css::accessibility::AccessibleEventObject& _rTranslatedEvent ); protected: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; protected: - void implTranslateChildEventValue( const ::com::sun::star::uno::Any& _rInValue, ::com::sun::star::uno::Any& _rOutValue ); + void implTranslateChildEventValue( const css::uno::Any& _rInValue, css::uno::Any& _rOutValue ); protected: virtual ~OWrappedAccessibleChildrenManager( ); diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index deb1d630c8d1..8541d0d482f0 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -33,7 +33,7 @@ namespace comphelper { //= OAccessibleImplementationAccess - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XUnoTunnel + typedef ::cppu::ImplHelper1 < css::lang::XUnoTunnel > OAccImpl_Base; struct OAccImpl_Impl; @@ -66,7 +66,7 @@ namespace comphelper protected: /// retrieves the parent previously set via <method>setAccessibleParent</method> - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > implGetForeignControlledParent( ) const; /** retrieves the set of currently set states which are controlled by a foreign instance @@ -77,14 +77,14 @@ namespace comphelper /// sets the accessible parent component void setAccessibleParent( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxAccParent ); + const css::uno::Reference< css::accessibility::XAccessible >& _rxAccParent ); protected: OAccessibleImplementationAccess( ); virtual ~OAccessibleImplementationAccess( ); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (css::uno::RuntimeException, std::exception) override; public: /** tries to access the implementation of an OAccessibleImplementationAccess derivee which is known as @@ -98,7 +98,7 @@ namespace comphelper from OAccessibleImplementationAccess, or retrieving the implementation failed). */ static OAccessibleImplementationAccess* getImplementation( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent + const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent ); /** sets the parent for a derived implementation @@ -112,12 +112,12 @@ namespace comphelper <method>getImplementation</method>. */ static bool setAccessibleParent( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxComponent, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewParent + const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent, + const css::uno::Reference< css::accessibility::XAccessible >& _rxNewParent ); private: - COMPHELPER_DLLPRIVATE static const ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + COMPHELPER_DLLPRIVATE static const css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; } // namespace comphelper diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index de9f806ee2f7..a871fd80a0a9 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -41,21 +41,21 @@ namespace comphelper class SAL_NO_VTABLE IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const = 0; + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const = 0; virtual ~IKeyPredicateLess() {} }; //= LessPredicateAdapter - struct LessPredicateAdapter : public ::std::binary_function< ::com::sun::star::uno::Any, ::com::sun::star::uno::Any, bool > + struct LessPredicateAdapter : public ::std::binary_function< css::uno::Any, css::uno::Any, bool > { LessPredicateAdapter( const IKeyPredicateLess& _predicate ) :m_predicate( _predicate ) { } - bool operator()( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const + bool operator()( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const { return m_predicate.isLess( _lhs, _rhs ); } @@ -74,13 +74,13 @@ namespace comphelper class ScalarPredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { SCALAR lhs(0), rhs(0); if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return lhs < rhs; } }; @@ -91,13 +91,13 @@ namespace comphelper class StringPredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { OUString lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return lhs < rhs; } }; @@ -108,23 +108,23 @@ namespace comphelper class StringCollationPredicateLess : public IKeyPredicateLess { public: - StringCollationPredicateLess( ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator ) + StringCollationPredicateLess( css::uno::Reference< css::i18n::XCollator > const & i_collator ) :m_collator( i_collator ) { } - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { OUString lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return m_collator->compareString( lhs, rhs ) < 0; } private: - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const m_collator; + css::uno::Reference< css::i18n::XCollator > const m_collator; }; @@ -133,13 +133,13 @@ namespace comphelper class TypePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { - ::com::sun::star::uno::Type lhs, rhs; + css::uno::Type lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return lhs.getTypeName() < rhs.getTypeName(); } }; @@ -150,12 +150,12 @@ namespace comphelper class EnumPredicateLess : public IKeyPredicateLess { public: - EnumPredicateLess( ::com::sun::star::uno::Type const & _enumType ) + EnumPredicateLess( css::uno::Type const & _enumType ) :m_enumType( _enumType ) { } - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { sal_Int32 lhs(0), rhs(0); if ( !::cppu::enum2int( lhs, _lhs ) @@ -163,12 +163,12 @@ namespace comphelper || !_lhs.getValueType().equals( m_enumType ) || !_rhs.getValueType().equals( m_enumType ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return lhs < rhs; } private: - ::com::sun::star::uno::Type const m_enumType; + css::uno::Type const m_enumType; }; @@ -177,15 +177,15 @@ namespace comphelper class InterfacePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const override + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const override { - if ( ( _lhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE ) - || ( _rhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE ) + if ( ( _lhs.getValueTypeClass() != css::uno::TypeClass_INTERFACE ) + || ( _rhs.getValueTypeClass() != css::uno::TypeClass_INTERFACE ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > lhs( _lhs, ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rhs( _rhs, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::uno::XInterface > lhs( _lhs, css::uno::UNO_QUERY ); + css::uno::Reference< css::uno::XInterface > rhs( _rhs, css::uno::UNO_QUERY ); return lhs.get() < rhs.get(); } }; @@ -206,8 +206,8 @@ namespace comphelper */ ::std::unique_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC getStandardLessPredicate( - ::com::sun::star::uno::Type const & i_type, - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator + css::uno::Type const & i_type, + css::uno::Reference< css::i18n::XCollator > const & i_collator ); diff --git a/include/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx index 542fe4964461..7edab7b16972 100644 --- a/include/comphelper/anytostring.hxx +++ b/include/comphelper/anytostring.hxx @@ -34,7 +34,7 @@ namespace comphelper @return STRING representation of given ANY value */ -COMPHELPER_DLLPUBLIC OUString anyToString( ::com::sun::star::uno::Any const & value ); +COMPHELPER_DLLPUBLIC OUString anyToString( css::uno::Any const & value ); } diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx index c427d6fc7c21..1337a3a64272 100644 --- a/include/comphelper/attributelist.hxx +++ b/include/comphelper/attributelist.hxx @@ -32,7 +32,7 @@ struct AttributeList_Impl; class COMPHELPER_DLLPUBLIC AttributeList : public ::cppu::WeakImplHelper < - ::com::sun::star::xml::sax::XAttributeList + css::xml::sax::XAttributeList > { AttributeList_Impl *m_pImpl; @@ -43,19 +43,19 @@ public: // methods that are not contained in any interface void AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); - // ::com::sun::star::xml::sax::XAttributeList + // css::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getTypeByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getValueByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 94182497e88b..839c6e7bd576 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -37,7 +37,7 @@ namespace comphelper /** creates a ComponentBase instance The instance is not initialized. As a consequence, every ComponentMethodGuard instantiated for - this component will throw a com::sun::star::lang::NotInitializedException, + this component will throw a css::lang::NotInitializedException, until ->setInitialized() is called. */ ComponentBase( ::cppu::OBroadcastHelper& _rBHelper ) @@ -100,7 +100,7 @@ namespace comphelper The default implementation returns <NULL/>. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + static css::uno::Reference< css::uno::XInterface > getComponent(); private: diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx index 2d64c492fb44..6957f7397f66 100644 --- a/include/comphelper/componentguard.hxx +++ b/include/comphelper/componentguard.hxx @@ -40,7 +40,7 @@ namespace comphelper :m_aGuard( i_broadcastHelper.rMutex ) { if ( i_broadcastHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( OUString(), &i_component ); + throw css::lang::DisposedException( OUString(), &i_component ); } ~ComponentGuard() diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 172b0b2c0072..7b06a308f600 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -38,11 +38,11 @@ namespace comphelper /** factory factory declaration */ - typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation) + typedef css::uno::Reference< css::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation) ( - ::cppu::ComponentFactoryFunc _pFactoryFunc, - OUString const& _rComponentName, - ::com::sun::star::uno::Sequence< OUString > const & _rServiceNames, + ::cppu::ComponentFactoryFunc _pFactoryFunc, + OUString const& _rComponentName, + css::uno::Sequence< OUString > const & _rServiceNames, rtl_ModuleCount* ); @@ -54,15 +54,15 @@ namespace comphelper /// the implementation name of the component OUString sImplementationName; /// the services supported by the component implementation - ::com::sun::star::uno::Sequence< OUString > aSupportedServices; + css::uno::Sequence< OUString > aSupportedServices; /** the name under which the component implementation should be registered as singleton, or empty if the component does not implement a singleton. */ OUString sSingletonName; /// the function to create an instance of the component - ::cppu::ComponentFactoryFunc pComponentCreationFunc; + ::cppu::ComponentFactoryFunc pComponentCreationFunc; /// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>) - FactoryInstantiation pFactoryCreationFunc; + FactoryInstantiation pFactoryCreationFunc; ComponentDescription() :sImplementationName() @@ -75,7 +75,7 @@ namespace comphelper ComponentDescription( const OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< OUString >& _rSupportedServices, + const css::uno::Sequence< OUString >& _rSupportedServices, const OUString& _rSingletonName, ::cppu::ComponentFactoryFunc _pComponentCreationFunc, FactoryInstantiation _pFactoryCreationFunc @@ -119,7 +119,7 @@ namespace comphelper */ void registerImplementation( const OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, + const css::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction = ::cppu::createSingleComponentFactory ); @@ -134,7 +134,7 @@ namespace comphelper @return the XInterface access to a factory for the component */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( + css::uno::Reference< css::uno::XInterface > getComponentFactory( const OUString& _rImplementationName ); /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call @@ -192,9 +192,9 @@ namespace comphelper <p>Assumed that the template argument has the three methods <ul> <li><code>static OUString getImplementationName_static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/> - <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> + <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/> + <li><code>static css::uno::Reference< css::uno::XInterface > + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code> </li> <ul/> the instantiation of this object will automatically register the class via <member>OModule::registerImplementation</member>. @@ -227,10 +227,10 @@ namespace comphelper <p>Assumed that the template argument has the three methods <ul> <li><code>static OUString getImplementationName_static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/> + <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/> <li><code>static OUString getSingletonName_static()</code></li> - <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> + <li><code>static css::uno::Reference< css::uno::XInterface > + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code> </li> <ul/> the instantiation of this object will automatically register the class via <member>OModule::registerImplementation</member>. diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index b1cdefdf204f..915d803b6f16 100644 --- a/include/comphelper/configuration.hxx +++ b/include/comphelper/configuration.hxx @@ -45,7 +45,7 @@ namespace detail { class ConfigurationWrapper; } class COMPHELPER_DLLPUBLIC ConfigurationChanges { public: static std::shared_ptr<ConfigurationChanges> create( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()); ~ConfigurationChanges(); @@ -57,23 +57,23 @@ private: ConfigurationChanges& operator=(const ConfigurationChanges&) = delete; SAL_DLLPRIVATE ConfigurationChanges( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context); SAL_DLLPRIVATE void setPropertyValue( - OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, css::uno::Any const & value) const; - SAL_DLLPRIVATE com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameReplace > + SAL_DLLPRIVATE css::uno::Reference< + css::container::XHierarchicalNameReplace > getGroup(OUString const & path) const; SAL_DLLPRIVATE - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > getSet(OUString const & path) const; - com::sun::star::uno::Reference< - com::sun::star::configuration::XReadWriteAccess > access_; + css::uno::Reference< + css::configuration::XReadWriteAccess > access_; friend class detail::ConfigurationWrapper; }; @@ -84,44 +84,44 @@ namespace detail { class COMPHELPER_DLLPUBLIC ConfigurationWrapper { public: static ConfigurationWrapper const & get( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context); SAL_DLLPRIVATE explicit ConfigurationWrapper( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context); SAL_DLLPRIVATE ~ConfigurationWrapper(); bool isReadOnly(OUString const & path) const; - com::sun::star::uno::Any getPropertyValue(OUString const & path) const; + css::uno::Any getPropertyValue(OUString const & path) const; static void setPropertyValue( std::shared_ptr< ConfigurationChanges > const & batch, - OUString const & path, com::sun::star::uno::Any const & value); + OUString const & path, css::uno::Any const & value); - com::sun::star::uno::Any getLocalizedPropertyValue( + css::uno::Any getLocalizedPropertyValue( OUString const & path) const; static void setLocalizedPropertyValue( std::shared_ptr< ConfigurationChanges > const & batch, - OUString const & path, com::sun::star::uno::Any const & value); + OUString const & path, css::uno::Any const & value); - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< + css::container::XHierarchicalNameAccess > getGroupReadOnly(OUString const & path) const; - static com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameReplace > + static css::uno::Reference< + css::container::XHierarchicalNameReplace > getGroupReadWrite( std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path); - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > getSetReadOnly(OUString const & path) const; - static com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > + static css::uno::Reference< css::container::XNameContainer > getSetReadWrite( std::shared_ptr< ConfigurationChanges > const & batch, OUString const & path); @@ -132,11 +132,9 @@ private: ConfigurationWrapper(const ConfigurationWrapper&) = delete; ConfigurationWrapper& operator=(const ConfigurationWrapper&) = delete; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - context_; + css::uno::Reference< css::uno::XComponentContext > context_; - com::sun::star::uno::Reference< - com::sun::star::configuration::XReadWriteAccess > access_; + css::uno::Reference< css::configuration::XReadWriteAccess > access_; // should really be an css.configuration.ReadOnlyAccess (with added // css.beans.XHierarchicalPropertySetInfo), but then // configmgr::Access::asProperty() would report all properties as @@ -145,10 +143,10 @@ private: /// @internal template< typename T > struct Convert { - static com::sun::star::uno::Any toAny(T const & value) - { return com::sun::star::uno::makeAny(value); } + static css::uno::Any toAny(T const & value) + { return css::uno::makeAny(value); } - static T fromAny(com::sun::star::uno::Any const & value) + static T fromAny(css::uno::Any const & value) { return value.get< T >(); } private: @@ -162,13 +160,13 @@ private: /// @internal template< typename T > struct Convert< boost::optional< T > > { - static com::sun::star::uno::Any toAny(boost::optional< T > const & value) { + static css::uno::Any toAny(boost::optional< T > const & value) { return value - ? com::sun::star::uno::makeAny(value.get()) - : com::sun::star::uno::Any(); + ? css::uno::makeAny(value.get()) + : css::uno::Any(); } - static boost::optional< T > fromAny(com::sun::star::uno::Any const & value) + static boost::optional< T > fromAny(css::uno::Any const & value) { return value.hasValue() ? boost::optional< T >(value.get< T >()) : boost::optional< T >(); @@ -204,12 +202,12 @@ template< typename T, typename U > struct ConfigurationProperty /// /// For nillable properties, U is of type boost::optional<U'>. static U get( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { // Folding this into one statement causes a bogus error at least with // Red Hat GCC 4.6.2-1: - com::sun::star::uno::Any a( + css::uno::Any a( detail::ConfigurationWrapper::get(context).getPropertyValue( T::path())); return detail::Convert< U >::fromAny(a); @@ -248,12 +246,12 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty /// /// For nillable properties, U is of type boost::optional<U'>. static U get( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { // Folding this into one statement causes a bogus error at least with // Red Hat GCC 4.6.2-1: - com::sun::star::uno::Any a( + css::uno::Any a( detail::ConfigurationWrapper::get(context). getLocalizedPropertyValue(T::path())); return detail::Convert< U >::fromAny(a); @@ -288,9 +286,9 @@ private: /// given configuration group. template< typename T > struct ConfigurationGroup { /// Get read-only access to the given configuration group. - static com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > - get(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + static css::uno::Reference< + css::container::XHierarchicalNameAccess > + get(css::uno::Reference< css::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { return detail::ConfigurationWrapper::get(context).getGroupReadOnly( @@ -299,8 +297,8 @@ template< typename T > struct ConfigurationGroup { /// Get read/write access to the given configuration group, storing any /// modifications via the given changes batch. - static com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameReplace > + static css::uno::Reference< + css::container::XHierarchicalNameReplace > get(std::shared_ptr< ConfigurationChanges > const & batch) { return comphelper::detail::ConfigurationWrapper::getGroupReadWrite( @@ -323,8 +321,8 @@ private: template< typename T > struct ConfigurationSet { /// Get read-only access to the given configuration set. static - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > - get(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::container::XNameAccess > + get(css::uno::Reference< css::uno::XComponentContext > const & context = comphelper::getProcessComponentContext()) { return detail::ConfigurationWrapper::get(context).getSetReadOnly( @@ -334,7 +332,7 @@ template< typename T > struct ConfigurationSet { /// Get read/write access to the given configuration set, storing any /// modifications via the given changes batch. static - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > get(std::shared_ptr< ConfigurationChanges > const & batch) { return comphelper::detail::ConfigurationWrapper::getSetReadWrite( diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx index 9641208765ea..6e598c1a0143 100644 --- a/include/comphelper/configurationlistener.hxx +++ b/include/comphelper/configurationlistener.hxx @@ -68,7 +68,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationListener : public: /// Public health warning, you -must- dispose this if you use it. ConfigurationListener(const OUString &rPath, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & xContext = comphelper::getProcessComponentContext()) : mxConfig( ConfigurationHelper::openConfig( xContext, rPath, ConfigurationHelper::EConfigurationModes::E_READONLY ), diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index a559a7326e20..376406734935 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -37,11 +37,11 @@ namespace comphelper class COMPHELPER_DLLPUBLIC IndexAccessIterator { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStartingPoint; + css::uno::Reference< css::uno::XInterface> m_xStartingPoint; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xCurrentObject; + css::uno::Reference< css::uno::XInterface> m_xCurrentObject; // The current object - ::std::vector<sal_Int32> m_arrChildIndizies; + ::std::vector<sal_Int32> m_arrChildIndizies; // I'm moving through a tree, but its elements have no GetNextSibling, // so I have to remember where each child is in relation to its parent. @@ -51,23 +51,23 @@ protected: // The Name of the requested property public: - IndexAccessIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); + IndexAccessIterator(css::uno::Reference< css::uno::XInterface> xStartingPoint); virtual ~IndexAccessIterator(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> Next(); + css::uno::Reference< css::uno::XInterface> Next(); virtual void Invalidate() { m_xCurrentObject = NULL; } protected: - virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*rElement*/) { return true; } + virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& /*rElement*/) { return true; } // This can be used to exclude certain elements; elements for which // this function returns sal_True will be simply skipped. // If this element is returned from Next(), then one can get // here get a little more information on the element. // That's why this method is not const. - virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& /*xContainer*/) const { return true; } + virtual bool ShouldStepInto(const css::uno::Reference< css::uno::XInterface>& /*xContainer*/) const { return true; } }; diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index cf43c663bf37..f66024882e68 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -50,17 +50,17 @@ namespace comphelper OContainerListener(::osl::Mutex& _rMutex); virtual ~OContainerListener(); - virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) - throw (::com::sun::star::uno::RuntimeException, + virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) + throw (css::uno::RuntimeException, std::exception); - virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _Event ) - throw (::com::sun::star::uno::RuntimeException, + virtual void _elementRemoved( const css::container::ContainerEvent& _Event ) + throw (css::uno::RuntimeException, std::exception); - virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) - throw (::com::sun::star::uno::RuntimeException, + virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) + throw (css::uno::RuntimeException, std::exception); - virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) - throw (::com::sun::star::uno::RuntimeException, + virtual void _disposing(const css::lang::EventObject& _rSource) + throw (css::uno::RuntimeException, std::exception); protected: @@ -71,12 +71,12 @@ namespace comphelper //= OContainerListenerAdapter class COMPHELPER_DLLPUBLIC OContainerListenerAdapter - :public cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > + :public cppu::WeakImplHelper< css::container::XContainerListener > { friend class OContainerListener; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > + css::uno::Reference< css::container::XContainer > m_xContainer; OContainerListener* m_pListener; sal_Int32 m_nLockCount; @@ -85,15 +85,15 @@ namespace comphelper public: OContainerListenerAdapter(OContainerListener* _pListener, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _rxContainer); + const css::uno::Reference< css::container::XContainer >& _rxContainer); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; // locking the multiplexer sal_Int32 locked() const { return m_nLockCount; } diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index 37260f9b0ba3..6c61837c48e9 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -69,7 +69,7 @@ public: occurred while password verification. The password request loop will be aborted. */ - virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; + virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) = 0; /** Will be called every time an encryption data needs to be verified. @@ -85,7 +85,7 @@ public: occurred while data verification. The password request loop will be aborted. */ - virtual DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0; + virtual DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) = 0; }; @@ -110,7 +110,7 @@ public: The sequence containing the hash and the algorithm-related info */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + static css::uno::Sequence< css::beans::PropertyValue > GenerateNewModifyPasswordInfo( const OUString& aPassword ); @@ -131,7 +131,7 @@ public: static bool IsModifyPasswordCorrect( const OUString& aPassword, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo ); + const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); @@ -187,7 +187,7 @@ public: The hash represented by sequence of bytes in BigEndian form */ - static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence( + static css::uno::Sequence< sal_Int8 > GetXLHashAsSequence( const OUString& aString, rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); @@ -197,7 +197,7 @@ public: requested length. */ - static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateRandomByteSequence( + static css::uno::Sequence< sal_Int8 > GenerateRandomByteSequence( sal_Int32 nLength ); @@ -206,9 +206,9 @@ public: key digest value used by MSCodec_Std97 codec. */ - static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key( + static css::uno::Sequence< sal_Int8 > GenerateStd97Key( const OUString& aPassword, - const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId ); + const css::uno::Sequence< sal_Int8 >& aDocId ); @@ -216,15 +216,15 @@ public: key digest value used by MSCodec_Std97 codec. */ - static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key( + static css::uno::Sequence< sal_Int8 > GenerateStd97Key( const sal_uInt16 pPassData[16], - const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId ); + const css::uno::Sequence< sal_Int8 >& aDocId ); /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. */ - static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key( + static css::uno::Sequence< sal_Int8 > GenerateStd97Key( const sal_uInt16 pPassData[16], const sal_uInt8 pDocId[16] ); @@ -283,12 +283,11 @@ public: passed password verifier. If empty, no valid password has been found, or the user has chossen to cancel password input. */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword( + static css::uno::Sequence< css::beans::NamedValue > requestAndVerifyDocPassword( IDocPasswordVerifier& rVerifier, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData, + const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const OUString& rMediaPassword, - const ::com::sun::star::uno::Reference< - ::com::sun::star::task::XInteractionHandler >& rxInteractHandler, + const css::uno::Reference< css::task::XInteractionHandler >& rxInteractHandler, const OUString& rDocumentName, DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0, diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index b1c7b188e5b2..0d37b962ddc6 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -45,21 +45,21 @@ class COMPHELPER_DLLPUBLIC SimplePasswordRequest : public cppu::WeakImplHelper<css::task::XInteractionRequest> { public: - explicit SimplePasswordRequest( com::sun::star::task::PasswordRequestMode eMode ); + explicit SimplePasswordRequest( css::task::PasswordRequestMode eMode ); virtual ~SimplePasswordRequest(); - bool isPassword() const; + bool isPassword() const; OUString getPassword() const; private: // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override; private: - ::com::sun::star::uno::Any maRequest; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > maContinuations; + css::uno::Any maRequest; + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > maContinuations; PasswordContinuation * mpPassword; }; @@ -74,7 +74,7 @@ class COMPHELPER_DLLPUBLIC DocPasswordRequest : public: explicit DocPasswordRequest( DocPasswordRequestType eType, - ::com::sun::star::task::PasswordRequestMode eMode, + css::task::PasswordRequestMode eMode, const OUString& rDocumentName, bool bPasswordToModify = false ); virtual ~DocPasswordRequest(); @@ -88,12 +88,12 @@ public: private: // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override; private: - ::com::sun::star::uno::Any maRequest; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > maContinuations; + css::uno::Any maRequest; + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > maContinuations; PasswordContinuation * mpPassword; }; diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx index 59f4d45a06b6..07155054eee2 100644 --- a/include/comphelper/documentinfo.hxx +++ b/include/comphelper/documentinfo.hxx @@ -35,7 +35,7 @@ namespace comphelper { { /** retrieves the UI title of the given document */ - COMPHELPER_DLLPUBLIC OUString getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); + COMPHELPER_DLLPUBLIC OUString getDocumentTitle( const css::uno::Reference< css::frame::XModel >& _rxDocument ); } diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index 3168d37610b8..6609c2aea095 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -40,8 +40,8 @@ namespace comphelper { public: virtual EmbeddedObjectContainer& getEmbeddedObjectContainer() const = 0; - virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const = 0; + virtual css::uno::Reference < css::embed::XStorage > getStorage() const = 0; + virtual css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler() const = 0; virtual bool isEnableSetModified() const = 0; protected: @@ -53,8 +53,8 @@ class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer { EmbedImpl* pImpl; - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const OUString&, - const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy); + css::uno::Reference < css::embed::XEmbeddedObject > Get_Impl( const OUString&, + const css::uno::Reference < css::embed::XEmbeddedObject >& xCopy); public: // add an embedded object to the container storage @@ -63,62 +63,62 @@ public: const OUString& rSrcShellID, const OUString& rDestShellID ); // add an embedded object that has been imported from the container storage - should only be called by filters! - void AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const OUString& ); + void AddEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >&, const OUString& ); EmbeddedObjectContainer(); - EmbeddedObjectContainer( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ); - EmbeddedObjectContainer( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const com::sun::star::uno::Reference < com::sun::star::uno::XInterface >& ); + EmbeddedObjectContainer( const css::uno::Reference < css::embed::XStorage >& ); + EmbeddedObjectContainer( const css::uno::Reference < css::embed::XStorage >&, + const css::uno::Reference < css::uno::XInterface >& ); ~EmbeddedObjectContainer(); - void SwitchPersistence( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ); - bool CommitImageSubStorage(); + void SwitchPersistence( const css::uno::Reference < css::embed::XStorage >& ); + bool CommitImageSubStorage(); void ReleaseImageSubStorage(); OUString CreateUniqueObjectName(); // get a list of object names that have been added so far - com::sun::star::uno::Sequence < OUString > GetObjectNames(); + css::uno::Sequence < OUString > GetObjectNames(); // check for existence of objects at all bool HasEmbeddedObjects(); // check existence of an object - either by identity or by name bool HasEmbeddedObject( const OUString& ); - bool HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + bool HasEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >& ); bool HasInstantiatedEmbeddedObject( const OUString& ); // get the object name of an object - this is the persist name if the object has persistence - OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + OUString GetEmbeddedObjectName( const css::uno::Reference < css::embed::XEmbeddedObject >& ); // retrieve an embedded object by name that either has been added already or is available in the container storage - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& ); // create an object from a ClassId - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > + CreateEmbeddedObject( const css::uno::Sequence < sal_Int8 >&, OUString& ); - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, - const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > + CreateEmbeddedObject( const css::uno::Sequence < sal_Int8 >&, + const css::uno::Sequence < css::beans::PropertyValue >&, OUString& ); // insert an embedded object into the container - objects persistent representation will be added to the storage - bool InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& ); + bool InsertEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString& ); // load an embedded object from a MediaDescriptor and insert it into the container // a new object will be created from the new content and returned - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > + InsertEmbeddedObject( const css::uno::Sequence < css::beans::PropertyValue >&, OUString& ); // create an embedded link based on a MediaDescriptor and insert it into the container // a new object will be created from the new content and returned - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > + InsertEmbeddedLink( const css::uno::Sequence < css::beans::PropertyValue >&, OUString& ); // create an object from a stream that contains its persistent representation and insert it as usual (usually called from clipboard) // a new object will be created from the new content and returned - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > - InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, OUString& ); + css::uno::Reference < css::embed::XEmbeddedObject > + InsertEmbeddedObject( const css::uno::Reference < css::io::XInputStream >&, OUString& ); // copy an embedded object into the storage, open the new copy and return it css::uno::Reference <css::embed::XEmbeddedObject> CopyAndGetEmbeddedObject( @@ -126,34 +126,34 @@ public: const OUString& rSrcShellID, const OUString& rDestShellID ); // move an embedded object from one container to another one - bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& ); + bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString& ); // remove an embedded object from the container and from the storage; if object can't be closed // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ bool RemoveEmbeddedObject( const OUString& rName, bool bClose = true, bool bKeepToTempStorage = true ); - bool RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, bool bClose = true, bool bKeepToTempStorage = true ); + bool RemoveEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >&, bool bClose = true, bool bKeepToTempStorage = true ); // close and remove an embedded object from the container without removing it from the storage - bool CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + bool CloseEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >& ); // move an embedded object to another container (keep the persistent name) bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& ); // get the stored representation for the object - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetObjectStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 ); - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType ); + css::uno::Reference < css::io::XInputStream > GetObjectStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=0 ); + css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType ); // get the stored graphical representation for the object - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 ); + css::uno::Reference < css::io::XInputStream > GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=0 ); // get the stored graphical representation by the object name - com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 ); + css::uno::Reference < css::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 ); // add a graphical representation for an object - bool InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); + bool InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); // try to add a graphical representation for an object in optimized way ( might fail ) - bool InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); + bool InsertGraphicStreamDirectly( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ); // remove a graphical representation for an object bool RemoveGraphicStream( const OUString& rObjectName ); @@ -163,15 +163,15 @@ public: const OUString& aOrigName, const OUString& aTargetName ); - void CloseEmbeddedObjects(); + void CloseEmbeddedObjects(); bool StoreChildren(bool _bOasisFormat,bool _bObjectsOnly); bool StoreAsChildren( bool _bOasisFormat ,bool _bCreateEmbedded - ,const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& _xStorage); + ,const css::uno::Reference < css::embed::XStorage >& _xStorage); - static com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GetGraphicReplacementStream( + static css::uno::Reference< css::io::XInputStream > GetGraphicReplacementStream( sal_Int64 nViewAspect, - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, + const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType ); /** call setPersistentEntry for each embedded object in the container @@ -180,7 +180,7 @@ public: * \param _bClearModifedFlag If <TRUE/> then the modified flag will be set to <FALSE/> otherwise nothing happen. * \return <FALSE/> if no error occurred, otherwise <TRUE/>. */ - bool SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true); + bool SetPersistentEntries(const css::uno::Reference< css::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true); bool getUserAllowsLinkUpdate() const; void setUserAllowsLinkUpdate(bool bNew); diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx index 335aa20c4dd1..77b26a844232 100644 --- a/include/comphelper/eventattachermgr.hxx +++ b/include/comphelper/eventattachermgr.hxx @@ -40,10 +40,10 @@ namespace beans { namespace comphelper { -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager > +COMPHELPER_DLLPUBLIC css::uno::Reference< css::script::XEventAttacherManager > createEventAttacherManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext > & rxContext ) + throw( css::uno::Exception ); } diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx index 1c02e14cfb87..979665530bee 100644 --- a/include/comphelper/evtlistenerhlp.hxx +++ b/include/comphelper/evtlistenerhlp.hxx @@ -35,12 +35,12 @@ namespace comphelper // is helper class to avoid a cycle in refcount between the XEventListener // and the member XComponent - class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener > + class COMPHELPER_DLLPUBLIC OEventListenerHelper : public ::cppu::WeakImplHelper< css::lang::XEventListener > { - ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XEventListener> m_xListener; + css::uno::WeakReference< css::lang::XEventListener> m_xListener; public: - OEventListenerHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + OEventListenerHelper(const css::uno::Reference< css::lang::XEventListener>& _rxListener); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace comphelper diff --git a/include/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx index 115f5f7e7bc1..a4a1bbfc366c 100644 --- a/include/comphelper/evtmethodhelper.hxx +++ b/include/comphelper/evtmethodhelper.hxx @@ -22,7 +22,7 @@ namespace comphelper { - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type); + COMPHELPER_DLLPUBLIC css::uno::Sequence< OUString> getEventMethodsForType(const css::uno::Type& type); } // namespace comphelper diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx index 4731c0a8a41d..4584954b2864 100644 --- a/include/comphelper/extract.hxx +++ b/include/comphelper/extract.hxx @@ -35,15 +35,15 @@ namespace cppu * @param rType enum type * @return enum or empty any. */ -inline ::com::sun::star::uno::Any SAL_CALL int2enum( - sal_Int32 nEnum, const ::com::sun::star::uno::Type & rType ) +inline css::uno::Any SAL_CALL int2enum( + sal_Int32 nEnum, const css::uno::Type & rType ) { - if (rType.getTypeClass() == ::com::sun::star::uno::TypeClass_ENUM) + if (rType.getTypeClass() == css::uno::TypeClass_ENUM) { int nVal = nEnum; - return ::com::sun::star::uno::Any( &nVal, rType ); + return css::uno::Any( &nVal, rType ); } - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } /** @@ -53,9 +53,9 @@ inline ::com::sun::star::uno::Any SAL_CALL int2enum( * @param rAny enum or int * @param sal_True if enum or int value was set else sal_False. */ -inline bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno::Any & rAny ) +inline bool SAL_CALL enum2int( sal_Int32 & rnEnum, const css::uno::Any & rAny ) { - if (rAny.getValueTypeClass() == ::com::sun::star::uno::TypeClass_ENUM) + if (rAny.getValueTypeClass() == css::uno::TypeClass_ENUM) { rnEnum = * static_cast< const int * >( rAny.getValue() ); return true; @@ -69,11 +69,11 @@ inline bool SAL_CALL enum2int( sal_Int32 & rnEnum, const ::com::sun::star::uno:: * <BR> * @param rAny enum or int * @param eRet the enum value as int. If there is not enum of the given type or - * a ::com::sun::star::lang::IllegalArgumentException is thrown + * a css::lang::IllegalArgumentException is thrown */ template< typename E > -inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny ) - throw( ::com::sun::star::lang::IllegalArgumentException ) +inline void SAL_CALL any2enum( E & eRet, const css::uno::Any & rAny ) + throw( css::lang::IllegalArgumentException ) { // check for typesafe enum if (! (rAny >>= eRet)) @@ -81,7 +81,7 @@ inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny // if not enum, maybe integer? sal_Int32 nValue = 0; if (! (rAny >>= nValue)) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); eRet = static_cast<E>(nValue); } @@ -94,21 +94,21 @@ inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny * */ template< typename E > -inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum ) +inline css::uno::Any SAL_CALL enum2any( E eEnum ) { - return ::com::sun::star::uno::Any( &eEnum, ::cppu::UnoType< E >::get() ); + return css::uno::Any( &eEnum, ::cppu::UnoType< E >::get() ); } /** * extracts a boolean either as a sal_Bool or an integer from * an any. If there is no sal_Bool or integer inside the any - * a ::com::sun::star::lang::IllegalArgumentException is thrown + * a css::lang::IllegalArgumentException is thrown * */ -inline bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny ) - throw( ::com::sun::star::lang::IllegalArgumentException ) +inline bool SAL_CALL any2bool( const css::uno::Any & rAny ) + throw( css::lang::IllegalArgumentException ) { - if (rAny.getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN) + if (rAny.getValueTypeClass() == css::uno::TypeClass_BOOLEAN) { return *static_cast<sal_Bool const *>(rAny.getValue()); } @@ -116,7 +116,7 @@ inline bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny ) { sal_Int32 nValue = 0; if (! (rAny >>= nValue)) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return nValue != 0; } } diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx index 0eba44325c91..ca30d46a2cdb 100644 --- a/include/comphelper/genericpropertyset.hxx +++ b/include/comphelper/genericpropertyset.hxx @@ -26,7 +26,7 @@ namespace comphelper { - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo ); + COMPHELPER_DLLPUBLIC css::uno::Reference< css::beans::XPropertySet > GenericPropertySet_CreateInstance( PropertySetInfo* pInfo ); } #endif // INCLUDED_COMPHELPER_GENERICPROPERTYSET_HXX diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 7e6ba9782f1a..f0d9683bfbbc 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -52,14 +52,14 @@ namespace comphelper bool wasSelected() const { return m_bSelected; } // XInteractionContinuation - virtual void SAL_CALL select() throw(::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL select() throw(css::uno::RuntimeException) override; private: bool m_bSelected : 1; /// indicates if the select event occurred }; template <class INTERACTION> - void SAL_CALL OInteraction< INTERACTION >::select( ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL OInteraction< INTERACTION >::select( ) throw(css::uno::RuntimeException) { m_bSelected = true; } @@ -67,27 +67,27 @@ namespace comphelper //= OInteractionApprove - typedef OInteraction< ::com::sun::star::task::XInteractionApprove > OInteractionApprove; + typedef OInteraction< css::task::XInteractionApprove > OInteractionApprove; //= OInteractionDispprove - typedef OInteraction< ::com::sun::star::task::XInteractionDisapprove > OInteractionDisapprove; + typedef OInteraction< css::task::XInteractionDisapprove > OInteractionDisapprove; //= OInteractionAbort - typedef OInteraction< ::com::sun::star::task::XInteractionAbort > OInteractionAbort; + typedef OInteraction< css::task::XInteractionAbort > OInteractionAbort; //= OInteractionRetry - typedef OInteraction< ::com::sun::star::task::XInteractionRetry > OInteractionRetry; + typedef OInteraction< css::task::XInteractionRetry > OInteractionRetry; //= OInteractionPassword - class COMPHELPER_DLLPUBLIC OInteractionPassword : public OInteraction< ::com::sun::star::task::XInteractionPassword > + class COMPHELPER_DLLPUBLIC OInteractionPassword : public OInteraction< css::task::XInteractionPassword > { public: OInteractionPassword() @@ -100,8 +100,8 @@ namespace comphelper } // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPassword( const OUString& _Password ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPassword( ) throw (css::uno::RuntimeException, std::exception) override; private: OUString m_sPassword; @@ -110,29 +110,29 @@ namespace comphelper //= OInteractionRequest - typedef ::cppu::WeakImplHelper < ::com::sun::star::task::XInteractionRequest + typedef ::cppu::WeakImplHelper < css::task::XInteractionRequest > OInteractionRequest_Base; /** implements an interaction request (com.sun.star.task::XInteractionRequest)<p/> at run time, you can freely add any interaction continuation objects */ class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base { - ::com::sun::star::uno::Any + css::uno::Any m_aRequest; /// the request we represent - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_aContinuations; /// all registered continuations public: - OInteractionRequest(const ::com::sun::star::uno::Any& _rRequestDescription); - OInteractionRequest(const ::com::sun::star::uno::Any& rRequestDescription, + OInteractionRequest(const css::uno::Any& _rRequestDescription); + OInteractionRequest(const css::uno::Any& rRequestDescription, css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>> const& rContinuations); /// add a new continuation - void addContinuation(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >& _rxContinuation); + void addContinuation(const css::uno::Reference< css::task::XInteractionContinuation >& _rxContinuation); // XInteractionRequest - virtual ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getRequest( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace comphelper diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index b0603afbc722..65edfa5c36a1 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -65,9 +65,9 @@ namespace comphelper You'll usually call this from within your own dispose/disposing method */ - void disposing( const ::com::sun::star::lang::EventObject& _rEventSource ); + void disposing( const css::lang::EventObject& _rEventSource ); - /** clears the container without calling <member scope="com::sun::star::lang">XEventListener::disposing</member> + /** clears the container without calling <member scope="css::lang">XEventListener::disposing</member> at the listeners */ void clear(); @@ -90,8 +90,8 @@ namespace comphelper virtual ~OListenerContainer(); - void impl_addListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener ); - void impl_removeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener ); + void impl_addListener( const css::uno::Reference< css::lang::XEventListener >& _rxListener ); + void impl_removeListener( const css::uno::Reference< css::lang::XEventListener >& _rxListener ); /** notifies all listeners of the given event, using THB's notification pattern @@ -103,14 +103,14 @@ namespace comphelper @see implNotify */ - bool impl_notify( const ::com::sun::star::lang::EventObject& _rEvent ); + bool impl_notify( const css::lang::EventObject& _rEvent ); protected: /** call a single listener @pure - @throws ::com::sun::star::uno::Exception + @throws css::uno::Exception if the listener throws an exception during notification. Please don't catch any listener exceptions in your implementation of this method, simply let them pass to the caller. @@ -129,8 +129,8 @@ namespace comphelper @see notify */ virtual bool implNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, - const ::com::sun::star::lang::EventObject& _rEvent + const css::uno::Reference< css::lang::XEventListener >& _rxListener, + const css::lang::EventObject& _rEvent ) = 0; }; @@ -148,9 +148,9 @@ namespace comphelper This class is not threadsafe! @param LISTENER - the listener class to call, e.g. com::sun::star::lang::XEventListener + the listener class to call, e.g. css::lang::XEventListener @param EVENT - the event type to notify, e.g. com::sun::star::lang::EventObject + the event type to notify, e.g. css::lang::EventObject */ template< class LISTENER, class EVENT > class OSimpleListenerContainer : protected OListenerContainer @@ -170,12 +170,12 @@ namespace comphelper { } - inline void addListener( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener ) + inline void addListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeListener( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener ) + inline void removeListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } @@ -191,8 +191,8 @@ namespace comphelper protected: virtual bool implNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, - const ::com::sun::star::lang::EventObject& _rEvent + const css::uno::Reference< css::lang::XEventListener >& _rxListener, + const css::lang::EventObject& _rEvent ) override { const EventClass& rTypedEvent( static_cast< const EventClass& >( _rEvent ) ); @@ -229,12 +229,12 @@ namespace comphelper { } - inline void addTypedListener( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener ) + inline void addTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_addListener( _rxListener.get() ); } - inline void removeTypedListener( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener ) + inline void removeTypedListener( const css::uno::Reference< ListenerClass >& _rxListener ) { OListenerContainer::impl_removeListener( _rxListener.get() ); } @@ -248,18 +248,18 @@ namespace comphelper protected: virtual bool implNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _rxListener, - const ::com::sun::star::lang::EventObject& _rEvent + const css::uno::Reference< css::lang::XEventListener >& _rxListener, + const css::lang::EventObject& _rEvent ) override { return implTypedNotify( - ::com::sun::star::uno::Reference< ListenerClass >( static_cast< ListenerClass* >( _rxListener.get() ) ), + css::uno::Reference< ListenerClass >( static_cast< ListenerClass* >( _rxListener.get() ) ), static_cast< const EventClass& >( _rEvent ) ); } virtual bool implTypedNotify( - const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener, + const css::uno::Reference< ListenerClass >& _rxListener, const EventClass& _rEvent ) = 0; }; diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index 665bc9c52d0c..ff7c8dff0f38 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -67,7 +67,7 @@ namespace comphelper class EventLogger_Impl; typedef ::boost::optional< OUString > OptionalString; - /** encapsulates an com::sun::star::logging::XLogger + /** encapsulates an css::logging::XLogger The class silences several (unlikely) errors which could potentially happen when working with a logger. Additionally, it provides some convenience methods @@ -105,7 +105,7 @@ namespace comphelper the ASCII name of the logger to create. */ EventLogger( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName ); @@ -495,7 +495,7 @@ namespace comphelper */ ResourceBasedEventLogger( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const sal_Char* _pResourceBundleBaseName, const sal_Char* _pAsciiLoggerName = NULL ); diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx index 4791109ed523..81948c76880c 100644 --- a/include/comphelper/mimeconfighelper.hxx +++ b/include/comphelper/mimeconfighelper.hxx @@ -38,100 +38,100 @@ namespace comphelper { class COMPHELPER_DLLPUBLIC MimeConfigurationHelper { - ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; + ::osl::Mutex m_aMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xObjectConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig; + css::uno::Reference< css::container::XNameAccess > m_xObjectConfig; + css::uno::Reference< css::container::XNameAccess > m_xVerbsConfig; + css::uno::Reference< css::container::XNameAccess > m_xMediaTypeConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterFactory; + css::uno::Reference< css::container::XNameAccess > m_xFilterFactory; public: - MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + MimeConfigurationHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - static OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); + static OUString GetStringClassIDRepresentation( const css::uno::Sequence< sal_Int8 >& aClassID ); - static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const OUString& aClassID ); + static css::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const OUString& aClassID ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > GetConfigurationByPath( const OUString& aPath ); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration(); + css::uno::Reference< css::container::XNameAccess > GetObjConfiguration(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetVerbsConfiguration(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration(); + css::uno::Reference< css::container::XNameAccess > GetVerbsConfiguration(); + css::uno::Reference< css::container::XNameAccess > GetMediaTypeConfiguration(); OUString GetDocServiceNameFromFilter( const OUString& aFilterName ); OUString GetDocServiceNameFromMediaType( const OUString& aMediaType ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjPropsFromConfigEntry( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xObjectProps ); + css::uno::Sequence< css::beans::NamedValue > GetObjPropsFromConfigEntry( + const css::uno::Sequence< sal_Int8 >& aClassID, + const css::uno::Reference< css::container::XNameAccess >& xObjectProps ); bool GetVerbByShortcut( const OUString& aVerbShortcut, - ::com::sun::star::embed::VerbDescriptor& aDescriptor ); + css::embed::VerbDescriptor& aDescriptor ); OUString GetExplicitlyRegisteredObjClassID( const OUString& aMediaType ); // retrieving object description from configuration - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByStringClassID( + css::uno::Sequence< css::beans::NamedValue > GetObjectPropsByStringClassID( const OUString& aStringClassID ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByClassID( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); + css::uno::Sequence< css::beans::NamedValue > GetObjectPropsByClassID( + const css::uno::Sequence< sal_Int8 >& aClassID ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByMediaType( + css::uno::Sequence< css::beans::NamedValue > GetObjectPropsByMediaType( const OUString& aMediaType ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByFilter( + css::uno::Sequence< css::beans::NamedValue > GetObjectPropsByFilter( const OUString& aFilterName ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByDocumentName( + css::uno::Sequence< css::beans::NamedValue > GetObjectPropsByDocumentName( const OUString& aDocumentName ); // retrieving object factory from configuration OUString GetFactoryNameByStringClassID( const OUString& aStringClassID ); - OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); + OUString GetFactoryNameByClassID( const css::uno::Sequence< sal_Int8 >& aClassID ); OUString GetFactoryNameByDocumentName( const OUString& aDocName ); OUString GetFactoryNameByMediaType( const OUString& aMediaType ); // typedetection related - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory(); + css::uno::Reference< css::container::XNameAccess > GetFilterFactory(); OUString UpdateMediaDescriptorWithFilterName( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, + css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, bool bIgnoreType ); OUString UpdateMediaDescriptorWithFilterName( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject ); + css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, + css::uno::Sequence< css::beans::NamedValue >& aObject ); #ifdef WNT SfxFilterFlags GetFilterFlags( const OUString& aFilterName ); bool AddFilterNameCheckOwnFile( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr ); + css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr ); #endif OUString GetDefaultFilterFromServiceName( const OUString& aServName, sal_Int32 nVersion ); OUString GetExportFilterFromImportFilter( const OUString& aImportFilterName ); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest, + static css::uno::Sequence< css::beans::PropertyValue > SearchForFilter( + const css::uno::Reference< css::container::XContainerQuery >& xFilterQuery, + const css::uno::Sequence< css::beans::NamedValue >& aSearchRequest, SfxFilterFlags nMustFlags, SfxFilterFlags nDontFlags ); - static bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1, - const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 ); - static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, + static bool ClassIDsEqual( const css::uno::Sequence< sal_Int8 >& aClassID1, + const css::uno::Sequence< sal_Int8 >& aClassID2 ); + static css::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ); }; diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx index b3374836d0bc..1af6119839d4 100644 --- a/include/comphelper/namecontainer.hxx +++ b/include/comphelper/namecontainer.hxx @@ -26,8 +26,8 @@ namespace comphelper { - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > - NameContainer_createInstance( ::com::sun::star::uno::Type aType ); + COMPHELPER_DLLPUBLIC css::uno::Reference< css::container::XNameContainer > + NameContainer_createInstance( css::uno::Type aType ); } #endif // INCLUDED_COMPHELPER_NAMECONTAINER_HXX diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index 69a4856cbb81..5fc0883b69cd 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -60,36 +60,36 @@ namespace comphelper property values, a sequence of named values, or directly a property value or named value. All other cases are worth an assertion in non-product builds. */ - NamedValueCollection( const ::com::sun::star::uno::Any& _rElements ); + NamedValueCollection( const css::uno::Any& _rElements ); /** constructs a collection @param _rArguments a sequence of Any's containing either PropertyValue's or NamedValue's. */ - NamedValueCollection( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ); + NamedValueCollection( const css::uno::Sequence< css::uno::Any >& _rArguments ); /** constructs a collection @param _rArguments a sequence of PropertyValues's */ - NamedValueCollection( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); + NamedValueCollection( const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ); /** constructs a collection @param _rArguments a sequence of NamedValue's */ - NamedValueCollection( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments ); + NamedValueCollection( const css::uno::Sequence< css::beans::NamedValue >& _rArguments ); ~NamedValueCollection(); - inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ) + inline void assign( const css::uno::Sequence< css::uno::Any >& _rArguments ) { impl_assign( _rArguments ); } inline void clear() { - impl_assign( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); + impl_assign( css::uno::Sequence< css::beans::NamedValue >() ); } /** determines whether or not named values can be extracted from the given value @@ -98,7 +98,7 @@ namespace comphelper <TRUE/> if and only if the given <code>Any</code> contains a <code>NamedValue</code>, a <code>PropertyValue</code>, or a sequence thereof. */ - static bool canExtractFrom( ::com::sun::star::uno::Any const & i_value ); + static bool canExtractFrom( css::uno::Any const & i_value ); /// returns the number of elements in the collection size_t size() const; @@ -178,7 +178,7 @@ namespace comphelper If the collection does not contain a value with the given name, an empty Any is returned. */ - const ::com::sun::star::uno::Any& get( const sal_Char* _pAsciiValueName ) const + const css::uno::Any& get( const sal_Char* _pAsciiValueName ) const { return get( OUString::createFromAscii( _pAsciiValueName ) ); } @@ -188,7 +188,7 @@ namespace comphelper If the collection does not contain a value with the given name, an empty Any is returned. */ - const ::com::sun::star::uno::Any& get( const OUString& _rValueName ) const + const css::uno::Any& get( const OUString& _rValueName ) const { return impl_get( _rValueName ); } @@ -213,7 +213,7 @@ namespace comphelper template < typename VALUE_TYPE > inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) { - return impl_put( OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) ); + return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) ); } /** puts a value into the collection @@ -224,15 +224,15 @@ namespace comphelper template < typename VALUE_TYPE > inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue ) { - return impl_put( _rValueName, ::com::sun::star::uno::makeAny( _rValue ) ); + return impl_put( _rValueName, css::uno::makeAny( _rValue ) ); } - inline bool put( const sal_Char* _pAsciiValueName, const ::com::sun::star::uno::Any& _rValue ) + inline bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) { return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); } - inline bool put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ) + inline bool put( const OUString& _rValueName, const css::uno::Any& _rValue ) { return impl_put( _rValueName, _rValue ); } @@ -260,84 +260,84 @@ namespace comphelper @return the number of elements in the sequence */ - sal_Int32 operator >>= ( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _out_rValues ) const; + sal_Int32 operator >>= ( css::uno::Sequence< css::beans::PropertyValue >& _out_rValues ) const; /** transforms the collection to a sequence of NamedValues @return the number of elements in the sequence */ - sal_Int32 operator >>= ( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _out_rValues ) const; + sal_Int32 operator >>= ( css::uno::Sequence< css::beans::NamedValue >& _out_rValues ) const; /** transforms the collection into a sequence of PropertyValues */ - inline ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + inline css::uno::Sequence< css::beans::PropertyValue > getPropertyValues() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aValues; + css::uno::Sequence< css::beans::PropertyValue > aValues; *this >>= aValues; return aValues; } /** returns a Sequence< Any >, containing PropertyValues */ - inline ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + inline css::uno::Sequence< css::uno::Any > getWrappedPropertyValues() const { - return impl_wrap< ::com::sun::star::beans::PropertyValue >(); + return impl_wrap< css::beans::PropertyValue >(); } /** returns a Sequence< Any >, containing NamedValues */ - inline ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + inline css::uno::Sequence< css::uno::Any > getWrappedNamedValues() const { - return impl_wrap< ::com::sun::star::beans::NamedValue >(); + return impl_wrap< css::beans::NamedValue >(); } /** transforms the collection into a sequence of NamedValues */ - inline ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + inline css::uno::Sequence< css::beans::NamedValue > getNamedValues() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aValues; + css::uno::Sequence< css::beans::NamedValue > aValues; *this >>= aValues; return aValues; } private: - void impl_assign( const ::com::sun::star::uno::Any& i_rWrappedElements ); - void impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments ); - void impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); - void impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments ); + void impl_assign( const css::uno::Any& i_rWrappedElements ); + void impl_assign( const css::uno::Sequence< css::uno::Any >& _rArguments ); + void impl_assign( const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ); + void impl_assign( const css::uno::Sequence< css::beans::NamedValue >& _rArguments ); bool get_ensureType( const OUString& _rValueName, void* _pValueLocation, - const ::com::sun::star::uno::Type& _rExpectedValueType + const css::uno::Type& _rExpectedValueType ) const; - const ::com::sun::star::uno::Any& + const css::uno::Any& impl_get( const OUString& _rValueName ) const; bool impl_has( const OUString& _rValueName ) const; - bool impl_put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue ); + bool impl_put( const OUString& _rValueName, const css::uno::Any& _rValue ); bool impl_remove( const OUString& _rValueName ); template< class VALUE_TYPE > - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > impl_wrap() const + css::uno::Sequence< css::uno::Any > impl_wrap() const { - ::com::sun::star::uno::Sequence< VALUE_TYPE > aValues; + css::uno::Sequence< VALUE_TYPE > aValues; *this >>= aValues; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aWrappedValues( aValues.getLength() ); + css::uno::Sequence< css::uno::Any > aWrappedValues( aValues.getLength() ); - ::com::sun::star::uno::Any* pO = aWrappedValues.getArray(); + css::uno::Any* pO = aWrappedValues.getArray(); const VALUE_TYPE* pV = aValues.getConstArray(); const sal_Int32 nLen = aValues.getLength(); for( sal_Int32 i = 0; i < nLen; ++i ) - *(pO++) = ::com::sun::star::uno::makeAny<VALUE_TYPE>( *(pV++) ); + *(pO++) = css::uno::makeAny<VALUE_TYPE>( *(pV++) ); return aWrappedValues; } diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx index 7cb8840f18d3..7ed2e2b4190d 100644 --- a/include/comphelper/numbers.hxx +++ b/include/comphelper/numbers.hxx @@ -29,10 +29,10 @@ namespace comphelper { - /// returns the ::com::sun::star::util::NumberFormat of the given key under the given formats + /// returns the css::util::NumberFormat of the given key under the given formats COMPHELPER_DLLPUBLIC sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormats>& xFormats, sal_Int32 nKey); - /// returns the ::com::sun::star::util::NumberFormat of the given key under the given formatter + /// returns the css::util::NumberFormat of the given key under the given formatter COMPHELPER_DLLPUBLIC sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormatter>& xFormatter, sal_Int32 nKey); /// returns the decimals of the given numeric number formatunder the given formats @@ -47,8 +47,8 @@ namespace comphelper /** retrieves a the value of a given property for a given format key, relating to a given formatter */ - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Any getNumberFormatProperty( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, + COMPHELPER_DLLPUBLIC css::uno::Any getNumberFormatProperty( + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const OUString& _rPropertyName ); diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx index 1a40551f505a..22b7a3c243a9 100644 --- a/include/comphelper/officeresourcebundle.hxx +++ b/include/comphelper/officeresourcebundle.hxx @@ -36,7 +36,7 @@ namespace comphelper //= OfficeResourceBundle class ResourceBundle_Impl; - /** wraps the com::sun::star::resource::OfficeResourceAccess service + /** wraps the css::resource::OfficeResourceAccess service */ class COMPHELPER_DLLPUBLIC OfficeResourceBundle { @@ -53,11 +53,11 @@ namespace comphelper the component context to operate in @param _bundleBaseName the base name of the resource file which should be accessed (*without* the SUPD!) - @raises ::com::sun::star::lang::NullPointerException + @raises css::lang::NullPointerException if the given component context is <NULL/> */ OfficeResourceBundle( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _context, + const css::uno::Reference< css::uno::XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName ); diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx index 7ab7e3818512..3f03a39c5301 100644 --- a/include/comphelper/ofopxmlhelper.hxx +++ b/include/comphelper/ofopxmlhelper.hxx @@ -37,12 +37,12 @@ namespace OFOPXMLHelper { // where each tag is described by StringPair ( First - name, Second - value ) // the first tag of each element sequence must be "Id" COMPHELPER_DLLPUBLIC - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > ReadRelationsInfoSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, + const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString & aStreamName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rContext ) + throw( css::uno::Exception ); // returns sequence containing two entries of type sequence<StringPair> // the first sequence describes "Default" elements, where each element is described @@ -50,21 +50,21 @@ namespace OFOPXMLHelper { // the second sequence describes "Override" elements, where each element is described // by StringPair object ( First - PartName, Second - ContentType ) COMPHELPER_DLLPUBLIC - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > ReadContentTypeSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XInputStream >& xInStream, + const css::uno::Reference< css::uno::XComponentContext >& rContext ) + throw( css::uno::Exception ); // writes sequence of elements, where each element is described by sequence of tags, // where each tag is described by StringPair ( First - name, Second - value ) // the first tag of each element sequence must be "Id" COMPHELPER_DLLPUBLIC void WriteRelationsInfoSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aSequence, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XOutputStream >& xOutStream, + const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aSequence, + const css::uno::Reference< css::uno::XComponentContext >& rContext ) + throw( css::uno::Exception ); // writes two entries of type sequence<StringPair> // the first sequence describes "Default" elements, where each element is described @@ -73,11 +73,11 @@ namespace OFOPXMLHelper { // by StringPair object ( First - PartName, Second - ContentType ) COMPHELPER_DLLPUBLIC void WriteContentSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aDefaultsSequence, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aOverridesSequence, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XOutputStream >& xOutStream, + const css::uno::Sequence< css::beans::StringPair >& aDefaultsSequence, + const css::uno::Sequence< css::beans::StringPair >& aOverridesSequence, + const css::uno::Reference< css::uno::XComponentContext >& rContext ) + throw( css::uno::Exception ); } // namespace OFOPXMLHelper diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx index 5ea8bb7ba242..920eeba83ee0 100644 --- a/include/comphelper/optional.hxx +++ b/include/comphelper/optional.hxx @@ -33,8 +33,7 @@ inline ::boost::optional<T> make_optional( T const& v ) } template <typename T> -inline ::boost::optional<T> make_optional( - ::com::sun::star::beans::Optional<T> const& o ) +inline ::boost::optional<T> make_optional( css::beans::Optional<T> const& o ) { if (o.IsPresent) return ::boost::optional<T>(o.Value); diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx index c795757ec3dc..94ecde7e7e87 100644 --- a/include/comphelper/processfactory.hxx +++ b/include/comphelper/processfactory.hxx @@ -36,7 +36,7 @@ namespace comphelper * * @author Juergen Schmidt */ -COMPHELPER_DLLPUBLIC void setProcessServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMgr); +COMPHELPER_DLLPUBLIC void setProcessServiceFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMgr); /** * This function gets the process service factory. @@ -45,7 +45,7 @@ COMPHELPER_DLLPUBLIC void setProcessServiceFactory(const ::com::sun::star::uno:: * * @author Juergen Schmidt */ -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getProcessServiceFactory(); +COMPHELPER_DLLPUBLIC css::uno::Reference< css::lang::XMultiServiceFactory > getProcessServiceFactory(); /** Obtains a component context from a service factory. @@ -55,9 +55,9 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::lang::X @return may be null */ COMPHELPER_DLLPUBLIC -com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > +css::uno::Reference< css::uno::XComponentContext > getComponentContext( - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); /** @@ -66,7 +66,7 @@ getComponentContext( * Throws a RuntimeException if no component context can be obtained. */ COMPHELPER_DLLPUBLIC -::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > +css::uno::Reference< css::uno::XComponentContext > getProcessComponentContext(); } diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index ca3d4a0c6026..8fc366bcf658 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -91,8 +91,8 @@ class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper: public ::cppu::IProp friend class OPropertySetAggregationHelper; protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> m_aProperties; - internal::PropertyAccessorMap m_aPropertyAccessors; + css::uno::Sequence< css::beans::Property> m_aProperties; + internal::PropertyAccessorMap m_aPropertyAccessors; public: /** construct the object. @@ -118,8 +118,8 @@ public: No checks are made if the handle range determined by _nFirstAggregateId conflicts with other handles within _rProperties. */ - OPropertyArrayAggregationHelper(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& _rProperties, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& _rAggProperties, + OPropertyArrayAggregationHelper(const css::uno::Sequence< css::beans::Property>& _rProperties, + const css::uno::Sequence< css::beans::Property>& _rAggProperties, IPropertyInfoService* _pInfoService = NULL, sal_Int32 _nFirstAggregateId = DEFAULT_AGGREGATE_PROPERTY_ID); @@ -129,17 +129,17 @@ public: sal_Int32 _nHandle) override ; /// inherited from IPropertyArrayHelper - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties() override; + virtual css::uno::Sequence< css::beans::Property> SAL_CALL getProperties() override; /// inherited from IPropertyArrayHelper - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException) override; + virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName) + throw(css::beans::UnknownPropertyException) override; /// inherited from IPropertyArrayHelper virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& _rPropertyName) override ; /// inherited from IPropertyArrayHelper virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName) override; /// inherited from IPropertyArrayHelper - virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ) override; + virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const css::uno::Sequence< OUString >& _rPropNames ) override; /** returns information about a property of the aggregate. @param _pPropName points to a string to receive the property name. No name is returned if this is NULL. @@ -154,7 +154,7 @@ public: /** returns information about a property given by handle */ - bool getPropertyByHandle( sal_Int32 _nHandle, ::com::sun::star::beans::Property& _rProperty ) const; + bool getPropertyByHandle( sal_Int32 _nHandle, css::beans::Property& _rProperty ) const; enum PropertyOrigin @@ -178,7 +178,7 @@ public: PropertyOrigin classifyProperty( const OUString& _rName ); protected: - const ::com::sun::star::beans::Property* findPropertyByName(const OUString& _rName) const; + const css::beans::Property* findPropertyByName(const OUString& _rName) const; }; @@ -194,50 +194,50 @@ namespace internal * */ class COMPHELPER_DLLPUBLIC OPropertySetAggregationHelper :public OPropertyStateHelper - ,public ::com::sun::star::beans::XPropertiesChangeListener - ,public ::com::sun::star::beans::XVetoableChangeListener + ,public css::beans::XPropertiesChangeListener + ,public css::beans::XVetoableChangeListener { friend class internal::PropertyForwarder; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState> m_xAggregateState; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> m_xAggregateMultiSet; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet> m_xAggregateFastSet; + css::uno::Reference< css::beans::XPropertyState> m_xAggregateState; + css::uno::Reference< css::beans::XPropertySet> m_xAggregateSet; + css::uno::Reference< css::beans::XMultiPropertySet> m_xAggregateMultiSet; + css::uno::Reference< css::beans::XFastPropertySet> m_xAggregateFastSet; internal::PropertyForwarder* m_pForwarder; - bool m_bListening : 1; + bool m_bListening : 1; public: OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHelper ); - 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; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, 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) override; - 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) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, 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) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPropertiesChangeListener - virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt) throw(css::uno::RuntimeException, std::exception) override; // XVetoableChangeListener - virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL vetoableChange(const css::beans::PropertyChangeEvent& aEvent) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< 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) override; - virtual void SAL_CALL addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< 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) override; + virtual void SAL_CALL addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // OPropertySetHelper /** still waiting to be overwritten ... @@ -248,17 +248,17 @@ public: /** only implemented for "forwarded" properties, every other property must be handled in the derivee, and will assert if passed herein */ - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw(::com::sun::star::lang::IllegalArgumentException) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException) override; /** only implemented for "forwarded" properties, every other property must be handled in the derivee, and will assert if passed herein */ - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw ( ::com::sun::star::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw ( css::uno::Exception, std::exception ) override; protected: virtual ~OPropertySetAggregationHelper(); - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const override; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; void disposing(); sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; @@ -312,7 +312,7 @@ protected: virtual void forwardedPropertyValue( sal_Int32 _nHandle ); /// must be called before aggregation, if aggregation is used - void setAggregation(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&) throw( ::com::sun::star::lang::IllegalArgumentException ); + void setAggregation(const css::uno::Reference< css::uno::XInterface >&) throw( css::lang::IllegalArgumentException ); void startListening(); }; diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx index eb28598093aa..c78f736eb956 100644 --- a/include/comphelper/proparrhlp.hxx +++ b/include/comphelper/proparrhlp.hxx @@ -90,8 +90,8 @@ protected: @param _rAggregateProps out parameter to be filled with the properties of your aggregate. */ virtual void fillProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps, + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const = 0; /** creates an OPropertyArrayAggregationHelper filled with properties for which's initialization @@ -143,8 +143,8 @@ template <class TYPE> template <class TYPE> inline ::cppu::IPropertyArrayHelper* OAggregationArrayUsageHelper<TYPE>::createArrayHelper() const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aAggregateProps; + css::uno::Sequence< css::beans::Property > aProps; + css::uno::Sequence< css::beans::Property > aAggregateProps; fillProperties(aProps, aAggregateProps); OSL_ENSURE(aProps.getLength(), "OAggregationArrayUsageHelper::createArrayHelper : fillProperties returned nonsense !"); return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId()); diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index b45c3f0470d8..5bc46a888d99 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -32,31 +32,31 @@ namespace comphelper { // comparing two property instances - struct PropertyCompareByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool > + struct PropertyCompareByName : public ::std::binary_function< css::beans::Property, css::beans::Property, bool > { - bool operator() (const ::com::sun::star::beans::Property& x, const ::com::sun::star::beans::Property& y) const + bool operator() (const css::beans::Property& x, const css::beans::Property& y) const { return x.Name.compareTo(y.Name) < 0; } }; - struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool > + struct PropertyStringEqualFunctor : ::std::binary_function< css::beans::Property, OUString, bool > { - inline bool operator()( const ::com::sun::star::beans::Property& lhs, const OUString& rhs ) const + inline bool operator()( const css::beans::Property& lhs, const OUString& rhs ) const { return lhs.Name == rhs ; } - inline bool operator()( const OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const + inline bool operator()( const OUString& lhs, const css::beans::Property& rhs ) const { return lhs == rhs.Name ; } }; - struct PropertyEqualByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool > + struct PropertyEqualByName : public ::std::binary_function< css::beans::Property, css::beans::Property, bool > { - bool operator() (const ::com::sun::star::beans::Property& x, const ::com::sun::star::beans::Property& y) const + bool operator() (const css::beans::Property& x, const css::beans::Property& y) const { return x.Name == y.Name ; } diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx index 484246a11d17..3cc4ceaeec3b 100644 --- a/include/comphelper/propertybag.hxx +++ b/include/comphelper/propertybag.hxx @@ -70,18 +70,18 @@ namespace comphelper the initial value of the property. Must not be <NULL/>, to allow determining the property type. - @throws ::com::sun::star::beans::IllegalTypeException + @throws css::beans::IllegalTypeException if the initial value is <NULL/> - @throws ::com::sun::star::beans::PropertyExistException + @throws css::beans::PropertyExistException if the name or the handle are already used - @throws ::com::sun::star::beans::IllegalArgumentException + @throws css::beans::IllegalArgumentException if the name is empty */ void addProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, - const ::com::sun::star::uno::Any& _rInitialValue + const css::uno::Any& _rInitialValue ); /** adds a property to the bag @@ -98,16 +98,16 @@ namespace comphelper @param _nAttributes the attributes of the property - @throws ::com::sun::star::beans::IllegalTypeException + @throws css::beans::IllegalTypeException if the initial value is <NULL/> - @throws ::com::sun::star::beans::PropertyExistException + @throws css::beans::PropertyExistException if the name or the handle are already used - @throws ::com::sun::star::beans::IllegalArgumentException + @throws css::beans::IllegalArgumentException if the name is empty */ void addVoidProperty( const OUString& _rName, - const ::com::sun::star::uno::Type& _rType, + const css::uno::Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes ); @@ -131,7 +131,7 @@ namespace comphelper takes, upon return, the descriptions of all properties in the bag */ inline void describeProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _out_rProps + css::uno::Sequence< css::beans::Property >& _out_rProps ) const { OPropertyContainerHelper::describeProperties( _out_rProps ); @@ -147,7 +147,7 @@ namespace comphelper */ void getFastPropertyValue( sal_Int32 _nHandle, - ::com::sun::star::uno::Any& _out_rValue + css::uno::Any& _out_rValue ) const; /** converts a to-be-set value of a property (given by handle) so that it can @@ -169,9 +169,9 @@ namespace comphelper */ bool convertFastPropertyValue( sal_Int32 _nHandle, - const ::com::sun::star::uno::Any& _rNewValue, - ::com::sun::star::uno::Any& _out_rConvertedValue, - ::com::sun::star::uno::Any& _out_rCurrentValue + const css::uno::Any& _rNewValue, + css::uno::Any& _out_rConvertedValue, + css::uno::Any& _out_rCurrentValue ) const; /** sets a new value for a property given by handle @@ -180,7 +180,7 @@ namespace comphelper */ void setFastPropertyValue( sal_Int32 _nHandle, - const ::com::sun::star::uno::Any& _rValue + const css::uno::Any& _rValue ); /** returns the default value for a property given by handle @@ -197,7 +197,7 @@ namespace comphelper */ void getPropertyDefaultByHandle( sal_Int32 _nHandle, - ::com::sun::star::uno::Any& _out_rValue + css::uno::Any& _out_rValue ) const; /** determines whether a property with a given name is part of the bag diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index d09b2b792c60..45b93634e637 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -49,32 +49,32 @@ protected: OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper); /// for scripting : the types of the interfaces supported by this class - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getBaseTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + static css::uno::Sequence< css::uno::Type > getBaseTypes() throw (css::uno::RuntimeException, std::exception); // OPropertySetHelper overridables 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 ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, + throw (css::uno::Exception, std::exception) override; using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // disambiguate a base class method (XFastPropertySet) - 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) 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) override; }; diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx index 1d29cda90952..0fe37bbc0d51 100644 --- a/include/comphelper/propertycontainerhelper.hxx +++ b/include/comphelper/propertycontainerhelper.hxx @@ -48,13 +48,12 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription sal_Int32 nOwnClassVectorIndex; // an index within m_aHoldProperties }; - ::com::sun::star::beans::Property - aProperty; - LocationType eLocated; // where is the object containing the value located ? - LocationAccess aLocation; // access to the property value + css::beans::Property aProperty; + LocationType eLocated; // where is the object containing the value located ? + LocationAccess aLocation; // access to the property value PropertyDescription() - :aProperty( OUString(), -1, ::com::sun::star::uno::Type(), 0 ) + :aProperty( OUString(), -1, css::uno::Type(), 0 ) ,eLocated( ltHoldMyself ) { aLocation.nOwnClassVectorIndex = -1; @@ -73,7 +72,7 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription */ class COMPHELPER_DLLPUBLIC OPropertyContainerHelper { - typedef ::std::vector< ::com::sun::star::uno::Any > PropertyContainer; + typedef ::std::vector< css::uno::Any > PropertyContainer; typedef PropertyContainer::iterator PropertyContainerIterator; typedef PropertyContainer::const_iterator ConstPropertyContainerIterator; PropertyContainer m_aHoldProperties; @@ -100,21 +99,21 @@ protected: to which _pPointerToMember points. */ void registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, - void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType); + void* _pPointerToMember, const css::uno::Type& _rMemberType); - /** register a property. The property is represented through a ::com::sun::star::uno::Any member of the + /** register a property. The property is represented through a css::uno::Any member of the derived class which calls this methdod. @param _rName the name of the property @param _nHandle the handle of the property @param _nAttributes the attributes of the property @param _pPointerToMember the pointer to the member representing the property - within the derived class, which has to be a ::com::sun::star::uno::Any. + within the derived class, which has to be a css::uno::Any. @param _rExpectedType the expected type of the property. NOT the type of the object to which _pPointerToMember points (this is always an Any). */ void registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, - ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType); + css::uno::Any* _pPointerToMember, const css::uno::Type& _rExpectedType); /** register a property. The repository will create an own object holding this property, so there is no need to declare an extra member in your derived class @@ -123,14 +122,14 @@ protected: @param _nAttributes the attributes of the property @param _rType the type of the property @param _pInitialValue the initial value of the property. May be null if _nAttributes includes - the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag. + the css::beans::PropertyAttribute::MAYBEVOID flag. Else it must be a pointer to an object of the type described by _rType. */ void registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, - const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue); + const css::uno::Type& _rType, const void* _pInitialValue); /** revokes a previously registered property - @throw com::sun::star::beans::UnknownPropertyException + @throw css::beans::UnknownPropertyException if no property with the given handle is registered */ void revokeProperty( sal_Int32 _nHandle ); @@ -145,19 +144,19 @@ protected: // helper for implementing OPropertySetHelper overridables bool 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 ); bool setFastPropertyValue( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ); void getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const; @@ -169,13 +168,13 @@ protected: @param _rProps initial property sequence which is to be extended */ - void describeProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps) const; + void describeProperties(css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps) const; /** retrieves the description for a registered property - @throw com::sun::star::beans::UnknownPropertyException + @throw css::beans::UnknownPropertyException if no property with the given name is registered */ - const ::com::sun::star::beans::Property& + const css::beans::Property& getProperty( const OUString& _rName ) const; private: diff --git a/include/comphelper/propertysequence.hxx b/include/comphelper/propertysequence.hxx index 62f9588abac5..433834277035 100644 --- a/include/comphelper/propertysequence.hxx +++ b/include/comphelper/propertysequence.hxx @@ -18,10 +18,10 @@ namespace comphelper { - inline ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > InitPropertySequence( - ::std::initializer_list< ::std::pair< OUString, ::com::sun::star::uno::Any > > vInit) + inline css::uno::Sequence< css::beans::PropertyValue > InitPropertySequence( + ::std::initializer_list< ::std::pair< OUString, css::uno::Any > > vInit) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> vResult{static_cast<sal_Int32>(vInit.size())}; + css::uno::Sequence< css::beans::PropertyValue> vResult{static_cast<sal_Int32>(vInit.size())}; size_t nCount{0}; for(const auto& aEntry : vInit) { diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx index 7a10ead3a76a..c58d88ba3b98 100644 --- a/include/comphelper/propertysethelper.hxx +++ b/include/comphelper/propertysethelper.hxx @@ -31,20 +31,20 @@ class PropertySetInfo; struct PropertyMapEntry; class PropertySetHelperImpl; -class COMPHELPER_DLLPUBLIC PropertySetHelper : public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::beans::XMultiPropertySet +class COMPHELPER_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet, + public css::beans::XPropertyState, + public css::beans::XMultiPropertySet { private: PropertySetHelperImpl* mp; protected: - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) 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 ) = 0; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0; + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) = 0; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0; - virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::beans::PropertyState* pStates ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); - virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ); + virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ); + virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException ); public: PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw(); @@ -52,27 +52,27 @@ public: virtual ~PropertySetHelper() throw(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const 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) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, 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) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, 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) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet -// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx index beaffd806df3..0c7a4e8b0bee 100644 --- a/include/comphelper/propertysetinfo.hxx +++ b/include/comphelper/propertysetinfo.hxx @@ -33,11 +33,11 @@ namespace comphelper struct PropertyMapEntry { - OUString maName; - sal_Int32 mnHandle; - com::sun::star::uno::Type maType; - sal_Int16 mnAttributes; - sal_uInt8 mnMemberId; + OUString maName; + sal_Int32 mnHandle; + css::uno::Type maType; + sal_Int16 mnAttributes; + sal_uInt8 mnMemberId; }; typedef std::map<OUString, PropertyMapEntry const *> PropertyMap; @@ -46,7 +46,7 @@ class PropertyMapImpl; // don't export to avoid duplicate WeakImplHelper definitions with MSVC class SAL_DLLPUBLIC_TEMPLATE PropertySetInfo_BASE - : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo > + : public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; /** this class implements a XPropertySetInfo that is initialized with arrays of PropertyMapEntry. @@ -76,9 +76,9 @@ public: /** removes an already added PropertyMapEntry which string in mpName equals to aName */ void remove( const OUString& aName ) throw(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception) override; }; } diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index 63ae5585cc8f..b10c61ba8d21 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -37,7 +37,7 @@ namespace comphelper //= OPropertyStateContainer - typedef ::cppu::ImplHelper1 < ::com::sun::star::beans::XPropertyState + typedef ::cppu::ImplHelper1 < css::beans::XPropertyState > OPropertyStateContainer_TBase; /** helper implementation for components which have properties with a default @@ -59,10 +59,10 @@ namespace comphelper // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // own overridables @@ -75,7 +75,7 @@ namespace comphelper <p>Already implemented by this base class, no need to override</p> @precond <arg>_nHandle</arg> is a valid property handle */ - ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); + css::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ); /** set the property denoted by the given handle to it's default value @@ -89,11 +89,11 @@ namespace comphelper @precond <arg>_nHandle</arg> is a valid property handle */ - virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const = 0; + virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const = 0; protected: // 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) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER( ) diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index c042ec64e2a4..f6ba60a9580c 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -51,10 +51,10 @@ namespace comphelper : m_pAdapter(NULL), m_rMutex(_rMutex) { } virtual ~OPropertyChangeListener(); - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw (css::uno::RuntimeException, std::exception) = 0; - virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) - throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void _disposing(const css::lang::EventObject& _rSource) + throw( css::uno::RuntimeException, std::exception); protected: /** If the derivee also owns the mutex which we know as reference, then call this within your @@ -70,26 +70,26 @@ namespace comphelper //= OPropertyChangeMultiplexer /// multiplexer for property changes - class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener> + class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer :public cppu::WeakImplHelper< css::beans::XPropertyChangeListener> { friend class OPropertyChangeListener; - ::com::sun::star::uno::Sequence< OUString > m_aProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSet; - OPropertyChangeListener* m_pListener; - sal_Int32 m_nLockCount; - bool m_bListening : 1; - bool m_bAutoSetRelease : 1; + css::uno::Sequence< OUString > m_aProperties; + css::uno::Reference< css::beans::XPropertySet> m_xSet; + OPropertyChangeListener* m_pListener; + sal_Int32 m_nLockCount; + bool m_bListening : 1; + bool m_bAutoSetRelease : 1; virtual ~OPropertyChangeMultiplexer(); public: - OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true); + OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const css::uno::Reference< css::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception) override; /// incremental lock void lock(); diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index 76de9c229fed..3b9a6a89dab1 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -46,34 +46,34 @@ namespace comphelper /// helper class for implementing property states class COMPHELPER_DLLPUBLIC OPropertyStateHelper :public ::cppu::OPropertySetHelper2 - ,public ::com::sun::star::beans::XPropertyState + ,public css::beans::XPropertyState { public: OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp):OPropertySetHelper2(rBHlp) { } OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp, ::cppu::IEventNotificationHook *i_pFireEvents); - 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; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL - getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL - getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL + getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState> SAL_CALL + getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL - getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // access via handle - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); + virtual css::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; + virtual css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; protected: virtual ~OPropertyStateHelper(); - void firePropertyChange(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aNewValue, const ::com::sun::star::uno::Any& aOldValue); + void firePropertyChange(sal_Int32 nHandle, const css::uno::Any& aNewValue, const css::uno::Any& aOldValue); static css::uno::Sequence<css::uno::Type> getTypes(); }; @@ -82,7 +82,7 @@ namespace comphelper //= OPropertyStateHelper class COMPHELPER_DLLPUBLIC OStatefulPropertySet :public ::cppu::OWeakObject - ,public ::com::sun::star::lang::XTypeProvider + ,public css::lang::XTypeProvider ,public OMutexAndBroadcastHelper // order matters: before OPropertyStateHelper/OPropertySetHelper ,public OPropertyStateHelper { diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index a530bebe1ba6..5c791e57dd93 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -84,30 +84,30 @@ namespace comphelper class OProxyAggregation { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xProxyTypeAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XAggregation > m_xProxyAggregate; + css::uno::Reference< css::lang::XTypeProvider > m_xProxyTypeAccess; + css::uno::Reference< css::uno::XComponentContext > m_xContext; protected: - inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getComponentContext() + inline const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext; } protected: - OProxyAggregation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + OProxyAggregation( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); ~OProxyAggregation(); /// to be called from within your ctor void baseAggregateProxyFor( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, + const css::uno::Reference< css::uno::XInterface >& _rxComponent, oslInterlockedCount& _rRefCount, ::cppu::OWeakObject& _rDelegator ); // XInterface and XTypeProvider - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException); + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException); private: OProxyAggregation( const OProxyAggregation& ) = delete; @@ -126,16 +126,16 @@ namespace comphelper calls which your derived class gets to the dispose method of this class.</p> */ - class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 < com::sun::star::lang::XEventListener + class COMPHELPER_DLLPUBLIC OComponentProxyAggregationHelper :public ::cppu::ImplHelper1 < css::lang::XEventListener > ,private OProxyAggregation { private: - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XEventListener + typedef ::cppu::ImplHelper1 < css::lang::XEventListener > BASE; // prevents some MSVC problems protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + css::uno::Reference< css::lang::XComponent > m_xInner; ::cppu::OBroadcastHelper& m_rBHelper; @@ -144,30 +144,30 @@ namespace comphelper using OProxyAggregation::getComponentContext; // XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER( ) protected: OComponentProxyAggregationHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, ::cppu::OBroadcastHelper& _rBHelper ); virtual ~OComponentProxyAggregationHelper( ); /// to be called from within your ctor void componentAggregateProxyFor( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComponent, + const css::uno::Reference< css::lang::XComponent >& _rxComponent, oslInterlockedCount& _rRefCount, ::cppu::OWeakObject& _rDelegator ); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) = 0; private: OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) = delete; @@ -183,8 +183,8 @@ namespace comphelper { protected: OComponentProxyAggregation( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComponent + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::lang::XComponent >& _rxComponent ); virtual ~OComponentProxyAggregation(); @@ -195,13 +195,13 @@ namespace comphelper DECLARE_XTYPEPROVIDER() // OComponentHelper - virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; // XComponent/OComponentProxyAggregationHelper - 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; protected: // be called from within the dtor of derived classes diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx index ea2e2a158da2..326db1a702e9 100644 --- a/include/comphelper/seekableinput.hxx +++ b/include/comphelper/seekableinput.hxx @@ -31,8 +31,8 @@ namespace comphelper { class SAL_DLLPUBLIC_TEMPLATE OSeekableInputWrapper_BASE - : public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, - ::com::sun::star::io::XSeekable > + : public ::cppu::WeakImplHelper< css::io::XInputStream, + css::io::XSeekable > {}; class COMPHELPER_DLLPUBLIC OSeekableInputWrapper @@ -40,38 +40,38 @@ class COMPHELPER_DLLPUBLIC OSeekableInputWrapper { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xOriginalStream; + css::uno::Reference< css::io::XInputStream > m_xOriginalStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xCopyInput; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xCopySeek; + css::uno::Reference< css::io::XInputStream > m_xCopyInput; + css::uno::Reference< css::io::XSeekable > m_xCopySeek; private: COMPHELPER_DLLPRIVATE void PrepareCopy_Impl(); public: OSeekableInputWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::io::XInputStream >& xInStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~OSeekableInputWrapper(); - static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > CheckSeekableCanWrap( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + static css::uno::Reference< css::io::XInputStream > CheckSeekableCanWrap( + const css::uno::Reference< css::io::XInputStream >& xInStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL available() throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeInput() throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 52a4c932ce08..a70b29e8d761 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -38,7 +38,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC SequenceInputStream -: public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable > +: public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable > { ::osl::Mutex m_aMutex; css::uno::Sequence<sal_Int8> m_aData; @@ -47,28 +47,28 @@ class COMPHELPER_DLLPUBLIC SequenceInputStream public: SequenceInputStream(css::uno::Sequence<sal_Int8> const & rData); -// com::sun::star::io::XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; +// css::io::XInputStream + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead ) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, + css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead ) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, + css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, + css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; private: inline sal_Int32 avail(); @@ -76,13 +76,13 @@ private: // don't export to avoid duplicate WeakImplHelper definitions with MSVC class SAL_DLLPUBLIC_TEMPLATE OSequenceOutputStream_Base - : public ::cppu::WeakImplHelper< ::com::sun::star::io::XOutputStream > + : public ::cppu::WeakImplHelper< css::io::XOutputStream > {}; class COMPHELPER_DLLPUBLIC OSequenceOutputStream : public OSequenceOutputStream_Base { protected: - ::com::sun::star::uno::Sequence< sal_Int8 >& m_rSequence; + css::uno::Sequence< sal_Int8 >& m_rSequence; double m_nResizeFactor; sal_Int32 m_nMinimumResize; sal_Int32 m_nMaximumResize; @@ -90,7 +90,7 @@ protected: // the size of the virtual stream. This is not the size of the sequence, but the number of bytes written // into the stream at a given moment. - bool m_bConnected; + bool m_bConnected; // closeOutput has been called ? ::osl::Mutex m_aMutex; @@ -115,21 +115,21 @@ public: @see closeOutput */ OSequenceOutputStream( - ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, + css::uno::Sequence< sal_Int8 >& _rSeq, double _nResizeFactor = 1.3, sal_Int32 _nMinimumResize = 128, sal_Int32 _nMaximumResize = -1 ); /// same as XOutputStream::writeBytes (as expected :) - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; /// this is a dummy in this implementation, no buffering is used - virtual void SAL_CALL flush( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; /** closes the output stream. In the case of this class, this means that the sequence used for writing is resized to the really used size and not used any further, every subsequent call to one of the XOutputStream methods will throw a <code>NotConnectedException</code>. */ - virtual void SAL_CALL closeOutput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput( ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; }; } // namespace comphelper diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 03b7feabcb91..47bf0c5af9c4 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -142,21 +142,21 @@ namespace comphelper public: /** contrcuct a sequence iterator from a sequence */ - OSequenceIterator(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq); + OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq); /** contrcuct a sequence iterator from a Any containing a sequence */ - OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny); + OSequenceIterator(const css::uno::Any& _rSequenceAny); bool hasMoreElements() const; - ::com::sun::star::uno::Any nextElement(); + css::uno::Any nextElement(); private: - inline void construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq); + inline void construct(const css::uno::Sequence< TYPE >& _rSeq); }; template <class TYPE> - inline OSequenceIterator<TYPE>::OSequenceIterator(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq) + inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq) :m_pElements(NULL) ,m_nLen(0) ,m_pCurrent(NULL) @@ -166,12 +166,12 @@ namespace comphelper template <class TYPE> - inline OSequenceIterator<TYPE>::OSequenceIterator(const ::com::sun::star::uno::Any& _rSequenceAny) + inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Any& _rSequenceAny) :m_pElements(NULL) ,m_nLen(0) ,m_pCurrent(NULL) { - ::com::sun::star::uno::Sequence< TYPE > aContainer; + css::uno::Sequence< TYPE > aContainer; bool bSuccess = _rSequenceAny >>= aContainer; OSL_ENSURE(bSuccess, "OSequenceIterator::OSequenceIterator: invalid Any!"); (void)bSuccess; @@ -180,7 +180,7 @@ namespace comphelper template <class TYPE> - void OSequenceIterator<TYPE>::construct(const ::com::sun::star::uno::Sequence< TYPE >& _rSeq) + void OSequenceIterator<TYPE>::construct(const css::uno::Sequence< TYPE >& _rSeq) { m_pElements = _rSeq.getConstArray(); m_nLen = _rSeq.getLength(); @@ -196,9 +196,9 @@ namespace comphelper template <class TYPE> - inline ::com::sun::star::uno::Any OSequenceIterator<TYPE>::nextElement() + inline css::uno::Any OSequenceIterator<TYPE>::nextElement() { - return ::com::sun::star::uno::toAny(*m_pCurrent++); + return css::uno::toAny(*m_pCurrent++); } /** Copy from a plain C/C++ array into a Sequence. @@ -223,9 +223,9 @@ namespace comphelper prevent or detect precision loss, overflow or truncation. */ template < typename DstType, typename SrcType > - inline ::com::sun::star::uno::Sequence< DstType > arrayToSequence( const SrcType* i_pArray, sal_Int32 nNum ) + inline css::uno::Sequence< DstType > arrayToSequence( const SrcType* i_pArray, sal_Int32 nNum ) { - ::com::sun::star::uno::Sequence< DstType > result( nNum ); + css::uno::Sequence< DstType > result( nNum ); ::std::copy( i_pArray, i_pArray+nNum, result.getArray() ); return result; } @@ -254,7 +254,7 @@ namespace comphelper detect precision loss, overflow or truncation. */ template < typename DstType, typename SrcType > - inline DstType* sequenceToArray( DstType* io_pArray, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) + inline DstType* sequenceToArray( DstType* io_pArray, const css::uno::Sequence< SrcType >& i_Sequence ) { ::std::copy( i_Sequence.begin(), i_Sequence.end(), io_pArray ); return io_pArray; @@ -284,18 +284,18 @@ namespace comphelper precision loss, overflow or truncation. */ template < typename DstType, typename SrcType > - inline ::com::sun::star::uno::Sequence< DstType > containerToSequence( const SrcType& i_Container ) + inline css::uno::Sequence< DstType > containerToSequence( const SrcType& i_Container ) { - ::com::sun::star::uno::Sequence< DstType > result( i_Container.size() ); + css::uno::Sequence< DstType > result( i_Container.size() ); ::std::copy( i_Container.begin(), i_Container.end(), result.getArray() ); return result; } template <typename T> - inline ::com::sun::star::uno::Sequence<T> containerToSequence( + inline css::uno::Sequence<T> containerToSequence( ::std::vector<T> const& v ) { - return ::com::sun::star::uno::Sequence<T>( + return css::uno::Sequence<T>( v.data(), static_cast<sal_Int32>(v.size()) ); } @@ -324,7 +324,7 @@ namespace comphelper precision loss, overflow or truncation. */ template < typename DstType, typename SrcType > - inline DstType sequenceToContainer( const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) + inline DstType sequenceToContainer( const css::uno::Sequence< SrcType >& i_Sequence ) { DstType result( i_Sequence.getLength() ); ::std::copy( i_Sequence.begin(), i_Sequence.end(), result.begin() ); @@ -362,7 +362,7 @@ namespace comphelper precision loss, overflow or truncation. */ template < typename DstType, typename SrcType > - inline DstType& sequenceToContainer( DstType& o_Output, const ::com::sun::star::uno::Sequence< SrcType >& i_Sequence ) + inline DstType& sequenceToContainer( DstType& o_Output, const css::uno::Sequence< SrcType >& i_Sequence ) { o_Output.resize( i_Sequence.getLength() ); ::std::copy( i_Sequence.begin(), i_Sequence.end(), o_Output.begin() ); diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 32e67b784257..9c92bb03a6b1 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -42,7 +42,7 @@ namespace comphelper{ struct SequenceAsHashMapBase : public std::unordered_map< OUString , - ::com::sun::star::uno::Any , + css::uno::Any , OUStringHash , ::std::equal_to< OUString > > { @@ -59,24 +59,24 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase SequenceAsHashMap(); - /** @see operator<<(const ::com::sun::star::uno::Any&) + /** @see operator<<(const css::uno::Any&) */ - SequenceAsHashMap(const ::com::sun::star::uno::Any& aSource); + SequenceAsHashMap(const css::uno::Any& aSource); - /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&) + /** @see operator<<(const css::uno::Sequence< css::uno::Any >&) */ - SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource); + SequenceAsHashMap(const css::uno::Sequence< css::uno::Any >& lSource); - /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&) + /** @see operator<<(const css::uno::Sequence< css::beans::PropertyValue >&) */ - SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); + SequenceAsHashMap(const css::uno::Sequence< css::beans::PropertyValue >& lSource); - /** @see operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >&) + /** @see operator<<(const css::uno::Sequence< css::beans::NamedValue >&) */ - SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); + SequenceAsHashMap(const css::uno::Sequence< css::beans::NamedValue >& lSource); /** @short not really used but maybe useful :-) @@ -97,11 +97,11 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param aSource contains the new items for this map. - @throw A com::sun::star::lang::IllegalArgumentException + @throw A css::lang::IllegalArgumentException is thrown, if the given Any does not contain a suitable sequence ... but not if it's a VOID Any! */ - void operator<<(const ::com::sun::star::uno::Any& aSource); + void operator<<(const css::uno::Any& aSource); /** @short fill this map from the given @@ -112,11 +112,11 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lSource contains the new items for this map. - @throw A com::sun::star::lang::IllegalArgumentException + @throw A css::lang::IllegalArgumentException is thrown, if the given Any sequence uses wrong types for its items. VOID Any will be ignored! */ - void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lSource); + void operator<<(const css::uno::Sequence< css::uno::Any >& lSource); /** @short fill this map from the given @@ -125,7 +125,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lSource contains the new items for this map. */ - void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); + void operator<<(const css::uno::Sequence< css::beans::PropertyValue >& lSource); /** @short fill this map from the given @@ -134,7 +134,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lSource contains the new items for this map. */ - void operator<<(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); + void operator<<(const css::uno::Sequence< css::beans::NamedValue >& lSource); /** @short converts this map instance to an @@ -143,7 +143,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lDestination target sequence for converting. */ - void operator>>(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lDestination) const; + void operator>>(css::uno::Sequence< css::beans::PropertyValue >& lDestination) const; /** @short converts this map instance to an @@ -152,7 +152,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lDestination target sequence for converting. */ - void operator>>(::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lDestination) const; + void operator>>(css::uno::Sequence< css::beans::NamedValue >& lDestination) const; /** @short return this map instance as an @@ -170,7 +170,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @return A const Any, which contains all items of this map. */ - const ::com::sun::star::uno::Any getAsConstAny(bool bAsPropertyValue) const; + const css::uno::Any getAsConstAny(bool bAsPropertyValue) const; /** @short return this map instance to as a @@ -184,7 +184,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @return A const sequence of type NamedValue, which contains all items of this map. */ - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getAsConstNamedValueList() const; + const css::uno::Sequence< css::beans::NamedValue > getAsConstNamedValueList() const; /** @short return this map instance to as a @@ -198,7 +198,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @return A const sequence of type PropertyValue, which contains all items of this map. */ - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getAsConstPropertyValueList() const; + const css::uno::Sequence< css::beans::PropertyValue > getAsConstPropertyValueList() const; /** @short check if the specified item exists @@ -265,7 +265,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase { if (find(sKey) == end()) { - (*this)[sKey] = ::com::sun::star::uno::toAny(aValue); + (*this)[sKey] = css::uno::toAny(aValue); return true; } diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx index 67adcf1f971b..cb9a6f304d07 100644 --- a/include/comphelper/servicedecl.hxx +++ b/include/comphelper/servicedecl.hxx @@ -118,8 +118,7 @@ public: void * getFactory( sal_Char const* pImplName ) const; /// @return supported service names - ::com::sun::star::uno::Sequence< OUString> - getSupportedServiceNames() const; + css::uno::Sequence< OUString> getSupportedServiceNames() const; /// @return whether name is in set of supported service names bool supportsService( OUString const& name ) const; 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 ) ) \ diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx index 786ba279faff..9589451ffa3c 100644 --- a/include/comphelper/serviceinfohelper.hxx +++ b/include/comphelper/serviceinfohelper.hxx @@ -31,15 +31,15 @@ namespace comphelper { * you can use the static helper methods to combine your services with that of parent * or aggregated classes. */ -class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo +class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public css::lang::XServiceInfo { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // helper - static void addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); + static void addToSequence( css::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); protected: ~ServiceInfoHelper() {} diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx index ec68f7ff155f..95d9bb5ed187 100644 --- a/include/comphelper/stillreadwriteinteraction.hxx +++ b/include/comphelper/stillreadwriteinteraction.hxx @@ -40,18 +40,18 @@ private: bool m_bHandledByInternalHandler; public: - StillReadWriteInteraction(const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler, - const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xAuthenticationHandler); + StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler, + const css::uno::Reference< css::task::XInteractionHandler >& xAuthenticationHandler); void resetInterceptions(); void resetErrorStates(); bool wasWriteError() { return (m_bUsed && m_bHandledByMySelf);} private: - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xAuthenticationHandler; + css::uno::Reference< css::task::XInteractionHandler > m_xAuthenticationHandler; virtual ucbhelper::InterceptedInteraction::EInterceptionState intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest& aRequest, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) override; + const css::uno::Reference< css::task::XInteractionRequest >& xRequest) override; }; } diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index f5c58fd15190..84ea999b0776 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -65,23 +65,23 @@ public: bool isCaseSensitive() const {return m_bCaseSensitive;} }; -class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool> +class TPropertyValueEqualFunctor : public ::std::binary_function< css::beans::PropertyValue,OUString,bool> { public: TPropertyValueEqualFunctor() {} - bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const OUString& rhs) const + bool operator() (const css::beans::PropertyValue& lhs, const OUString& rhs) const { return !!(lhs.Name == rhs); } }; -class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,OUString,bool> +class TNamedValueEqualFunctor : public ::std::binary_function< css::beans::NamedValue,OUString,bool> { public: TNamedValueEqualFunctor() {} - bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const OUString& rhs) const + bool operator() (const css::beans::NamedValue& lhs, const OUString& rhs) const { return !!(lhs.Name == rhs); } @@ -104,12 +104,12 @@ template<class T> struct UniquePtrValueLess */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < ::com::sun::star::uno::Reference< IAFCE > - , ::com::sun::star::uno::Reference< IAFCE > + :public ::std::binary_function < css::uno::Reference< IAFCE > + , css::uno::Reference< IAFCE > , bool > { - bool operator() (const ::com::sun::star::uno::Reference< IAFCE >& lhs, const ::com::sun::star::uno::Reference< IAFCE >& rhs) const + bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { return lhs.get() < rhs.get(); // this does not make any sense if you see the semantics of the pointer returned by get: diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx index afa21760705d..9472ce6bae71 100644 --- a/include/comphelper/storagehelper.hxx +++ b/include/comphelper/storagehelper.hxx @@ -66,109 +66,109 @@ public: class COMPHELPER_DLLPUBLIC OStorageHelper { public: - static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > + static css::uno::Reference< css::lang::XSingleServiceFactory > GetStorageFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > + static css::uno::Reference< css::lang::XSingleServiceFactory > GetFileSystemStorageFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetTemporaryStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); /// this one will only return Storage - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageFromURL( const OUString& aURL, sal_Int32 nStorageMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); /// this one will return either Storage or FileSystemStorage - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageFromURL2( const OUString& aURL, sal_Int32 nStorageMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageFromInputStream( - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference < css::io::XInputStream >& xStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageFromStream( - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream, - sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference < css::io::XStream >& xStream, + sal_Int32 nStorageMode = css::embed::ElementModes::READWRITE, + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >() ) + throw ( css::uno::Exception ); static void CopyInputToOutput( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutput ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::io::XInputStream >& xInput, + const css::uno::Reference< css::io::XOutputStream >& xOutput ) + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + static css::uno::Reference< css::io::XInputStream > GetInputStreamFromURL( const OUString& aURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& context ) + throw ( css::uno::Exception ); static void SetCommonStorageEncryptionData( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) - throw ( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::embed::XStorage >& xStorage, + const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) + throw ( css::uno::Exception ); // the following method supports only storages of OOo formats static sal_Int32 GetXStorageFormat( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) - throw ( ::com::sun::star::uno::Exception, std::exception ); + const css::uno::Reference< css::embed::XStorage >& xStorage ) + throw ( css::uno::Exception, std::exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageOfFormatFromURL( const OUString& aFormat, const OUString& aURL, sal_Int32 nStorageMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(), + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >(), bool bRepairStorage = false ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageOfFormatFromInputStream( const OUString& aFormat, - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(), + const css::uno::Reference < css::io::XInputStream >& xStream, + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >(), bool bRepairStorage = false ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + static css::uno::Reference< css::embed::XStorage > GetStorageOfFormatFromStream( const OUString& aFormat, - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream, - sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext - = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(), + const css::uno::Reference < css::io::XStream >& xStream, + sal_Int32 nStorageMode = css::embed::ElementModes::READWRITE, + const css::uno::Reference< css::uno::XComponentContext >& rxContext + = css::uno::Reference< css::uno::XComponentContext >(), bool bRepairStorage = false ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > + static css::uno::Sequence< css::beans::NamedValue > CreatePackageEncryptionData( const OUString& aPassword ); @@ -179,14 +179,14 @@ public: // Methods to allow easy use of hierarchical names inside storages - static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageAtPath( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, + static css::uno::Reference< css::embed::XStorage > GetStorageAtPath( + const css::uno::Reference< css::embed::XStorage > &xStorage, const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); - static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPath( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, + static css::uno::Reference< css::io::XStream > GetStreamAtPath( + const css::uno::Reference< css::embed::XStorage > &xStorage, const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ); - static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPackageURL( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage, + static css::uno::Reference< css::io::XStream > GetStreamAtPackageURL( + const css::uno::Reference< css::embed::XStorage > &xStorage, const OUString& rURL, sal_uInt32 const nOpenMode, LifecycleProxy & rNastiness ); }; diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx index 44da3d51b20a..7a405d568316 100644 --- a/include/comphelper/streamsection.hxx +++ b/include/comphelper/streamsection.hxx @@ -48,13 +48,13 @@ class COMPHELPER_DLLPUBLIC OStreamSection public: /** starts reading of a "skippable" section of data within the given input stream<BR> @param _rxInput the stream to read from. Must support the - com::sun::star::io::XMarkableStream interface + css::io::XMarkableStream interface */ OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput); /** starts writing of a "skippable" section of data into the given output stream @param _rxOutput the stream the stream to write to. Must support the - com::sun::star::io::XMarkableStream interface + css::io::XMarkableStream interface @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this value will be written as section length and corrected (in the dtor) only if needed. If you know how much bytes you are about to write, you may diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index 780d89e5eb2a..fc825f6ff35c 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -309,7 +309,7 @@ COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(OUString const& rIn, list, interspersed with the string ", ". */ COMPHELPER_DLLPUBLIC OUString convertCommaSeparated( - ::com::sun::star::uno::Sequence< OUString > const & i_rSeq); + css::uno::Sequence< OUString > const & i_rSeq); /// Return a string which is the concatenation of the strings in the sequence. COMPHELPER_DLLPUBLIC OString join(const OString& rSeparator, const std::vector<OString>& rSequence); @@ -344,7 +344,7 @@ COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber( @return A sequence of strings resulting from splitting the given string at ',' tokens and stripping whitespace. */ -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > +COMPHELPER_DLLPUBLIC css::uno::Sequence< OUString > convertCommaSeparated( OUString const & i_rString ); /** @@ -364,25 +364,25 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString > > 0 - if this string is greater than the string argument */ COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const OUString &rLHS, const OUString &rRHS, - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > &rCollator, - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > &rBI, - const ::com::sun::star::lang::Locale &rLocale ); + const css::uno::Reference< css::i18n::XCollator > &rCollator, + const css::uno::Reference< css::i18n::XBreakIterator > &rBI, + const css::lang::Locale &rLocale ); class COMPHELPER_DLLPUBLIC NaturalStringSorter { private: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > m_xBI; + css::lang::Locale m_aLocale; + css::uno::Reference< css::i18n::XCollator > m_xCollator; + css::uno::Reference< css::i18n::XBreakIterator > m_xBI; public: NaturalStringSorter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext, - const ::com::sun::star::lang::Locale &rLocale); + const css::uno::Reference< css::uno::XComponentContext > &rContext, + const css::lang::Locale &rLocale); sal_Int32 compare(const OUString &rLHS, const OUString &rRHS) const { return compareNatural(rLHS, rRHS, m_xCollator, m_xBI, m_aLocale); } - const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale; } + const css::lang::Locale& getLocale() const { return m_aLocale; } }; /** Determine if an OString contains solely ASCII numeric digits diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx index 3347e83c79cd..910fd6c20f2f 100644 --- a/include/comphelper/synchronousdispatch.hxx +++ b/include/comphelper/synchronousdispatch.hxx @@ -49,12 +49,12 @@ namespace comphelper class SynchronousDispatch { public: - static COMPHELPER_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::lang::XComponent > dispatch( - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &xStartPoint, + static COMPHELPER_DLLPUBLIC css::uno::Reference< css::lang::XComponent > dispatch( + const css::uno::Reference< css::uno::XInterface > &xStartPoint, const OUString &sURL, const OUString &sTarget, const sal_Int32 nFlags, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &lArguments ); + const css::uno::Sequence< css::beans::PropertyValue > &lArguments ); }; diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 2dab540206c3..6901e6c52ded 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -74,7 +74,7 @@ namespace comphelper - /** get a com::sun::star::awt::FontDescriptor that is fully initialized with + /** get a css::awt::FontDescriptor that is fully initialized with the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) */ @@ -97,8 +97,8 @@ namespace comphelper COMPHELPER_DLLPUBLIC sal_Int16 getINT16(const css::uno::Any& _rAny); COMPHELPER_DLLPUBLIC double getDouble(const css::uno::Any& _rAny); COMPHELPER_DLLPUBLIC float getFloat(const css::uno::Any& _rAny); - COMPHELPER_DLLPUBLIC OUString getString(const css::uno::Any& _rAny); - COMPHELPER_DLLPUBLIC bool getBOOL(const css::uno::Any& _rAny); + COMPHELPER_DLLPUBLIC OUString getString(const css::uno::Any& _rAny); + COMPHELPER_DLLPUBLIC bool getBOOL(const css::uno::Any& _rAny); COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const css::uno::Any& _rAny) throw(css::lang::IllegalArgumentException); diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index b8f774a1a1a4..330740ce366a 100644 --- a/include/comphelper/unique_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -25,12 +25,12 @@ template<class T> class unique_disposing_ptr { private: std::unique_ptr<T> m_xItem; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener; + css::uno::Reference< css::frame::XTerminateListener> m_xTerminateListener; unique_disposing_ptr(const unique_disposing_ptr&) = delete; unique_disposing_ptr& operator=(const unique_disposing_ptr&) = delete; public: - unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + unique_disposing_ptr( const css::uno::Reference< css::lang::XComponent > &rComponent, T * p = 0 ) : m_xItem(p) { m_xTerminateListener = new TerminateListener(rComponent, *this); @@ -66,18 +66,18 @@ public: reset(); } private: - class TerminateListener : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XTerminateListener > + class TerminateListener : public ::cppu::WeakImplHelper< css::frame::XTerminateListener > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; + css::uno::Reference< css::lang::XComponent > m_xComponent; unique_disposing_ptr<T>& m_rItem; public: - TerminateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, + TerminateListener(const css::uno::Reference< css::lang::XComponent > &rComponent, unique_disposing_ptr<T>& rItem) : m_xComponent(rComponent), m_rItem(rItem) { if (m_xComponent.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::frame::XDesktop> xDesktop(m_xComponent, css::uno::UNO_QUERY); if (xDesktop.is()) xDesktop->addTerminateListener(this); else @@ -89,7 +89,7 @@ private: { if ( m_xComponent.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::frame::XDesktop> xDesktop(m_xComponent, css::uno::UNO_QUERY); if (xDesktop.is()) xDesktop->removeTerminateListener(this); else @@ -99,14 +99,14 @@ private: private: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const css::lang::EventObject& rEvt ) + throw (css::uno::RuntimeException, std::exception) override { bool shutDown = (rEvt.Source == m_xComponent); if (shutDown && m_xComponent.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::frame::XDesktop> xDesktop(m_xComponent, css::uno::UNO_QUERY); if (xDesktop.is()) xDesktop->removeTerminateListener(this); else @@ -119,14 +119,14 @@ private: } // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::frame::TerminationVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL queryTermination( const css::lang::EventObject& ) + throw(css::frame::TerminationVetoException, + css::uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEvt ) + throw (css::uno::RuntimeException, std::exception) override { disposing(rEvt); } @@ -141,7 +141,7 @@ template<class T> class unique_disposing_solar_mutex_reset_ptr : public unique_disposing_ptr<T> { public: - unique_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + unique_disposing_solar_mutex_reset_ptr( const css::uno::Reference< css::lang::XComponent > &rComponent, T * p = 0 ) : unique_disposing_ptr<T>(rComponent, p) { } 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(); } diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx index af07ef66987c..8a8156aacccf 100644 --- a/include/comphelper/unwrapargs.hxx +++ b/include/comphelper/unwrapargs.hxx @@ -33,10 +33,10 @@ namespace comphelper { namespace detail { inline void unwrapArgsError( const OUString& str, sal_Int32 nArg, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xErrorContext = - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ) + const css::uno::Reference< css::uno::XInterface >& xErrorContext = + css::uno::Reference< css::uno::XInterface >() ) { - throw ::com::sun::star::lang::IllegalArgumentException( + throw css::lang::IllegalArgumentException( str, xErrorContext, static_cast< sal_Int16 >( nArg ) ); } @@ -47,15 +47,15 @@ namespace detail { } inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&, + const css::uno::Sequence< css::uno::Any >&, sal_Int32, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ) + const css::uno::Reference< css::uno::XInterface >& ) { return; } inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&, + const css::uno::Sequence< css::uno::Any >&, sal_Int32 ) { return; @@ -63,12 +63,12 @@ namespace detail { template< typename T, typename... Args > inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& seq, + const css::uno::Sequence< css::uno::Any >& seq, sal_Int32 nArg, ::boost::optional< T >& v, Args&... args ); template< typename T, typename... Args > inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& seq, + const css::uno::Sequence< css::uno::Any >& seq, sal_Int32 nArg, T& v, Args&... args ) { if( seq.getLength() <= nArg ) @@ -91,7 +91,7 @@ namespace detail { template< typename T, typename... Args > inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& seq, + const css::uno::Sequence< css::uno::Any >& seq, sal_Int32 nArg, ::boost::optional< T >& v, Args&... args ) { if( nArg < seq.getLength() ) @@ -107,7 +107,7 @@ namespace detail { template< typename... Args > inline void unwrapArgs( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& seq, + const css::uno::Sequence< css::uno::Any >& seq, Args&... args ) { return detail::unwrapArgs( seq, 0, args... ); diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx index 8e0bbe0a7dd0..635337c3462b 100644 --- a/include/comphelper/weak.hxx +++ b/include/comphelper/weak.hxx @@ -27,24 +27,24 @@ namespace comphelper { /** Base class to implement an UNO object supporting types and 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. In addition to the features from cppu::OWeakObject, derivations from this class can also used as a base class for ::cppu::ImplInheritanceHelper? */ -class COMPHELPER_DLLPUBLIC OWeakTypeObject : public ::cppu::OWeakObject, public ::com::sun::star::lang::XTypeProvider +class COMPHELPER_DLLPUBLIC OWeakTypeObject : public ::cppu::OWeakObject, public css::lang::XTypeProvider { public: OWeakTypeObject(); virtual ~OWeakTypeObject(); - 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; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; - 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; }; diff --git a/include/comphelper/weakbag.hxx b/include/comphelper/weakbag.hxx index 9ed55fb41489..f23f9227057e 100644 --- a/include/comphelper/weakbag.hxx +++ b/include/comphelper/weakbag.hxx @@ -44,16 +44,16 @@ public: @param e a non-null reference. */ - void add(com::sun::star::uno::Reference< T > const & e) { + void add(css::uno::Reference< T > const & e) { OSL_ASSERT(e.is()); for (typename WeakReferenceList::iterator i(m_list.begin()); i != m_list.end();) { - if (com::sun::star::uno::Reference< T >(*i).is()) { + if (css::uno::Reference< T >(*i).is()) { ++i; } else { i = m_list.erase(i); } } - m_list.push_back(com::sun::star::uno::WeakReference< T >(e)); + m_list.push_back(css::uno::WeakReference< T >(e)); } /** @@ -62,19 +62,19 @@ public: @return a living reference, or null if there are none. */ - com::sun::star::uno::Reference< T > remove() { + css::uno::Reference< T > remove() { while (!m_list.empty()) { - com::sun::star::uno::Reference< T > r(m_list.front()); + css::uno::Reference< T > r(m_list.front()); m_list.pop_front(); if (r.is()) { return r; } } - return com::sun::star::uno::Reference< T >(); + return css::uno::Reference< T >(); } private: - typedef std::list< com::sun::star::uno::WeakReference< T > > WeakReferenceList; + typedef std::list< css::uno::WeakReference< T > > WeakReferenceList; WeakReferenceList m_list; }; diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 92381fcf8bd8..187ca03fb3e8 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -45,19 +45,19 @@ namespace comphelper class OWeakListenerAdapterBase : public OBaseMutex { private: - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > + css::uno::WeakReference< css::uno::XInterface > m_aListener; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xBroadcaster; protected: - inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + inline css::uno::Reference< css::uno::XInterface > getListener( ) const { return m_aListener.get(); } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& + inline const css::uno::Reference< css::uno::XInterface >& getBroadcaster( ) const { return m_xBroadcaster; @@ -71,8 +71,8 @@ namespace comphelper protected: inline OWeakListenerAdapterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxBroadcaster + const css::uno::Reference< css::uno::XWeak >& _rxListener, + const css::uno::Reference< css::uno::XInterface >& _rxBroadcaster ) :m_aListener ( _rxListener ) ,m_xBroadcaster ( _rxBroadcaster ) @@ -106,18 +106,18 @@ namespace comphelper as this can't be done in a generic way</p> */ OWeakListenerAdapter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener, - const ::com::sun::star::uno::Reference< BROADCASTER >& _rxBroadcaster + const css::uno::Reference< css::uno::XWeak >& _rxListener, + const css::uno::Reference< BROADCASTER >& _rxBroadcaster ); protected: - inline ::com::sun::star::uno::Reference< LISTENER > getListener( ) const + inline css::uno::Reference< LISTENER > getListener( ) const { - return ::com::sun::star::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), ::com::sun::star::uno::UNO_QUERY ); + return css::uno::Reference< LISTENER >( OWeakListenerAdapterBase::getListener(), css::uno::UNO_QUERY ); } // XEventListener overridables - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; protected: // OComponentHelper overridables @@ -128,8 +128,8 @@ namespace comphelper //= OWeakEventListenerAdapter - typedef OWeakListenerAdapter < ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XEventListener + typedef OWeakListenerAdapter < css::lang::XComponent + , css::lang::XEventListener > OWeakEventListenerAdapter_Base; /** the most simple listener adapter: for XEventListeners at XComponents */ @@ -137,8 +137,8 @@ namespace comphelper { public: OWeakEventListenerAdapter( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak > _rxListener, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > _rxBroadcaster + css::uno::Reference< css::uno::XWeak > _rxListener, + css::uno::Reference< css::lang::XComponent > _rxBroadcaster ); // nothing to do except an own ctor - the forwarding of the "disposing" is already done @@ -155,8 +155,8 @@ namespace comphelper template< class BROADCASTER, class LISTENER > OWeakListenerAdapter< BROADCASTER, LISTENER >::OWeakListenerAdapter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XWeak >& _rxListener, - const ::com::sun::star::uno::Reference< BROADCASTER >& _rxBroadcaster + const css::uno::Reference< css::uno::XWeak >& _rxListener, + const css::uno::Reference< BROADCASTER >& _rxBroadcaster ) : ::cppu::WeakComponentImplHelper< LISTENER >( m_aMutex ) , OWeakListenerAdapterBase( _rxListener, _rxBroadcaster ) @@ -165,9 +165,9 @@ namespace comphelper template< class BROADCASTER, class LISTENER > - void SAL_CALL OWeakListenerAdapter< BROADCASTER, LISTENER >::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL OWeakListenerAdapter< BROADCASTER, LISTENER >::disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException) { - ::com::sun::star::uno::Reference< LISTENER > xListener( getListener() ); + css::uno::Reference< LISTENER > xListener( getListener() ); if ( xListener.is() ) xListener->disposing( _rSource ); } |