[Libreoffice-commits] core.git: include/comphelper
Noel Grandin
noel at peralex.com
Tue Oct 20 00:05:51 PDT 2015
include/comphelper/ChainablePropertySet.hxx | 90 +++++++--------
include/comphelper/ChainablePropertySetInfo.hxx | 17 +-
include/comphelper/InlineContainer.hxx | 4
include/comphelper/MasterPropertySet.hxx | 103 ++++++++---------
include/comphelper/MasterPropertySetInfo.hxx | 17 +-
include/comphelper/SelectionMultiplex.hxx | 24 ++--
include/comphelper/SettingsHelper.hxx | 56 ++++-----
include/comphelper/accessiblecomponenthelper.hxx | 34 ++---
include/comphelper/accessiblecontexthelper.hxx | 38 +++---
include/comphelper/accessibleeventnotifier.hxx | 8 -
include/comphelper/accessiblekeybindinghelper.hxx | 12 +-
include/comphelper/accessibleselectionhelper.hxx | 38 +++---
include/comphelper/accessibletexthelper.hxx | 72 ++++++------
include/comphelper/accessiblewrapper.hxx | 130 +++++++++++-----------
include/comphelper/accimplaccess.hxx | 16 +-
include/comphelper/anycompare.hxx | 52 ++++----
include/comphelper/anytostring.hxx | 2
include/comphelper/attributelist.hxx | 16 +-
include/comphelper/componentbase.hxx | 4
include/comphelper/componentguard.hxx | 2
include/comphelper/componentmodule.hxx | 32 ++---
include/comphelper/configuration.hxx | 84 ++++++--------
include/comphelper/configurationlistener.hxx | 2
include/comphelper/container.hxx | 14 +-
include/comphelper/containermultiplexer.hxx | 30 ++---
include/comphelper/docpasswordhelper.hxx | 29 ++--
include/comphelper/docpasswordrequest.hxx | 22 +--
include/comphelper/documentinfo.hxx | 2
include/comphelper/embeddedobjectcontainer.hxx | 80 ++++++-------
include/comphelper/eventattachermgr.hxx | 6 -
include/comphelper/evtlistenerhlp.hxx | 8 -
include/comphelper/evtmethodhelper.hxx | 2
include/comphelper/extract.hxx | 36 +++---
include/comphelper/genericpropertyset.hxx | 2
include/comphelper/interaction.hxx | 34 ++---
include/comphelper/listenernotification.hxx | 40 +++---
include/comphelper/logging.hxx | 6 -
include/comphelper/mimeconfighelper.hxx | 72 ++++++------
include/comphelper/namecontainer.hxx | 4
include/comphelper/namedvaluecollection.hxx | 70 +++++------
include/comphelper/numbers.hxx | 8 -
include/comphelper/officeresourcebundle.hxx | 6 -
include/comphelper/ofopxmlhelper.hxx | 34 ++---
include/comphelper/optional.hxx | 3
include/comphelper/processfactory.hxx | 10 -
include/comphelper/propagg.hxx | 68 +++++------
include/comphelper/proparrhlp.hxx | 8 -
include/comphelper/property.hxx | 14 +-
include/comphelper/propertybag.hxx | 30 ++---
include/comphelper/propertycontainer.hxx | 20 +--
include/comphelper/propertycontainerhelper.hxx | 41 +++---
include/comphelper/propertysequence.hxx | 6 -
include/comphelper/propertysethelper.hxx | 50 ++++----
include/comphelper/propertysetinfo.hxx | 18 +--
include/comphelper/propertystatecontainer.hxx | 16 +-
include/comphelper/propmultiplex.hxx | 26 ++--
include/comphelper/propstate.hxx | 26 ++--
include/comphelper/proxyaggregation.hxx | 42 +++----
include/comphelper/seekableinput.hxx | 38 +++---
include/comphelper/seqstream.hxx | 44 +++----
include/comphelper/sequence.hxx | 38 +++---
include/comphelper/sequenceashashmap.hxx | 42 +++----
include/comphelper/servicedecl.hxx | 3
include/comphelper/servicehelper.hxx | 20 +--
include/comphelper/serviceinfohelper.hxx | 8 -
include/comphelper/stillreadwriteinteraction.hxx | 8 -
include/comphelper/stl_types.hxx | 14 +-
include/comphelper/storagehelper.hxx | 128 ++++++++++-----------
include/comphelper/streamsection.hxx | 4
include/comphelper/string.hxx | 22 +--
include/comphelper/synchronousdispatch.hxx | 6 -
include/comphelper/types.hxx | 6 -
include/comphelper/unique_disposing_ptr.hxx | 32 ++---
include/comphelper/uno3.hxx | 36 +++---
include/comphelper/unwrapargs.hxx | 20 +--
include/comphelper/weak.hxx | 10 -
include/comphelper/weakbag.hxx | 14 +-
include/comphelper/weakeventlistener.hxx | 38 +++---
78 files changed, 1130 insertions(+), 1137 deletions(-)
New commits:
commit 1b62841b1859ae3443e2bf1ebe99ec3d6afb6cc2
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 19 12:51:29 2015 +0200
com::sun::star->css in include/comphelper
Change-Id: Ice569b724732da1fd67a18a4ccf2f92f530cd689
Reviewed-on: https://gerrit.libreoffice.org/19459
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 8954793..7dda618 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 c5ee4a6..e7bcefe 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 482c626..0af1cda 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 0b795f4..73d96ae 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 0ef6585..80c1b32 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 71681cb..5844f70 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 0124ffb..5bc3364 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 d15c833..9e80e94 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 798d434..4eae0f7 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 0cef8ed..9ed47cf 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 c11cfc6..cbe81a3 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 84011e1..ca6edea 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 24716e9..ed9e6ac2 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 16854cb..f9b48e8 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list