include/sfx2/dinfdlg.hxx | 2 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b5e6978869227d70eb68a6fd25922674a21b8c8f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 3 12:41:32 2019 +0100
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Oct 5 14:23:23 2019 +0200
Resolves: tdf#127882 gtk 3.18 crash in property dialog teardown
due to the menubutton popovers in the custom property page
workaround by reordering so scrolling window is torn down after the
menubutton
is destroyed and clear the popover in the menubutton dtor
Change-Id: Icf06d912524af13a5590f160150f1a4e15f3e9f7
Reviewed-on: https://gerrit.libreoffice.org/80118
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 0cf1b6424908..f984f20b0332 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -414,8 +414,8 @@ private:
std::unique_ptr<weld::Widget> m_xBox;
std::unique_ptr<weld::Container> m_xBody;
- std::unique_ptr<CustomPropertiesWindow> m_xPropertiesWin;
std::unique_ptr<weld::ScrolledWindow> m_xVertScroll;
+ std::unique_ptr<CustomPropertiesWindow> m_xPropertiesWin;
std::unique_ptr<weld::Label> m_xName;
std::unique_ptr<weld::Label> m_xType;
std::unique_ptr<weld::Label> m_xValue;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5b7efd8ce43a..5bd596bb4c09 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5347,6 +5347,7 @@ public:
if (m_pMenuHack)
{
g_signal_handler_disconnect(m_pMenuButton, m_nSignalId);
+ gtk_menu_button_set_popover(m_pMenuButton, nullptr);
gtk_widget_destroy(GTK_WIDGET(m_pMenuHack));
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
