From 32093237b3f41eca976a5018a7c8ef56e3f5fb3a Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 20 Aug 2014 21:32:19 +0200 Subject: comphelper: starlang -> css::lang Change-Id: Ie8adb5b81df51fd973cbb786f27ea3ef1462679c --- comphelper/source/container/enumhelper.cxx | 18 +++++++++--------- comphelper/source/misc/numbers.cxx | 3 +-- comphelper/source/property/property.cxx | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 83f53623337c..6deb6c1ab9b6 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -74,7 +74,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) + throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -95,7 +95,7 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) } -void SAL_CALL OEnumerationByName::disposing(const starlang::EventObject& aEvent) +void SAL_CALL OEnumerationByName::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -113,7 +113,7 @@ void OEnumerationByName::impl_startDisposeListening() return; ++m_refCount; - css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); if (xDisposable.is()) { xDisposable->addEventListener(this); @@ -131,7 +131,7 @@ void OEnumerationByName::impl_stopDisposeListening() return; ++m_refCount; - css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); if (xDisposable.is()) { xDisposable->removeEventListener(this); @@ -177,7 +177,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) + throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -198,7 +198,7 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) } -void SAL_CALL OEnumerationByIndex::disposing(const starlang::EventObject& aEvent) +void SAL_CALL OEnumerationByIndex::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -216,7 +216,7 @@ void OEnumerationByIndex::impl_startDisposeListening() return; ++m_refCount; - css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); if (xDisposable.is()) { xDisposable->addEventListener(this); @@ -234,7 +234,7 @@ void OEnumerationByIndex::impl_stopDisposeListening() return; ++m_refCount; - css::uno::Reference< starlang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent > xDisposable(m_xAccess, css::uno::UNO_QUERY); if (xDisposable.is()) { xDisposable->removeEventListener(this); @@ -269,7 +269,7 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeEx css::uno::Any SAL_CALL OAnyEnumeration::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) + throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ! hasMoreElements()) throw starcontainer::NoSuchElementException(); diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index 9610873cb0ae..4a2ccbe3af60 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -30,7 +30,6 @@ namespace comphelper namespace starbeans = ::com::sun::star::beans; -namespace starlang = ::com::sun::star::lang; sal_Int16 getNumberFormatType(const css::uno::Reference& xFormats, sal_Int32 nKey) @@ -89,7 +88,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference& xFormatter, sal_Int16 nType, - const starlang::Locale& _rLocale) + const css::lang::Locale& _rLocale) { css::uno::Reference xSupplier( xFormatter.is() ? xFormatter->getNumberFormatsSupplier() : css::uno::Reference(NULL)); css::uno::Reference xFormats( xSupplier.is() ? xSupplier->getNumberFormats() : css::uno::Reference(NULL)); diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index b898c9b3286f..f22561c96373 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -195,7 +195,7 @@ bool tryPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rValue reinterpret_cast< uno_ReleaseFunc >(cpp_release) ) ) - throw starlang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } else _rConvertedValue = _rValueToSet; -- cgit