starcontainer -> css::container

Change-Id: Ie6e75483aa4262a5f66a4c557015af8b3c02d592

2 files changed, 20 insertions, 24 deletions

diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 6deb6c1ab9b6..46f9a137a5b6 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -29,7 +29,7 @@ namespace comphelper
 //= OEnumerationByName
 
 
-OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess)
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<css::container::XNameAccess>& _rxAccess)
     :m_aNames(_rxAccess->getElementNames())
     ,m_nPos(0)
     ,m_xAccess(_rxAccess)
@@ -39,7 +39,7 @@ OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::
 }
 
 
-OEnumerationByName::OEnumerationByName(const css::uno::Reference<starcontainer::XNameAccess>& _rxAccess,
+OEnumerationByName::OEnumerationByName(const css::uno::Reference<css::container::XNameAccess>& _rxAccess,
                                        const css::uno::Sequence< OUString >&           _aNames  )
     :m_aNames(_aNames)
     ,m_nPos(0)
@@ -74,7 +74,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(css::uno::Runtim
 
 
 css::uno::Any SAL_CALL OEnumerationByName::nextElement(  )
-        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -89,7 +89,7 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement(  )
     }
 
     if (!aRes.hasValue())       //There are no more elements
-        throw starcontainer::NoSuchElementException();
+        throw css::container::NoSuchElementException();
 
     return aRes;
 }
@@ -144,7 +144,7 @@ void OEnumerationByName::impl_stopDisposeListening()
 //= OEnumerationByIndex
 
 
-OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< starcontainer::XIndexAccess >& _rxAccess)
+OEnumerationByIndex::OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess)
     :m_nPos(0)
     ,m_xAccess(_rxAccess)
     ,m_bListening(false)
@@ -177,7 +177,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(css::uno::Runti
 
 
 css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
-        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -193,7 +193,7 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
     }
 
     if (!aRes.hasValue())
-        throw starcontainer::NoSuchElementException();
+        throw css::container::NoSuchElementException();
     return aRes;
 }
 
@@ -269,10 +269,10 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(css::uno::RuntimeEx
 
 
 css::uno::Any SAL_CALL OAnyEnumeration::nextElement(  )
-        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if ( ! hasMoreElements())
-        throw starcontainer::NoSuchElementException();
+        throw css::container::NoSuchElementException();
 
     ::osl::ResettableMutexGuard aLock(m_aLock);
     sal_Int32 nPos = m_nPos;
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index e46fb945ec57..3983a29271ed 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -34,10 +34,6 @@
 namespace comphelper
 {
 
-
-    namespace starcontainer     = ::com::sun::star::container;
-
-
 //= OEnumerationLock
 
 struct OEnumerationLock
@@ -53,23 +49,23 @@ struct OEnumerationLock
     on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
-                         , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
+                         , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
                                                            css::lang::XEventListener    >
 {
     css::uno::Sequence< OUString >                m_aNames;
     sal_Int32                                           m_nPos;
-    css::uno::Reference< starcontainer::XNameAccess >    m_xAccess;
+    css::uno::Reference< css::container::XNameAccess >    m_xAccess;
     bool                                            m_bListening;
 
 public:
-    OEnumerationByName(const css::uno::Reference< starcontainer::XNameAccess >& _rxAccess);
-    OEnumerationByName(const css::uno::Reference< starcontainer::XNameAccess >& _rxAccess,
+    OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess);
+    OEnumerationByName(const css::uno::Reference< css::container::XNameAccess >& _rxAccess,
                        const css::uno::Sequence< OUString >&             _aNames  );
     virtual ~OEnumerationByName();
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, 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;
 
@@ -85,20 +81,20 @@ private:
     on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
-                          , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
+                          , public ::cppu::WeakImplHelper2< css::container::XEnumeration ,
                                                             css::lang::XEventListener    >
 {
     sal_Int32                                         m_nPos;
-    css::uno::Reference< starcontainer::XIndexAccess > m_xAccess;
+    css::uno::Reference< css::container::XIndexAccess > m_xAccess;
     bool                                          m_bListening;
 
 public:
-    OEnumerationByIndex(const css::uno::Reference< starcontainer::XIndexAccess >& _rxAccess);
+    OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess);
     virtual ~OEnumerationByIndex();
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(starcontainer::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, 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;
 
@@ -115,7 +111,7 @@ private:
 
 */
 class COMPHELPER_DLLPUBLIC OAnyEnumeration : private OEnumerationLock
-                                           , public  ::cppu::WeakImplHelper1< starcontainer::XEnumeration >
+                                           , public  ::cppu::WeakImplHelper1< css::container::XEnumeration >
 {
     sal_Int32                         m_nPos;
     css::uno::Sequence< css::uno::Any > m_lItems;
@@ -126,7 +122,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, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 };