summaryrefslogtreecommitdiff
path: root/include/toolkit/controls
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-04 11:10:17 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-04 10:55:08 +0000
commit20b9cbd0e586fe89f8e1bdd942135445a256af7b (patch)
tree061d5276c6363be1d6b9db734e00676eec71f513 /include/toolkit/controls
parent64acc9d576be9166c2da6edc6f8478e2cf31f606 (diff)
merge toolkit::NameContainer_Impl with toolkit::ScriptEventContainer
Change-Id: I14e9401056e31ee9d4ad5945a73ca31969430b4c Reviewed-on: https://gerrit.libreoffice.org/26891 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/toolkit/controls')
-rw-r--r--include/toolkit/controls/eventcontainer.hxx24
1 files changed, 5 insertions, 19 deletions
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index acc74cb65167..e41aaa02d78f 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -26,13 +26,9 @@
#include <toolkit/helper/listenermultiplexer.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unordered_map>
-typedef ::cppu::WeakImplHelper2< css::container::XNameContainer,
- css::container::XContainer > NameContainerHelper;
-
-
namespace toolkit
{
@@ -46,7 +42,9 @@ typedef std::unordered_map
NameContainerNameMap;
-class NameContainer_Impl : public NameContainerHelper
+class ScriptEventContainer : public ::cppu::WeakImplHelper<
+ css::container::XNameContainer,
+ css::container::XContainer >
{
NameContainerNameMap mHashMap;
css::uno::Sequence< OUString > mNames;
@@ -57,12 +55,7 @@ class NameContainer_Impl : public NameContainerHelper
ContainerListenerMultiplexer maContainerListeners;
public:
- NameContainer_Impl( css::uno::Type const & aType )
- : mnElementCount( 0 ),
- mType( aType ),
- maContainerListeners( *this )
- {
- }
+ ScriptEventContainer();
// Methods XElementAccess
virtual css::uno::Type SAL_CALL getElementType( )
@@ -105,13 +98,6 @@ public:
throw(css::uno::RuntimeException, std::exception) override;
};
-class ScriptEventContainer : public NameContainer_Impl
-{
-public:
- ScriptEventContainer();
-};
-
-
} // namespace toolkit_namecontainer
#endif // INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX