[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Caolán McNamara]

 sc/source/ui/view/gridwin.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9602a07fe0cd3f1b9d78279629393ec1d173ebca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 24 19:15:41 2017 +0100

    tdf#112388 make aComboButton release its ScGridWindow outputdevice
    
    Change-Id: I938e36dda7fbc3b769b3fba8fd9a7d5d9b8e248c
    Reviewed-on: https://gerrit.libreoffice.org/42716
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit eaf7d58ef57daa7580057b38625cd9a96ffe2a43)
    Reviewed-on: https://gerrit.libreoffice.org/42724
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ef859a001a6a..620df7c4b99f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -507,6 +507,7 @@ void ScGridWindow::dispose()
     mpNoteMarker.reset();
     mpAutoFilterPopup.disposeAndClear();
     mpDPFieldPopup.disposeAndClear();
+    aComboButton.SetOutputDevice(nullptr);
 
     vcl::Window::dispose();
 }