comphelper: starlang -> css::lang

Change-Id: Ie8adb5b81df51fd973cbb786f27ea3ef1462679c

6 files changed, 22 insertions, 26 deletions

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<starutil::XNumberFormats>& xFormats, sal_Int32 nKey)
@@ -89,7 +88,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<starutil::XNumbe
 sal_Int32 getStandardFormat(
         const css::uno::Reference<starutil::XNumberFormatter>& xFormatter,
         sal_Int16 nType,
-        const starlang::Locale& _rLocale)
+        const css::lang::Locale& _rLocale)
 {
     css::uno::Reference<starutil::XNumberFormatsSupplier> xSupplier( xFormatter.is() ? xFormatter->getNumberFormatsSupplier() : css::uno::Reference<starutil::XNumberFormatsSupplier>(NULL));
     css::uno::Reference<starutil::XNumberFormats> xFormats( xSupplier.is() ? xSupplier->getNumberFormats() : css::uno::Reference<starutil::XNumberFormats>(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;
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index ce3de4f8e32a..e46fb945ec57 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -36,7 +36,6 @@ namespace comphelper
 
 
     namespace starcontainer     = ::com::sun::star::container;
-    namespace starlang          = ::com::sun::star::lang;
 
 
 //= OEnumerationLock
@@ -55,7 +54,7 @@ struct OEnumerationLock
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
                          , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
-                                                           starlang::XEventListener    >
+                                                           css::lang::XEventListener    >
 {
     css::uno::Sequence< OUString >                m_aNames;
     sal_Int32                                           m_nPos;
@@ -70,9 +69,9 @@ public:
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     COMPHELPER_DLLPRIVATE void impl_startDisposeListening();
@@ -87,7 +86,7 @@ private:
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
                           , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
-                                                            starlang::XEventListener    >
+                                                            css::lang::XEventListener    >
 {
     sal_Int32                                         m_nPos;
     css::uno::Reference< starcontainer::XIndexAccess > m_xAccess;
@@ -99,9 +98,9 @@ public:
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL disposing(const starlang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     COMPHELPER_DLLPRIVATE void impl_startDisposeListening();
@@ -127,7 +126,7 @@ public:
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 };
 
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index a52b8b8c8c25..e59820b5e481 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -30,7 +30,6 @@ namespace comphelper
 {
 
 
-    namespace starlang  = ::com::sun::star::lang;
     namespace starutil  = ::com::sun::star::util;
 
     /// returns the ::com::sun::star::util::NumberFormat of the given key under the given formats
@@ -47,7 +46,7 @@ namespace comphelper
     sal_Int32 getStandardFormat(
             const css::uno::Reference<starutil::XNumberFormatter>& xFormatter,
             sal_Int16 nType,
-            const starlang::Locale& _rLocale);
+            const css::lang::Locale& _rLocale);
 
     /** retrieves a the value of a given property for a given format key, relating to a given formatter
     */
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index d606f1b28099..25e9a48ff731 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace awt {
 namespace comphelper
 {
     namespace starawt       = ::com::sun::star::awt;
-    namespace starlang      = ::com::sun::star::lang;
 
     typedef css::uno::Reference< css::uno::XInterface >           InterfaceRef;
     typedef css::uno::Sequence< OUString >                StringSequence;
@@ -105,7 +104,7 @@ namespace comphelper
     template <class TYPE>
     void disposeComponent(css::uno::Reference<TYPE>& _rxComp)
     {
-        css::uno::Reference<starlang::XComponent> xComp(_rxComp, css::uno::UNO_QUERY);
+        css::uno::Reference<css::lang::XComponent> xComp(_rxComp, css::uno::UNO_QUERY);
         if (xComp.is())
         {
             xComp->dispose();
@@ -117,7 +116,7 @@ namespace comphelper
     bool getImplementation(TYPE*& _pObject, const css::uno::Reference< css::uno::XInterface >& _rxIFace)
     {
         _pObject = NULL;
-        css::uno::Reference< starlang::XUnoTunnel > xTunnel(_rxIFace, css::uno::UNO_QUERY);
+        css::uno::Reference< css::lang::XUnoTunnel > xTunnel(_rxIFace, css::uno::UNO_QUERY);
         if (xTunnel.is())
             _pObject = reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelImplementationId()));
 
@@ -152,7 +151,7 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC OUString    getString(const css::uno::Any& _rAny);
     COMPHELPER_DLLPUBLIC bool       getBOOL(const css::uno::Any& _rAny);
 
-    COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const css::uno::Any& _rAny) throw(starlang::IllegalArgumentException);
+    COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const css::uno::Any& _rAny) throw(css::lang::IllegalArgumentException);
 
 //= replacement of some former UsrAny.setXXX methods - can be used with rvalues
     inline void setBOOL(css::uno::Any& _rAny, bool _b)