diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-20 21:42:06 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-21 09:03:22 +0200 |
| commit | edda7dbad7e03487b75a79455a7d48198046cbfc (patch) | |
| tree | d014594aa6e3837a407f8153b038d6884e445944 /include/comphelper | |
| parent | 150df3c020613bd956c4ad38ab4b5e247801296b (diff) | |
starcontainer -> css::container
Change-Id: Ie6e75483aa4262a5f66a4c557015af8b3c02d592
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/enumhelper.hxx | 26 |
1 files changed, 11 insertions, 15 deletions
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; }; |