Kaydet (Commit) a9342497 authored tarafından Katarina Behrens's avatar Katarina Behrens

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: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 23f3246d
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
virtual void SetForwardKey(bool bEnable) override; 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) ...@@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
} }
m_aSystemData.nSize = sizeof(SystemEnvData); 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.aShellWindow = reinterpret_cast<sal_IntPtr>(this);
//m_aSystemData.pSalFrame = this; //m_aSystemData.pSalFrame = this;
//m_aSystemData.pWidget = m_pQWidget; //m_aSystemData.pWidget = m_pQWidget;
......
...@@ -31,6 +31,14 @@ Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow) ...@@ -31,6 +31,14 @@ Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow)
m_pQWidget.reset(new QWidget(pParent->GetQWidget())); m_pQWidget.reset(new QWidget(pParent->GetQWidget()));
if (bShow) if (bShow)
m_pQWidget->show(); 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() void Qt5Object::ResetClipRegion()
...@@ -64,6 +72,4 @@ void Qt5Object::Show(bool bVisible) ...@@ -64,6 +72,4 @@ void Qt5Object::Show(bool bVisible)
void Qt5Object::SetForwardKey(bool /*bEnable*/) {} void Qt5Object::SetForwardKey(bool /*bEnable*/) {}
const SystemEnvData* Qt5Object::GetSystemData() const { return nullptr; }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment