summaryrefslogtreecommitdiffstats
path: root/svl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-28 16:57:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-28 17:17:52 +0100
commit50cf7caee5bc6d8e066580d13c72b40926fcb69a (patch)
tree2962f8419b99f794e0ec1cbd1e7c7ddc04796f40 /svl/inc
parentUse memcmp insteadof rtl_compareMemory in sw (diff)
downloadcore-50cf7caee5bc6d8e066580d13c72b40926fcb69a.tar.gz
core-50cf7caee5bc6d8e066580d13c72b40926fcb69a.zip
convert SfxListenerArr_Impl from SvPtrarr to std::vector
Change-Id: I7f46731d880da30dc2dda011b31818437c955f2d
Diffstat (limited to 'svl/inc')
-rw-r--r--svl/inc/svl/brdcst.hxx25
1 files changed, 15 insertions, 10 deletions
diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index 007d4c07fa86..d434a833657f 100644
--- a/svl/inc/svl/brdcst.hxx
+++ b/svl/inc/svl/brdcst.hxx
@@ -21,25 +21,22 @@
#include "svl/svldllapi.h"
#include <tools/rtti.hxx>
-#include <svl/svarray.hxx>
+#include <vector>
class SfxListener;
class SfxHint;
-#ifndef _SFX_BRDCST_CXX
-typedef SvPtrarr SfxListenerArr_Impl;
-#endif
-
//-------------------------------------------------------------------------
class SVL_DLLPUBLIC SfxBroadcaster
{
-friend class SfxListener;
+ friend class SfxListener;
+ typedef std::vector<SfxListener*> SfxListenerArr_Impl;
SfxListenerArr_Impl aListeners;
private:
- sal_Bool AddListener( SfxListener& rListener );
+ void AddListener( SfxListener& rListener );
void RemoveListener( SfxListener& rListener );
const SfxBroadcaster& operator=(const SfxBroadcaster &); // verboten
@@ -55,10 +52,18 @@ public:
virtual ~SfxBroadcaster();
void Broadcast( const SfxHint &rHint );
- sal_Bool HasListeners() const;
- sal_uInt16 GetListenerCount() const { return aListeners.Count(); }
+ bool HasListeners() const
+ {
+ return !aListeners.empty();
+ }
+ size_t GetListenerCount() const
+ {
+ return aListeners.size();
+ }
SfxListener* GetListener( sal_uInt16 nNo ) const
- { return (SfxListener*) aListeners[nNo]; }
+ {
+ return aListeners[nNo];
+ }
};
#endif