diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-30 21:14:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-01 17:08:41 +0200 |
| commit | 3d65c10f39e191b7e1ceb6fc94fed9e6196de0aa (patch) | |
| tree | e5af9cf191ea86a2f1313eca9957b77590cbaccb /vcl/skia/x11 | |
| parent | e3ffbd80413b27b11c43bfce6cd9753a95e5e8f3 (diff) | |
Related: cid#1478001 CreateVirtualDevice never passed a null pGraphics arg
Change-Id: I0701b15a28ab3583586c0c8018c511e100b41a93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114948
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/skia/x11')
| -rw-r--r-- | vcl/skia/x11/salvd.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/skia/x11/salvd.cxx b/vcl/skia/x11/salvd.cxx index 20ba5bfd001d..bb007962f11c 100644 --- a/vcl/skia/x11/salvd.cxx +++ b/vcl/skia/x11/salvd.cxx @@ -32,7 +32,7 @@ void X11SalGraphics::Init(X11SkiaSalVirtualDevice* pDevice) mxImpl->Init(); } -X11SkiaSalVirtualDevice::X11SkiaSalVirtualDevice(SalGraphics const* pGraphics, tools::Long nDX, +X11SkiaSalVirtualDevice::X11SkiaSalVirtualDevice(const SalGraphics& rGraphics, tools::Long nDX, tools::Long nDY, const SystemGraphicsData* pData, std::unique_ptr<X11SalGraphics> pNewGraphics) : mpGraphics(std::move(pNewGraphics)) @@ -46,8 +46,7 @@ X11SkiaSalVirtualDevice::X11SkiaSalVirtualDevice(SalGraphics const* pGraphics, t (void)pData; mpDisplay = vcl_sal::getSalDisplay(GetGenericUnixSalData()); - mnXScreen = pGraphics ? static_cast<X11SalGraphics const*>(pGraphics)->GetScreenNumber() - : vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen(); + mnXScreen = static_cast<const X11SalGraphics&>(rGraphics).GetScreenNumber(); mnWidth = nDX; mnHeight = nDY; mpGraphics->Init(this); |