[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 4 13:35:57 UTC 2019
vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ea2e62f9be3d52e4d0c012a937d9627e065a85df
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Jan 31 09:52:51 2019 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Feb 4 14:35:34 2019 +0100
tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only once
Since the event filter is only used to set the custom
widget in the KFileWidget, it can and needs to be removed
again once this has been done; which also avoids crashes.
(s. https://gerrit.libreoffice.org/#/c/67185/ for more
infos, where the same thing is done for kde5)
Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3
Reviewed-on: https://gerrit.libreoffice.org/67184
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
(cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f)
Reviewed-on: https://gerrit.libreoffice.org/67361
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index f7fbbfb50034..0f75a760fac5 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -241,7 +241,11 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
{
KWindowSystem::setMainWindow(w, _winId);
if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly))
+ {
fileWidget->setCustomWidget(_extraControls);
+ // remove event filter again; the only purpose was to set the custom widget here
+ qApp->removeEventFilter(this);
+ }
}
}
return QObject::eventFilter(o, e);
More information about the Libreoffice-commits
mailing list