applied_patches/0406-layout-accessibility-dispose-only-once.diff

   1 --- toolkit/source/layout/vcl/wfield.cxx
   2 +++ toolkit/source/layout/vcl/wfield.cxx
   3 @@ -420,6 +420,8 @@ public:
   4  #ifndef __SUNPRO_CC
   5      OSL_TRACE ("%s: deleting ComboBox for window: %p", __FUNCTION__, GetWindow ());
   6  #endif
   7 +    SetClickHdl (Link ());
   8 +    SetSelectHdl (Link ());
   9  }
  10
  11  ComboBoxImpl::~ComboBoxImpl ()
  12 @@ -630,6 +632,8 @@ public:
  13
  14  ListBox::~ListBox ()
  15  {
  16 +    SetClickHdl (Link ());
  17 +    SetSelectHdl (Link ());
  18  }
  19
  20  sal_uInt16 ListBox::InsertEntry (String const& rStr, sal_uInt16 nPos)
  21 diff --git toolkit/source/layout/vcl/wrapper.cxx toolkit/source/layout/vcl/wrapper.cxx
  22 index 31a1fcb..f9c0a4c 100644
  23 --- toolkit/source/layout/vcl/wrapper.cxx
  24 +++ toolkit/source/layout/vcl/wrapper.cxx
  25 @@ -178,7 +178,10 @@ WindowImpl::WindowImpl (Context *context, const PeerHandle &peer, Window *window
  26  WindowImpl::~WindowImpl ()
  27  {
  28      if (mpWindow)
  29 +    {
  30 +        mpWindow->GetWindow ()->SetAccessible (0);
  31          mpWindow->mpImpl = 0;
  32 +    }
  33      if (mvclWindow)
  34      {
  35          VCLXWindow *v = mvclWindow->GetWindowPeer ();
  36 @@ -674,10 +677,6 @@ ControlImpl::ControlImpl (Context *context, const PeerHandle &peer, Window *wind
  37
  38  ControlImpl::~ControlImpl ()
  39  {
  40 -    if ((!!mGetFocusHdl || !!mLoseFocusHdl) && mxWindow.is ())
  41 -        /* Disposing will be done @ VCLXWindow::dispose () maFocusListeners.disposeAndClear()
  42 -           don't do it twice */
  43 -        mxWindow.clear ();
  44  }
  45
  46  void ControlImpl::SetGetFocusHdl (Link const& link)
  47 @@ -701,7 +700,7 @@ void ControlImpl::SetLoseFocusHdl (Link const& link)
  48
  49  Link& ControlImpl::GetLoseFocusHdl ()
  50  {
  51 -    return mGetFocusHdl;
  52 +    return mLoseFocusHdl;
  53  }
  54
  55  void ControlImpl::UpdateListening (Link const& link)
  56 @@ -713,10 +712,10 @@ void ControlImpl::UpdateListening (Link const& link)
  57          mxWindow->addFocusListener (this);
  58  }
  59
  60 -void SAL_CALL ControlImpl::disposing (lang::EventObject const&)
  61 +void SAL_CALL ControlImpl::disposing (lang::EventObject const& e)
  62      throw (uno::RuntimeException)
  63  {
  64 -///    mxWindow.clear ();
  65 +    WindowImpl::disposing (e);
  66  }
  67
  68  void SAL_CALL ControlImpl::focusGained (awt::FocusEvent const&)