From d74436fb8681f18c1a4097a8b13c5a138cc73e79 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 27 Jul 2015 10:34:56 +0200 Subject: com::sun::star->css in comphelper Change-Id: I4aa0b2d15f2a06cbbbf63a363f403ca6435ffbcd Reviewed-on: https://gerrit.libreoffice.org/17365 Tested-by: Jenkins Reviewed-by: Noel Grandin --- comphelper/source/compare/AnyCompareFactory.cxx | 6 +- .../container/IndexedPropertyValuesContainer.cxx | 74 ++++++------- .../container/NamedPropertyValuesContainer.cxx | 80 +++++++-------- comphelper/source/container/container.cxx | 22 ++-- .../source/container/embeddedobjectcontainer.cxx | 14 +-- comphelper/source/container/enumerablemap.cxx | 8 +- comphelper/source/container/namecontainer.cxx | 44 ++++---- .../source/eventattachermgr/eventattachermgr.cxx | 6 +- comphelper/source/misc/accessibletexthelper.cxx | 4 +- comphelper/source/misc/anycompare.cxx | 12 +-- comphelper/source/misc/componentmodule.cxx | 2 +- comphelper/source/misc/configuration.cxx | 4 +- comphelper/source/misc/docpasswordhelper.cxx | 6 +- comphelper/source/misc/documentinfo.cxx | 4 +- comphelper/source/misc/documentiologring.hxx | 30 +++--- comphelper/source/misc/evtlistenerhlp.cxx | 6 +- comphelper/source/misc/instancelocker.hxx | 59 ++++++----- comphelper/source/misc/logging.cxx | 2 +- comphelper/source/misc/namedvaluecollection.cxx | 2 +- comphelper/source/misc/officerestartmanager.hxx | 28 ++--- comphelper/source/misc/scopeguard.cxx | 2 +- comphelper/source/misc/serviceinfohelper.cxx | 8 +- .../source/misc/stillreadwriteinteraction.cxx | 2 +- comphelper/source/misc/storagehelper.cxx | 2 +- .../officeinstallationdirectories.hxx | 32 +++--- .../source/property/ChainablePropertySet.cxx | 4 +- .../source/property/ChainablePropertySetInfo.cxx | 6 +- comphelper/source/property/MasterPropertySet.cxx | 4 +- .../source/property/MasterPropertySetInfo.cxx | 6 +- comphelper/source/property/genericpropertyset.cxx | 6 +- comphelper/source/property/opropertybag.hxx | 108 +++++++++---------- comphelper/source/property/propagg.cxx | 114 ++++++++++----------- comphelper/source/property/propertysetinfo.cxx | 6 +- comphelper/source/property/propstate.cxx | 36 +++---- comphelper/source/streaming/memorystream.cxx | 4 +- comphelper/source/streaming/seqinputstreamserv.cxx | 18 ++-- .../source/streaming/seqoutputstreamserv.cxx | 10 +- comphelper/source/streaming/seqstream.cxx | 2 +- comphelper/source/streaming/streamsection.cxx | 4 +- comphelper/source/xml/attributelist.cxx | 12 +-- 40 files changed, 398 insertions(+), 401 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 7596207379e6..cbc72b967695 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -64,7 +64,7 @@ public: {} // XAnyCompareFactory - virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) @@ -81,7 +81,7 @@ public: static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); }; -sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(css::uno::RuntimeException, std::exception) { sal_Int16 aResult = 0; @@ -96,7 +96,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw return aResult; } -Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) { // for now only OUString properties compare is implemented // so no check for the property name is done diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index b6c2776742a3..e5843fbf4e0b 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -40,35 +40,35 @@ public: virtual ~IndexedPropertyValuesContainer() throw(); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -88,9 +88,9 @@ IndexedPropertyValuesContainer::~IndexedPropertyValuesContainer() throw() } // XIndexContainer -void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nSize >= nIndex) && (nIndex >= 0)) @@ -131,8 +131,8 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c } void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -165,9 +165,9 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) } // XIndexReplace -void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -183,14 +183,14 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, // XIndexAccess sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maProperties.size(); } -::com::sun::star::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex ) + throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if (!((nIndex < nSize) && (nIndex >= 0))) @@ -202,20 +202,20 @@ sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) } // XElementAccess -::com::sun::star::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) + throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType>::get(); } sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) { return getImplementationName_static(); } @@ -225,18 +225,18 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static( return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) +css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index fd569eb46112..391e0507d723 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -41,37 +41,37 @@ public: virtual ~NamedPropertyValuesContainer() throw(); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::container::ElementExistException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -92,8 +92,8 @@ NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw() // XNameContainer void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::lang::IllegalArgumentException, css::container::ElementExistException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( maProperties.find( aName ) != maProperties.end() ) throw container::ElementExistException(); @@ -106,8 +106,8 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, } void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( Name ); if( aIter == maProperties.end() ) @@ -117,9 +117,9 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) } // XNameReplace -void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -133,9 +133,9 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName } // XNameAccess -::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -148,8 +148,8 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName return aElement; } -::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) + throw(css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.begin(); const NamedPropertyValues::iterator aEnd = maProperties.end(); @@ -166,27 +166,27 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); return aIter != maProperties.end(); } // XElementAccess -::com::sun::star::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) + throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType>::get(); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) { return getImplementationName_static(); } @@ -196,17 +196,17 @@ OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName_static( ) return OUString( "NamedPropertyValuesContainer" ); } -sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) +css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx index 43a50cccd192..9bd468e9d450 100644 --- a/comphelper/source/container/container.cxx +++ b/comphelper/source/container/container.cxx @@ -29,7 +29,7 @@ namespace comphelper -IndexAccessIterator::IndexAccessIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint) +IndexAccessIterator::IndexAccessIterator(css::uno::Reference< css::uno::XInterface> xStartingPoint) :m_xStartingPoint(xStartingPoint) ,m_xCurrentObject(NULL) { @@ -39,7 +39,7 @@ IndexAccessIterator::IndexAccessIterator(::com::sun::star::uno::Reference< ::com IndexAccessIterator::~IndexAccessIterator() {} -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> IndexAccessIterator::Next() +css::uno::Reference< css::uno::XInterface> IndexAccessIterator::Next() { bool bCheckingStartingPoint = !m_xCurrentObject.is(); // Is the current node the starting point? @@ -48,7 +48,7 @@ IndexAccessIterator::~IndexAccessIterator() {} if (!m_xCurrentObject.is()) m_xCurrentObject = m_xStartingPoint; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xSearchLoop( m_xCurrentObject); + css::uno::Reference< css::uno::XInterface> xSearchLoop( m_xCurrentObject); bool bHasMoreToSearch = true; bool bFoundSomething = false; while (!bFoundSomething && bHasMoreToSearch) @@ -62,11 +62,11 @@ IndexAccessIterator::~IndexAccessIterator() {} else { // First, check to see if there's a match below - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> xContainerAccess(xSearchLoop, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::container::XIndexAccess> xContainerAccess(xSearchLoop, css::uno::UNO_QUERY); if (xContainerAccess.is() && xContainerAccess->getCount() && ShouldStepInto(xContainerAccess)) { - ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(0)); - xSearchLoop = *static_cast const *>(aElement.getValue()); + css::uno::Any aElement(xContainerAccess->getByIndex(0)); + xSearchLoop = *static_cast const *>(aElement.getValue()); bCheckingStartingPoint = false; m_arrChildIndizies.push_back((sal_Int32)0); @@ -75,11 +75,11 @@ IndexAccessIterator::~IndexAccessIterator() {} { // otherwise, look above and to the right, if possible while (m_arrChildIndizies.size() > 0) { // If the list isn't empty and there's nothing above - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> xChild(xSearchLoop, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::container::XChild> xChild(xSearchLoop, css::uno::UNO_QUERY); OSL_ENSURE(xChild.is(), "IndexAccessIterator::Next : a content has no appropriate interface !"); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xParent( xChild->getParent()); - xContainerAccess = ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>(xParent, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::uno::XInterface> xParent( xChild->getParent()); + xContainerAccess = css::uno::Reference< css::container::XIndexAccess>(xParent, css::uno::UNO_QUERY); OSL_ENSURE(xContainerAccess.is(), "IndexAccessIterator::Next : a content has an invalid parent !"); // Remove the index that SearchLoop had within this parent from my stack @@ -90,8 +90,8 @@ IndexAccessIterator::~IndexAccessIterator() {} { // Move to the right in this row ++nOldSearchChildIndex; // and check the next child - ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex)); - xSearchLoop = *static_cast const *>(aElement.getValue()); + css::uno::Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex)); + xSearchLoop = *static_cast const *>(aElement.getValue()); bCheckingStartingPoint = false; // and update its position in the list. m_arrChildIndizies.push_back((sal_Int32)nOldSearchChildIndex); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 3fa1538bd7eb..778b3265a05f 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -281,7 +281,7 @@ bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rNa return ( aIt != pImpl->maObjectContainer.end() ); } -OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj ) +OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) @@ -411,7 +411,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde return CreateEmbeddedObject( rClassId, uno::Sequence < beans::PropertyValue >(), rNewName ); } -void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const OUString& rName ) +void EmbeddedObjectContainer::AddEmbeddedObject( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, const OUString& rName ) { #if OSL_DEBUG_LEVEL > 1 SAL_WARN_IF( rName.isEmpty(), "comphelper.container", "Added object doesn't have a name!"); @@ -593,7 +593,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xRet; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const css::uno::Sequence < css::beans::PropertyValue >& aMedium, OUString& rNewName ) { if ( rNewName.isEmpty() ) rNewName = CreateUniqueObjectName(); @@ -625,7 +625,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const css::uno::Sequence < css::beans::PropertyValue >& aMedium, OUString& rNewName ) { if ( rNewName.isEmpty() ) rNewName = CreateUniqueObjectName(); @@ -1165,7 +1165,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return xStream; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, OUString* pMediaType ) { // try to load it from the container storage return GetGraphicStream( GetEmbeddedObjectName( xObj ), pMediaType ); @@ -1206,7 +1206,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( co return GetObjectStream( GetEmbeddedObjectName( xObj ), pMediaType ); } -bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) +bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { try { @@ -1241,7 +1241,7 @@ bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Re return true; } -bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) +bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { try { diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 06c05bebeda7..16725878d047 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -189,9 +189,9 @@ namespace comphelper virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerableMap - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMap virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -231,7 +231,7 @@ namespace comphelper ::osl::Mutex m_aMutex; MapData m_aData; - ::std::vector< ::com::sun::star::uno::WeakReference< XInterface > > + ::std::vector< css::uno::WeakReference< XInterface > > m_aDependentComponents; }; diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index e282383b6676..e23cc1b793cd 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -26,7 +26,7 @@ #include #include -typedef std::map SvGenericNameContainerMapImpl; +typedef std::map SvGenericNameContainerMapImpl; namespace comphelper { @@ -37,43 +37,43 @@ namespace comphelper }; /** this is the base helper class for NameContainer thats also declared in this header. */ - class NameContainer : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer >, private NameContainerImpl + class NameContainer : public ::cppu::WeakImplHelper< css::container::XNameContainer >, private NameContainerImpl { public: - explicit NameContainer( ::com::sun::star::uno::Type aType ); + explicit NameContainer( css::uno::Type aType ); virtual ~NameContainer(); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::container::ElementExistException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeByName( const OUString& Name ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) + throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SvGenericNameContainerMapImpl maProperties; - const ::com::sun::star::uno::Type maType; + const css::uno::Type maType; }; } @@ -84,7 +84,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -NameContainer::NameContainer( ::com::sun::star::uno::Type aType ) +NameContainer::NameContainer( css::uno::Type aType ) : maType( aType ) { } diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 19e534ce75fb..72e32f64eb10 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -655,14 +655,14 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference if (aCurrentPosition->aEventList.empty()) return; - Sequence aEvents(aCurrentPosition->aEventList.size()); + Sequence aEvents(aCurrentPosition->aEventList.size()); std::deque::iterator itr = aCurrentPosition->aEventList.begin(); std::deque::iterator itrEnd = aCurrentPosition->aEventList.end(); - ::com::sun::star::script::EventListener* p = aEvents.getArray(); + css::script::EventListener* p = aEvents.getArray(); size_t i = 0; for (; itr != itrEnd; ++itr) { - com::sun::star::script::EventListener aListener; + css::script::EventListener aListener; aListener.AllListener = new AttacherAllListener_Impl(this, itr->ScriptType, itr->ScriptCode); aListener.Helper = rCurObj.aHelper; diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index e088cd197764..98c3c0213261 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -681,8 +681,8 @@ namespace comphelper bool OCommonAccessibleText::implInitTextChangedEvent( const OUString& rOldString, const OUString& rNewString, - ::com::sun::star::uno::Any& rDeleted, - ::com::sun::star::uno::Any& rInserted) // throw() + css::uno::Any& rDeleted, + css::uno::Any& rInserted) // throw() { sal_uInt32 nLenOld = rOldString.getLength(); sal_uInt32 nLenNew = rNewString.getLength(); diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx index f08a65f4dfbd..2a04ba04bca9 100644 --- a/comphelper/source/misc/anycompare.cxx +++ b/comphelper/source/misc/anycompare.cxx @@ -60,13 +60,13 @@ namespace comphelper class DatePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const SAL_OVERRIDE { Date lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); // FIXME Timezone? if ( lhs.Year < rhs.Year ) @@ -88,13 +88,13 @@ namespace comphelper class TimePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const SAL_OVERRIDE { Time lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); // FIXME Timezone? if ( lhs.Hours < rhs.Hours ) @@ -121,13 +121,13 @@ namespace comphelper class DateTimePredicateLess : public IKeyPredicateLess { public: - virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const SAL_OVERRIDE + virtual bool isLess( css::uno::Any const & _lhs, css::uno::Any const & _rhs ) const SAL_OVERRIDE { DateTime lhs, rhs; if ( !( _lhs >>= lhs ) || !( _rhs >>= rhs ) ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); // FIXME Timezone? if ( lhs.Year < rhs.Year ) diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index dd1b2bdfd7b2..b06604ee6ed3 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -109,7 +109,7 @@ namespace comphelper } - void OModule::registerImplementation( const OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, + void OModule::registerImplementation( const OUString& _rImplementationName, const css::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction ) { ComponentDescription aComponent( _rImplementationName, _rServiceNames, OUString(), _pCreateFunction, _pFactoryFunction ); diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index b01bdaef477b..6280fdc84ac2 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -141,7 +141,7 @@ css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue( void comphelper::detail::ConfigurationWrapper::setPropertyValue( std::shared_ptr< ConfigurationChanges > const & batch, - OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, css::uno::Any const & value) { assert(batch.get() != 0); batch->setPropertyValue(path, value); @@ -157,7 +157,7 @@ comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( std::shared_ptr< ConfigurationChanges > const & batch, - OUString const & path, com::sun::star::uno::Any const & value) + OUString const & path, css::uno::Any const & value) { assert(batch.get() != 0); batch->setPropertyValue(path, value); diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 217a75edd154..f8fb3acb3b7b 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -350,9 +350,9 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( -/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword( +/*static*/ css::uno::Sequence< css::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword( IDocPasswordVerifier& rVerifier, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData, + const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, const OUString& rMediaPassword, const Reference< XInteractionHandler >& rxInteractHandler, const OUString& rDocumentName, @@ -360,7 +360,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( const ::std::vector< OUString >* pDefaultPasswords, bool* pbIsDefaultPassword ) { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aEncData; + css::uno::Sequence< css::beans::NamedValue > aEncData; DocPasswordVerifierResult eResult = DocPasswordVerifierResult_WRONG_PASSWORD; // first, try provided default passwords diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index 9a75a6fbf85b..9a2d6e819334 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -153,12 +153,12 @@ namespace comphelper { } catch ( const Exception& ) { - ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); + css::uno::Any caught( ::cppu::getCaughtException() ); OString sMessage( "caught an exception!" ); sMessage += "\ntype : "; sMessage += OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); sMessage += "\nmessage: "; - ::com::sun::star::uno::Exception exception; + css::uno::Exception exception; caught >>= exception; sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); sMessage += "\nin function:\n"; diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 13af7b53635f..7b061872d77b 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -32,22 +32,22 @@ namespace comphelper { -class OSimpleLogRing : public ::cppu::WeakImplHelper< ::com::sun::star::logging::XSimpleLogRing, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo > +class OSimpleLogRing : public ::cppu::WeakImplHelper< css::logging::XSimpleLogRing, + css::lang::XInitialization, + css::lang::XServiceInfo > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Sequence< OUString > m_aMessages; + css::uno::Sequence< OUString > m_aMessages; - bool m_bInitialized; - bool m_bFull; + bool m_bInitialized; + bool m_bFull; sal_Int32 m_nPos; public: OSimpleLogRing(); virtual ~OSimpleLogRing(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static OUString SAL_CALL getImplementationName_static(); @@ -56,20 +56,20 @@ public: static OUString SAL_CALL getServiceName_static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XSimpleLogRing - virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL logString( const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index a22575688d1b..da980d66d356 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.cxx @@ -21,13 +21,13 @@ namespace comphelper { - OEventListenerHelper::OEventListenerHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& + OEventListenerHelper::OEventListenerHelper(const css::uno::Reference< css::lang::XEventListener>& _rxListener) : m_xListener(_rxListener) { } - void SAL_CALL OEventListenerHelper::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> xRef = m_xListener; + css::uno::Reference< css::lang::XEventListener> xRef = m_xListener; if(xRef.is()) xRef->disposing(Source); } diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index abc9b348f249..65e48916c985 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -38,14 +38,14 @@ class OLockListener; // the service is implemented as a wrapper to be able to die by refcount // the disposing mechanics is required for java related scenarios -class OInstanceLocker : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo > +class OInstanceLocker : public ::cppu::WeakImplHelper< css::lang::XComponent, + css::lang::XInitialization, + css::lang::XServiceInfo > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xLockListener; + css::uno::Reference< css::uno::XInterface > m_xLockListener; OLockListener* m_pLockListener; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners @@ -54,42 +54,41 @@ class OInstanceLocker : public ::cppu::WeakImplHelper< ::com::sun::star::lang::X bool m_bInitialized; public: - explicit OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + explicit OInstanceLocker( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~OInstanceLocker(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class OLockListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener, - ::com::sun::star::frame::XTerminateListener > +class OLockListener : public ::cppu::WeakImplHelper< css::util::XCloseListener, + css::frame::XTerminateListener > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xInstance; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval > m_xApproval; + css::uno::Reference< css::uno::XInterface > m_xInstance; + css::uno::Reference< css::embed::XActionsApproval > m_xApproval; - ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent > m_xWrapper; + css::uno::WeakReference< css::lang::XComponent > m_xWrapper; bool m_bDisposed; bool m_bInitialized; @@ -97,10 +96,10 @@ class OLockListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCl sal_Int32 m_nMode; public: - OLockListener( const ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent >& xWrapper, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInstance, + OLockListener( const css::uno::WeakReference< css::lang::XComponent >& xWrapper, + const css::uno::Reference< css::uno::XInterface >& xInstance, sal_Int32 nMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval >& rApproval ); + const css::uno::Reference< css::embed::XActionsApproval >& rApproval ); virtual ~OLockListener(); @@ -108,15 +107,15 @@ public: void Dispose(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloseListener - virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 801b5225a541..9f6eb735133e 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -212,7 +212,7 @@ namespace comphelper try { Reference< XResourceBundleLoader > xLoader( - com::sun::star::resource::OfficeResourceLoader::get( + css::resource::OfficeResourceLoader::get( _rContext ) ); _rLoggerData.xBundle = Reference< XResourceBundle >( xLoader->loadBundle_Default( _rLoggerData.sBundleBaseName ), UNO_QUERY_THROW ); } diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index ee4ac571b2aa..cd6c7d6118fb 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -106,7 +106,7 @@ namespace comphelper } - bool NamedValueCollection::canExtractFrom( ::com::sun::star::uno::Any const & i_value ) + bool NamedValueCollection::canExtractFrom( css::uno::Any const & i_value ) { Type const & aValueType = i_value.getValueType(); if ( aValueType.equals( ::cppu::UnoType< PropertyValue >::get() ) diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 0554d1c652d0..151bb4020dea 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -31,18 +31,18 @@ namespace comphelper { -class OOfficeRestartManager : public ::cppu::WeakImplHelper< ::com::sun::star::task::XRestartManager - , ::com::sun::star::awt::XCallback - , ::com::sun::star::lang::XServiceInfo > +class OOfficeRestartManager : public ::cppu::WeakImplHelper< css::task::XRestartManager + , css::awt::XCallback + , css::lang::XServiceInfo > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; bool m_bOfficeInitialized; bool m_bRestartRequested; public: - explicit OOfficeRestartManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) + explicit OOfficeRestartManager( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) , m_bOfficeInitialized( false ) , m_bRestartRequested( false ) @@ -51,7 +51,7 @@ public: virtual ~OOfficeRestartManager() {} - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static OUString SAL_CALL getImplementationName_static(); @@ -60,20 +60,20 @@ public: static OUString SAL_CALL getServiceName_static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XRestartManager - virtual void SAL_CALL requestRestart( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInteractionHandler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCallback - virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notify( const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 14064ecf33ad..89f3924498df 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -33,7 +33,7 @@ ScopeGuard::~ScopeGuard() try { m_func(); } - catch (com::sun::star::uno::Exception & exc) { + catch (css::uno::Exception & exc) { (void) exc; // avoid warning about unused variable OSL_FAIL( OUStringToOString( "UNO exception occurred: " + diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 5b040045e28e..ad85110907e9 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -27,21 +27,21 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return OUString(); } /** the base implementation has no supported services */ -::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Sequence< OUString> aSeq(0); + css::uno::Sequence< OUString> aSeq(0); return aSeq; } /** this method adds a variable number of char pointer to a given Sequence */ -void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() +void ServiceInfoHelper::addToSequence( css::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() { sal_uInt32 nCount = rSeq.getLength(); diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index 2dbe73cbf4e8..d1d9c2c94ea3 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -77,7 +77,7 @@ void StillReadWriteInteraction::resetErrorStates() ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction::intercepted(const ::ucbhelper::InterceptedInteraction::InterceptedRequest& aRequest, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) + const css::uno::Reference< css::task::XInteractionRequest >& xRequest) { // we are used! m_bUsed = true; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 68e4f3a22369..b2fe5d92903f 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -119,7 +119,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( uno::Reference< lang::XSingleServiceFactory > xFact; try { ::ucbhelper::Content aCntnt( aURL, - uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > (), + uno::Reference< css::ucb::XCommandEnvironment > (), getProcessComponentContext() ); if (aCntnt.isDocument()) { xFact = GetStorageFactory( rxContext ); diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 8cc740747c33..75f07c6a8108 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -32,8 +32,8 @@ namespace comphelper { typedef cppu::WeakImplHelper< - com::sun::star::util::XOfficeInstallationDirectories, - com::sun::star::lang::XServiceInfo > UnoImplBase; + css::util::XOfficeInstallationDirectories, + css::lang::XServiceInfo > UnoImplBase; struct mutex_holder { @@ -44,52 +44,50 @@ class OfficeInstallationDirectories : public mutex_holder, public UnoImplBase { public: explicit OfficeInstallationDirectories( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & xCtx ); + const css::uno::Reference< css::uno::XComponentContext > & xCtx ); virtual ~OfficeInstallationDirectories(); // XOfficeInstallationDirectories virtual OUString SAL_CALL getOfficeInstallationDirectoryURL() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getOfficeUserDataDirectoryURL() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL makeRelocatableURL( const OUString& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL makeAbsoluteURL( const OUString& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static OUString SAL_CALL getSingletonName_static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create( const css::uno::Reference< css::uno::XComponentContext >& ); private: void initDirs(); OUString m_aOfficeBrandDirMacro; OUString m_aUserDirMacro; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xCtx; + css::uno::Reference< css::uno::XComponentContext > m_xCtx; OUString * m_pOfficeBrandDir; OUString * m_pUserDir; }; diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index af36f0ce2170..87958ba313ed 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -266,7 +266,7 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rProperty } void ChainablePropertySet::_preGetPropertyState () - 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 ) { OSL_FAIL( "you have to implement this yourself!"); } @@ -278,7 +278,7 @@ void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, P } void ChainablePropertySet::_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 ) { OSL_FAIL( "you have to implement this yourself!"); } diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 4f7868dfa3cb..2c889325079e 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -56,7 +56,7 @@ void ChainablePropertySetInfo::remove( const OUString& aName ) } Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -78,7 +78,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() } Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -95,7 +95,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r } sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 87e4ba42c82f..358e6918fca6 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -450,7 +450,7 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyNam } void MasterPropertySet::_preGetPropertyState () - 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 ) { OSL_FAIL( "you have to implement this yourself!"); } @@ -462,7 +462,7 @@ void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, Prop } void MasterPropertySet::_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 ) { OSL_FAIL( "you have to implement this yourself!"); } diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 43f0dccdb628..ef7fbd42f483 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -71,7 +71,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -93,7 +93,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() } Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -111,7 +111,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam } sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index cf7af4ecfbbe..4d9f7a68cff1 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -83,8 +83,8 @@ namespace comphelper virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE; }; } @@ -263,7 +263,7 @@ Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) return aSNS; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > comphelper::GenericPropertySet_CreateInstance( comphelper::PropertySetInfo* pInfo ) +css::uno::Reference< css::beans::XPropertySet > comphelper::GenericPropertySet_CreateInstance( comphelper::PropertySetInfo* pInfo ) { return static_cast(new GenericPropertySet( pInfo )); } diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 2130b2d6fdb6..9f34d682ffc4 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -44,9 +44,9 @@ namespace comphelper { - struct UnoTypeLess : public ::std::unary_function< ::com::sun::star::uno::Type, bool > + struct UnoTypeLess : public ::std::unary_function< css::uno::Type, bool > { - inline bool operator()( const ::com::sun::star::uno::Type& _rLHS, const ::com::sun::star::uno::Type& _rRHS ) const + inline bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { return rtl_ustr_compare( _rLHS.getTypeLibType()->pTypeName->buffer, @@ -55,14 +55,14 @@ namespace comphelper } }; - typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > MapInt2Any; - typedef ::std::set< ::com::sun::star::uno::Type, UnoTypeLess > TypeBag; + typedef ::std::map< sal_Int32, css::uno::Any > MapInt2Any; + typedef ::std::set< css::uno::Type, UnoTypeLess > TypeBag; - typedef ::cppu::WeakAggImplHelper5 < ::com::sun::star::beans::XPropertyBag - , ::com::sun::star::util::XModifiable - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::container::XSet + typedef ::cppu::WeakAggImplHelper5 < css::beans::XPropertyBag + , css::util::XModifiable + , css::lang::XServiceInfo + , css::lang::XInitialization + , css::container::XSet > OPropertyBag_Base; typedef ::comphelper::OPropertyStateHelper OPropertyBag_PBase; @@ -90,10 +90,10 @@ namespace comphelper public: // XServiceInfo - static versions - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: OPropertyBag(); @@ -103,76 +103,76 @@ namespace comphelper /** === begin UNO interface implementations == **/ // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifiable: virtual sal_Bool SAL_CALL isModified( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::beans::PropertyVetoException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< + css::util::XModifyListener > & xListener) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Reference< + css::util::XModifyListener > & xListener) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) 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) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) 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) SAL_OVERRIDE + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet - virtual sal_Bool SAL_CALL has( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess (base of XSet) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (base of XEnumerationAccess) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO interface implementations // XPropertyState - virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const SAL_OVERRIDE; // OPropertyStateHelper - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ) SAL_OVERRIDE; + virtual css::beans::PropertyState getPropertyStateByHandle( sal_Int32 _nHandle ) SAL_OVERRIDE; // OPropertySetHelper - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // IEventNotificationHook @@ -199,24 +199,24 @@ namespace comphelper @throws PropertyVetoException if the XMultiPropertySet::setPropertyValues call does so - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if the XMultiPropertySet::setPropertyValues call does so - @throws ::com::sun::star::lang::WrappedTargetException + @throws css::lang::WrappedTargetException if the XMultiPropertySet::setPropertyValues call does so - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if the XMultiPropertySet::setPropertyValues call does so - @throws ::com::sun::star::beans::UnknownPropertyException + @throws css::beans::UnknownPropertyException if the XMultiPropertySet::setPropertyValues call does so, and _bTolerateUnknownProperties was set to - @throws ::com::sun::star::lang::WrappedTargetException + @throws css::lang::WrappedTargetException if the XMultiPropertySet::setPropertyValues call did throw an exception not listed above */ - void impl_setPropertyValues_throw( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rProps ); + void impl_setPropertyValues_throw( const css::uno::Sequence< css::beans::PropertyValue >& _rProps ); protected: using ::cppu::OPropertySetHelper::getPropertyValues; diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 04342edc94bf..931d56101bdd 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -201,7 +201,7 @@ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( bool bRet = i != m_aPropertyAccessors.end(); if (bRet) { - const ::com::sun::star::beans::Property& rProperty = m_aProperties.getConstArray()[(*i).second.nPos]; + const css::beans::Property& rProperty = m_aProperties.getConstArray()[(*i).second.nPos]; if (_pPropName) *_pPropName = rProperty.Name; if (_pAttributes) @@ -235,7 +235,7 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( if (_pPropName) { OSL_ENSURE((*i).second.nPos < m_aProperties.getLength(),"Invalid index for sequence!"); - const ::com::sun::star::beans::Property& rProperty = m_aProperties.getConstArray()[(*i).second.nPos]; + const css::beans::Property& rProperty = m_aProperties.getConstArray()[(*i).second.nPos]; *_pPropName = rProperty.Name; } } @@ -244,7 +244,7 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> OPropertyArrayAggregationHelper::getProperties() +css::uno::Sequence< css::beans::Property> OPropertyArrayAggregationHelper::getProperties() { return m_aProperties; } @@ -252,7 +252,7 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( sal_Int32 OPropertyArrayAggregationHelper::fillHandles( - sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ) + sal_Int32* _pHandles, const css::uno::Sequence< OUString >& _rPropNames ) { sal_Int32 nHitCount = 0; const OUString* pReqProps = _rPropNames.getConstArray(); @@ -275,8 +275,8 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( } #endif - const ::com::sun::star::beans::Property* pCur = m_aProperties.getConstArray(); - const ::com::sun::star::beans::Property* pEnd = m_aProperties.getConstArray() + m_aProperties.getLength(); + const css::beans::Property* pCur = m_aProperties.getConstArray(); + const css::beans::Property* pEnd = m_aProperties.getConstArray() + m_aProperties.getLength(); for( sal_Int32 i = 0; i < nReqLen; ++i ) { @@ -309,8 +309,8 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( { // binary search is better sal_Int32 nCompVal = 1; - const ::com::sun::star::beans::Property* pOldEnd = pEnd--; - const ::com::sun::star::beans::Property* pMid = pCur; + const css::beans::Property* pOldEnd = pEnd--; + const css::beans::Property* pMid = pCur; while( nCompVal != 0 && pCur <= pEnd ) { @@ -443,15 +443,15 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper() } - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); + css::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); if ( !aReturn.hasValue() ) aReturn = cppu::queryInterface(_rType - ,static_cast< ::com::sun::star::beans::XPropertiesChangeListener*>(this) - ,static_cast< ::com::sun::star::beans::XVetoableChangeListener*>(this) - ,static_cast< ::com::sun::star::lang::XEventListener*>(static_cast< ::com::sun::star::beans::XPropertiesChangeListener*>(this)) + ,static_cast< css::beans::XPropertiesChangeListener*>(this) + ,static_cast< css::beans::XVetoableChangeListener*>(this) + ,static_cast< css::lang::XEventListener*>(static_cast< css::beans::XPropertiesChangeListener*>(this)) ); return aReturn; @@ -474,7 +474,7 @@ void OPropertySetAggregationHelper::disposing() } -void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) throw ( css::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) @@ -482,7 +482,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star:: } -void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) throw( css::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !"); @@ -491,7 +491,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: if (1 == nLen) { - const ::com::sun::star::beans::PropertyChangeEvent& evt = _rEvents.getConstArray()[0]; + const css::beans::PropertyChangeEvent& evt = _rEvents.getConstArray()[0]; OSL_ENSURE(!evt.PropertyName.isEmpty(), "OPropertySetAggregationHelper::propertiesChange : invalid event !"); // we had a bug where this assertion would have us saved a whole day :) (72514) sal_Int32 nHandle = rPH.getHandleByName( evt.PropertyName ); @@ -507,10 +507,10 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: else { std::unique_ptr pHandles(new sal_Int32[nLen]); - std::unique_ptr< ::com::sun::star::uno::Any[]> pNewValues(new ::com::sun::star::uno::Any[nLen]); - std::unique_ptr< ::com::sun::star::uno::Any[]> pOldValues(new ::com::sun::star::uno::Any[nLen]); + std::unique_ptr< css::uno::Any[]> pNewValues(new css::uno::Any[nLen]); + std::unique_ptr< css::uno::Any[]> pOldValues(new css::uno::Any[nLen]); - const ::com::sun::star::beans::PropertyChangeEvent* pEvents = _rEvents.getConstArray(); + const css::beans::PropertyChangeEvent* pEvents = _rEvents.getConstArray(); sal_Int32 nDest = 0; for (sal_Int32 nSource=0; nSource& _rxDelegate) - throw( ::com::sun::star::lang::IllegalArgumentException ) +void OPropertySetAggregationHelper::setAggregation(const css::uno::Reference< css::uno::XInterface >& _rxDelegate) + throw( css::lang::IllegalArgumentException ) { osl::MutexGuard aGuard(rBHelper.rMutex); @@ -560,7 +560,7 @@ void OPropertySetAggregationHelper::setAggregation(const ::com::sun::star::uno: // must support XPropertySet and XMultiPropertySet if ( m_xAggregateSet.is() && !m_xAggregateMultiSet.is() ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } @@ -571,7 +571,7 @@ void OPropertySetAggregationHelper::startListening() if (!m_bListening && m_xAggregateSet.is()) { // register as a single listener - ::com::sun::star::uno::Sequence< OUString > aPropertyNames; + css::uno::Sequence< OUString > aPropertyNames; m_xAggregateMultiSet->addPropertiesChangeListener(aPropertyNames, this); m_xAggregateSet->addVetoableChangeListener(OUString(), this); @@ -581,8 +581,8 @@ void OPropertySetAggregationHelper::startListening() void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::beans::XVetoableChangeListener>& _rxListener) + throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -591,8 +591,8 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::beans::XPropertyChangeListener>& _rxListener) + throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -600,9 +600,9 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS } -void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener) - throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const css::uno::Sequence< OUString >& _rPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener>& _rxListener) + throw( css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener); if (!m_bListening) @@ -628,10 +628,10 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co } -void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const css::uno::Any& _rValue) + throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -648,7 +648,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa } -void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const +void OPropertySetAggregationHelper::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const { OPropertyArrayAggregationHelper& rPH = static_cast( const_cast(this)->getInfoHelper() ); OUString aPropName; @@ -670,15 +670,15 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: } - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; sal_Int32 nOriginalHandle = -1; - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -759,7 +759,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // mixed else { - const ::com::sun::star::uno::Any* pValues = _rValues.getConstArray(); + const css::uno::Any* pValues = _rValues.getConstArray(); try { @@ -806,8 +806,8 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( sal_Int32 nHitCount = rPH2.fillHandles( pHandles.get(), DelPropertyNames ); if (nHitCount != 0) { - std::unique_ptr< ::com::sun::star::uno::Any[]> pConvertedValues(new ::com::sun::star::uno::Any[ nHitCount ]); - std::unique_ptr< ::com::sun::star::uno::Any[]> pOldValues(new ::com::sun::star::uno::Any[ nHitCount ]); + std::unique_ptr< css::uno::Any[]> pConvertedValues(new css::uno::Any[ nHitCount ]); + std::unique_ptr< css::uno::Any[]> pOldValues(new css::uno::Any[ nHitCount ]); nHitCount = 0; sal_Int32 i; @@ -820,8 +820,8 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( { sal_Int16 nAttributes; rPH2.fillPropertyMembersByHandle( NULL, &nAttributes, pHandles[i] ); - if( nAttributes & ::com::sun::star::beans::PropertyAttribute::READONLY ) - throw ::com::sun::star::beans::PropertyVetoException(); + if( nAttributes & css::beans::PropertyAttribute::READONLY ) + throw css::beans::PropertyVetoException(); // Will the property change? if( convertFastPropertyValue( pConvertedValues[ nHitCount ], pOldValues[nHitCount], pHandles[i], pDelValues[i] ) ) @@ -860,7 +860,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( m_xAggregateMultiSet->setPropertyValues(AggPropertyNames, AggValues); } - catch(::com::sun::star::uno::Exception&) + catch(css::uno::Exception&) { throw; } @@ -870,15 +870,15 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) + throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName ); if (nHandle == -1) { - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); } OUString aPropName; @@ -888,7 +888,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( if (m_xAggregateState.is()) return m_xAggregateState->getPropertyState(_rPropertyName); else - return ::com::sun::star::beans::PropertyState_DIRECT_VALUE; + return css::beans::PropertyState_DIRECT_VALUE; } else return getPropertyStateByHandle(nHandle); @@ -896,13 +896,13 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName); if (nHandle == -1) { - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); } OUString aPropName; @@ -928,14 +928,14 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString } - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) + throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); if ( nHandle == -1 ) - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); OUString aPropName; sal_Int32 nOriginalHandle = -1; @@ -944,7 +944,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString if (m_xAggregateState.is()) return m_xAggregateState->getPropertyDefault(aPropertyName); else - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } else return getPropertyDefaultByHandle(nHandle); diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index bfd8e58c2c85..4791b3cb73d7 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -158,17 +158,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw() mpMap->remove( aName ); } -Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) +Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(css::uno::RuntimeException, std::exception) { return mpMap->getProperties(); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { return mpMap->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception) { return mpMap->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 8f6b90759cd6..cbb541105428 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -42,12 +42,12 @@ namespace comphelper - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); + css::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces if ( !aReturn.hasValue() ) - aReturn = ::cppu::queryInterface(_rType, static_cast< ::com::sun::star::beans::XPropertyState*>(this)); + aReturn = ::cppu::queryInterface(_rType, static_cast< css::beans::XPropertyState*>(this)); return aReturn; } @@ -71,60 +71,60 @@ namespace comphelper OPropertyStateHelper::~OPropertyStateHelper() {} - void OPropertyStateHelper::firePropertyChange(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aNewValue, const ::com::sun::star::uno::Any& aOldValue) + void OPropertyStateHelper::firePropertyChange(sal_Int32 nHandle, const css::uno::Any& aNewValue, const css::uno::Any& aOldValue) { fire(&nHandle, &aNewValue, &aOldValue, 1, sal_False); } // XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); if (nHandle == -1) - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); return getPropertyStateByHandle(nHandle); } - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); if (nHandle == -1) - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); setPropertyToDefaultByHandle(nHandle); } - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); if (nHandle == -1) - throw ::com::sun::star::beans::UnknownPropertyException(); + throw css::beans::UnknownPropertyException(); return getPropertyDefaultByHandle(nHandle); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const css::uno::Sequence< OUString >& _rPropertyNames) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { sal_Int32 nLen = _rPropertyNames.getLength(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen); - ::com::sun::star::beans::PropertyState* pValues = aRet.getArray(); + css::uno::Sequence< css::beans::PropertyState> aRet(nLen); + css::beans::PropertyState* pValues = aRet.getArray(); const OUString* pNames = _rPropertyNames.getConstArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aProps = rHelper.getProperties(); - const ::com::sun::star::beans::Property* pProps = aProps.getConstArray(); + css::uno::Sequence< css::beans::Property> aProps = rHelper.getProperties(); + const css::beans::Property* pProps = aProps.getConstArray(); sal_Int32 nPropCount = aProps.getLength(); osl::MutexGuard aGuard(rBHelper.rMutex); @@ -144,7 +144,7 @@ namespace comphelper } - ::com::sun::star::beans::PropertyState OPropertyStateHelper::getPropertyStateByHandle( sal_Int32 _nHandle ) + css::beans::PropertyState OPropertyStateHelper::getPropertyStateByHandle( sal_Int32 _nHandle ) { // simply compare the current and the default value Any aCurrentValue = getPropertyDefaultByHandle( _nHandle ); @@ -166,9 +166,9 @@ namespace comphelper } - ::com::sun::star::uno::Any OPropertyStateHelper::getPropertyDefaultByHandle( sal_Int32 ) const + css::uno::Any OPropertyStateHelper::getPropertyDefaultByHandle( sal_Int32 ) const { - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index d4a4ebf8d502..c5439a5e2528 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -70,12 +70,12 @@ public: virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static Reference< XInterface > SAL_CALL Create( const Reference< ::com::sun::star::uno::XComponentContext >& ); + static Reference< XInterface > SAL_CALL Create( const Reference< css::uno::XComponentContext >& ); private: std::vector< sal_Int8 > maData; diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 233cc8dc6524..5a664842c9ed 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -50,7 +50,7 @@ class SequenceInputStreamService: public: explicit SequenceInputStreamService(); - // ::com::sun::star::lang::XServiceInfo: + // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -60,20 +60,20 @@ public: static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); - // ::com::sun::star::io::XInputStream: + // css::io::XInputStream: virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::io::XSeekable: + // css::io::XSeekable: virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) SAL_OVERRIDE; virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) SAL_OVERRIDE; virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) SAL_OVERRIDE; + // css::lang::XInitialization: + virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) SAL_OVERRIDE; private: virtual ~SequenceInputStreamService() {} @@ -123,7 +123,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceInputStreamService::Create( return static_cast< ::cppu::OWeakObject * >( new SequenceInputStreamService() ); } -// ::com::sun::star::io::XInputStream: +// css::io::XInputStream: ::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,7 +171,7 @@ void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeExcep m_xSeekable = uno::Reference< io::XSeekable >(); } -// ::com::sun::star::io::XSeekable: +// css::io::XSeekable: void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -199,8 +199,8 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u return m_xSeekable->getLength(); } -// ::com::sun::star::lang::XInitialization: -void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) +// css::lang::XInitialization: +void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 6d604dc9b03f..4f7919203257 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -45,7 +45,7 @@ class SequenceOutputStreamService: public: explicit SequenceOutputStreamService(); - // ::com::sun::star::lang::XServiceInfo: + // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -55,12 +55,12 @@ public: static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); - // ::com::sun::star::io::XOutputStream: + // css::io::XOutputStream: virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::io::XSequenceOutputStream: + // css::io::XSequenceOutputStream: virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceOutputStreamService::Create( return static_cast< ::cppu::OWeakObject * >( new SequenceOutputStreamService()); } -// ::com::sun::star::io::XOutputStream: +// css::io::XOutputStream: void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -140,7 +140,7 @@ void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeExc m_xOutputStream = uno::Reference< io::XOutputStream >(); } -// ::com::sun::star::io::XSequenceOutputStream: +// css::io::XSequenceOutputStream: uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index 6e8f93b91f75..d2fc2df6087c 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -52,7 +52,7 @@ inline sal_Int32 SequenceInputStream::avail() return m_aData.getLength() - m_nPos; } -// com::sun::star::io::XInputStream +// css::io::XInputStream sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence& aData, sal_Int32 nBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx index ea3955b0264b..4ff71da0dfa5 100644 --- a/comphelper/source/streaming/streamsection.cxx +++ b/comphelper/source/streaming/streamsection.cxx @@ -25,7 +25,7 @@ namespace comphelper OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataInputStream >& _rxInput) - :m_xMarkStream(_rxInput, ::com::sun::star::uno::UNO_QUERY) + :m_xMarkStream(_rxInput, css::uno::UNO_QUERY) ,m_xInStream(_rxInput) ,m_nBlockStart(-1) ,m_nBlockLen(-1) @@ -40,7 +40,7 @@ OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataInputStr OStreamSection::OStreamSection(const css::uno::Reference< css::io::XDataOutputStream >& _rxOutput, sal_Int32 _nPresumedLength) - :m_xMarkStream(_rxOutput, ::com::sun::star::uno::UNO_QUERY) + :m_xMarkStream(_rxOutput, css::uno::UNO_QUERY) ,m_xOutStream(_rxOutput) ,m_nBlockStart(-1) ,m_nBlockLen(-1) diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 49b8864522fa..3342ef288ab1 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -53,17 +53,17 @@ struct AttributeList_Impl ::std::vector vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL AttributeList::getLength() throw( css::uno::RuntimeException, std::exception ) { return (sal_Int16)(m_pImpl->vecAttribute.size()); } -OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size()) ) ? m_pImpl->vecAttribute[i].sName : OUString(); } -OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) { if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) { return m_pImpl->vecAttribute[i].sType; @@ -71,12 +71,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun:: return OUString(); } -OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) ? m_pImpl->vecAttribute[i].sValue : OUString(); } -OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); @@ -88,7 +88,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( : return OUString(); } -OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception ) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); -- cgit