[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/vcl vcl/source

[Caolán McNamara]

 include/vcl/layout.hxx       |    1 +
 vcl/source/window/layout.cxx |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit d7d4a6bf1e96be723a09add106ce6d261509b1c8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 29 17:12:40 2014 +0000

    Resolves: rhbz#1146169 a11y frames label dies before frame
    
    Change-Id: I2bc45dcb92b8e68bf4ae4df72c0fbd4e3b535604
    Reviewed-on: https://gerrit.libreoffice.org/12142
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index c69b44b..0ed3e6c 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -459,6 +459,7 @@ private:
 private:
     friend class VclBuilder;
     void designate_label(Window *pWindow);
+    DECL_LINK(WindowEventListener, VclSimpleEvent*);
 public:
     VclFrame(Window *pParent)
         : VclBin(pParent)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 975df2f..9f560d5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1340,10 +1340,21 @@ void VclFrame::setAllocation(const Size &rAllocation)
         setLayoutAllocation(*pChild, aChildPos, aAllocation);
 }
 
+IMPL_LINK(VclFrame, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+    if (pEvent && pEvent->GetId() == VCLEVENT_OBJECT_DYING)
+        designate_label(NULL);
+    return 0;
+}
+
 void VclFrame::designate_label(Window *pWindow)
 {
-    assert(pWindow->GetParent() == this);
+    assert(!pWindow || pWindow->GetParent() == this);
+    if (m_pLabel)
+        m_pLabel->RemoveEventListener(LINK(this, VclFrame, WindowEventListener));
     m_pLabel = pWindow;
+    if (m_pLabel)
+        m_pLabel->AddEventListener(LINK(this, VclFrame, WindowEventListener));
 }
 
 const Window *VclFrame::get_label_widget() const