diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-30 15:02:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-31 12:59:22 +0000 |
| commit | fbfe06dcbda005ed35747ca5ba30b3891c2717d1 (patch) | |
| tree | c4208d01d135cf061280aab22443ed1553215863 /vcl/unx/generic | |
| parent | 6f112bd40fe78141de865934145d81b1258b36de (diff) | |
loplugin:unusedfields
Change-Id: I6acce1578d21da0ac014410289def3dd500b4de3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146356
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 17 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 7 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 3 |
3 files changed, 1 insertions, 26 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index cabc42e7d053..8a2d9ddc6d2f 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -281,23 +281,6 @@ void SalDisplay::doDestruct() m_pWMAdaptor.reset(); - if (ImplGetSVData()) - { - SalDisplay* pSalDisp = vcl_sal::getSalDisplay(pData); - Display* const pX11Disp = pSalDisp->GetDisplay(); - int nMaxScreens = pSalDisp->GetXScreenCount(); - - for (int i = 0; i < nMaxScreens; i++) - { - SalDisplay::RenderEntryMap& rMap = pSalDisp->GetRenderEntries(SalX11Screen(i)); - for (auto const& elem : rMap) - { - if (elem.second.m_aPixmap) - ::XFreePixmap(pX11Disp, elem.second.m_aPixmap); - } - rMap.clear(); - } - } FreetypeManager::get().ClearFontCache(); if( IsDisplay() ) diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 366c0c9a227f..f296e3cf34a4 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -69,9 +69,7 @@ X11Common::X11Common() X11SalGraphics::X11SalGraphics(): m_pFrame(nullptr), m_pVDev(nullptr), - m_nXScreen( 0 ), - bWindow_(false), - bVirDev_(false) + m_nXScreen( 0 ) { #if HAVE_FEATURE_SKIA if (SkiaHelper::isVCLSkiaEnabled()) @@ -144,9 +142,6 @@ void X11SalGraphics::Init( X11SalFrame& rFrame, Drawable aTarget, m_pFrame = &rFrame; m_pVDev = nullptr; - bWindow_ = true; - bVirDev_ = false; - SetDrawable(aTarget, rFrame.GetSurface(), nXScreen); mxImpl->Init(); } diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index bd76d3774a1c..e0a9d33f6e87 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -78,9 +78,6 @@ void X11SalGraphics::Init(X11SalVirtualDevice *pDevice, SalColormap* pColormap, m_pVDev = pDevice; m_pFrame = nullptr; - bWindow_ = pDisplay->IsDisplay(); - bVirDev_ = true; - SetDrawable(pDevice->GetDrawable(), pDevice->GetSurface(), m_nXScreen); mxImpl->Init(); } |