diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-10-18 16:48:48 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-10-19 16:08:49 +0200 |
| commit | a9342497f309be256e6c7d43065c160378a48e1a (patch) | |
| tree | 78b940443b215d0d8b2ebcd96769c542bca63296 /vcl | |
| parent | 23f3246dfa0c212ae662c14fa2d0c0ad1d222041 (diff) | |
tdf#120452: Just enough of SystemEnvData in Qt5Object
the video in the presentation still doesn't play but at least the
crash is gone
Change-Id: I78ab4ff9412998f235a4b44a23b0e9d3ef4143e0
Reviewed-on: https://gerrit.libreoffice.org/61944
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/qt5/Qt5Object.hxx | 2 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 2 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Object.cxx | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx index ecfdbf7d37b2..99fef78a681b 100644 --- a/vcl/inc/qt5/Qt5Object.hxx +++ b/vcl/inc/qt5/Qt5Object.hxx @@ -49,7 +49,7 @@ public: virtual void SetForwardKey(bool bEnable) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData* GetSystemData() const override { return &m_aSystemData; } }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index 66272a9f34f6..ff77638013ca 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) } m_aSystemData.nSize = sizeof(SystemEnvData); - //m_aSystemData.aWindow = GetNativeWindowHandle(m_pWindow); + m_aSystemData.aWindow = m_pQWidget->winId(); m_aSystemData.aShellWindow = reinterpret_cast<sal_IntPtr>(this); //m_aSystemData.pSalFrame = this; //m_aSystemData.pWidget = m_pQWidget; diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx index b88f3047b391..3b68c0746d30 100644 --- a/vcl/qt5/Qt5Object.cxx +++ b/vcl/qt5/Qt5Object.cxx @@ -31,6 +31,14 @@ Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow) m_pQWidget.reset(new QWidget(pParent->GetQWidget())); if (bShow) m_pQWidget->show(); + + m_aSystemData.nSize = sizeof(SystemEnvData); + m_aSystemData.aWindow = pParent->GetQWidget()->winId(); + m_aSystemData.aShellWindow = reinterpret_cast<sal_IntPtr>(this); + //m_aSystemData.pSalFrame = this; + //m_aSystemData.pWidget = m_pQWidget; + //m_aSystemData.nScreen = m_nXScreen.getXScreen(); + m_aSystemData.pToolkit = "qt5"; } void Qt5Object::ResetClipRegion() @@ -64,6 +72,4 @@ void Qt5Object::Show(bool bVisible) void Qt5Object::SetForwardKey(bool /*bEnable*/) {} -const SystemEnvData* Qt5Object::GetSystemData() const { return nullptr; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |