diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-05 17:39:45 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-12 23:22:56 +0200 |
| commit | 2dc6bdd1d5789ace0500cad90f5d2eb930888bb9 (patch) | |
| tree | 856dffe0eb15a5b29d37a191f76354f880d3f5de /vcl/inc/qt5/Qt5Frame.hxx | |
| parent | 25edbded9946801effd117b9c46de0f8b4bc5632 (diff) | |
tdf#125692 SalObject always holds a SystemChildWindow
Let's just face reality and store it as a VclPtr.
And this is needed, because Qt, like VCL, uses deferred deletion,
and has no way to filter events to QObjects out of its event queue
easily. This way the qt5 plugin can report focus changes for
SalObjects without a crash, which happens when you close a
presentation with a video by click.
And in addition it reverts the workaround introduced in commit
e770bacc85a0 ("Qt5 workaround modal change after show bug"), as it
seems this bug is a use-after-free error, introduced by LO.
Thanks Michael Weghorn for catching that!
Maybe someone should also rename SalObject...
Change-Id: I0bc64ea64f95dfc7a838799c4a04de183adfefcf
Reviewed-on: https://gerrit.libreoffice.org/73567
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/qt5/Qt5Frame.hxx')
| -rw-r--r-- | vcl/inc/qt5/Qt5Frame.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx index 3b590bd8e28c..c70171869aa8 100644 --- a/vcl/inc/qt5/Qt5Frame.hxx +++ b/vcl/inc/qt5/Qt5Frame.hxx @@ -111,9 +111,6 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame void TriggerPaintEvent(); void TriggerPaintEvent(QRect aRect); -private: - void setVisible(bool); - Q_SIGNALS: void tooltipRequest(const OUString& rTooltip); |