svx/source/accessibility/AccessibleFrameSelector.cxx | 8 ++++++++
svx/source/inc/AccessibleFrameSelector.hxx | 1 +
2 files changed, 9 insertions(+)
New commits:
commit 9b9d45e35103e6884e0a87c35c07c74899f40614
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Sep 9 14:38:51 2012 +0300
fdo#47368: Remove event listener also in Invalidate()
Change-Id: Ifa3d7ff400137b4560fa0ff890cd211147c5c234
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 925be94..1def70a 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -101,6 +101,13 @@ AccFrameSelector::AccFrameSelector( FrameSelector&
rFrameSel, FrameBorderType eB
AccFrameSelector::~AccFrameSelector()
{
+ RemoveFrameSelEventListener();
+}
+
+// ----------------------------------------------------------------------------
+
+void AccFrameSelector::RemoveFrameSelEventListener()
+{
if ( mpFrameSel )
{
mpFrameSel->RemoveEventListener( LINK( this, AccFrameSelector,
WindowEventListener ) );
@@ -709,6 +716,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const
sal_Int16 _nEventId,
void AccFrameSelector::Invalidate()
{
+ RemoveFrameSelEventListener();
mpFrameSel = 0;
EventObject aEvent;
Reference < XAccessibleContext > xThis( this );
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx
b/svx/source/inc/AccessibleFrameSelector.hxx
index db97316..6f11172 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -118,6 +118,7 @@ protected:
private:
void IsValid() throw
(::com::sun::star::uno::RuntimeException);
+ void RemoveFrameSelEventListener();
FrameSelector* mpFrameSel;
::osl::Mutex maFocusMutex;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
