diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-03 12:41:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-03 14:52:58 +0200 |
| commit | f29aa28100b899252a3419578be5d39e84863c36 (patch) | |
| tree | 678d688fb5ece42e1e4c18e6f9f1cb37b7d51183 | |
| parent | 8e7679cb34f587d08d2485f6aee1b85fdbf2d699 (diff) | |
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/80117
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/sfx2/dinfdlg.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 248350e02d4b..c006763a18e2 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -411,8 +411,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 7e4741f1440f..3720870fac30 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -6207,6 +6207,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)); } } |