Kaydet (Commit) 9b9d45e3 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

fdo#47368: Remove event listener also in Invalidate()

Change-Id: Ifa3d7ff400137b4560fa0ff890cd211147c5c234
üst bccb30a0
...@@ -100,6 +100,13 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB ...@@ -100,6 +100,13 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
AccFrameSelector::~AccFrameSelector() AccFrameSelector::~AccFrameSelector()
{
RemoveFrameSelEventListener();
}
// ----------------------------------------------------------------------------
void AccFrameSelector::RemoveFrameSelEventListener()
{ {
if ( mpFrameSel ) if ( mpFrameSel )
{ {
...@@ -709,6 +716,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, ...@@ -709,6 +716,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId,
void AccFrameSelector::Invalidate() void AccFrameSelector::Invalidate()
{ {
RemoveFrameSelEventListener();
mpFrameSel = 0; mpFrameSel = 0;
EventObject aEvent; EventObject aEvent;
Reference < XAccessibleContext > xThis( this ); Reference < XAccessibleContext > xThis( this );
......
...@@ -118,6 +118,7 @@ protected: ...@@ -118,6 +118,7 @@ protected:
private: private:
void IsValid() throw (::com::sun::star::uno::RuntimeException); void IsValid() throw (::com::sun::star::uno::RuntimeException);
void RemoveFrameSelEventListener();
FrameSelector* mpFrameSel; FrameSelector* mpFrameSel;
::osl::Mutex maFocusMutex; ::osl::Mutex maFocusMutex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment