SalGraphics does not need virtual freeResources()

it is only called to do one thing, in X11SalGraphics, so make
it private to that class, and rename it to better fit its
purpose.

Change-Id: I16ea2f86f8b596351354faa80bb2bab4d2ac6e7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176729
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

18 files changed, 4 insertions, 37 deletions

diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx
index ead5936276d3..ddd85978dd82 100644
--- a/vcl/headless/SvpGraphicsBackend.cxx
+++ b/vcl/headless/SvpGraphicsBackend.cxx
@@ -26,8 +26,6 @@ SvpGraphicsBackend::SvpGraphicsBackend(CairoCommon& rCairoCommon)
 
 void SvpGraphicsBackend::Init() {}
 
-void SvpGraphicsBackend::freeResources() {}
-
 void SvpGraphicsBackend::setClipRegion(const vcl::Region& i_rClip)
 {
     m_rCairoCommon.m_aClipRegion = i_rClip;
diff --git a/vcl/inc/headless/SvpGraphicsBackend.hxx b/vcl/inc/headless/SvpGraphicsBackend.hxx
index dc028b465a29..4e2322148376 100644
--- a/vcl/inc/headless/SvpGraphicsBackend.hxx
+++ b/vcl/inc/headless/SvpGraphicsBackend.hxx
@@ -36,8 +36,6 @@ public:
 
     void Init() override;
 
-    void freeResources() override;
-
     OUString getRenderBackendName() const override { return u"svp"_ustr; }
 
     void setClipRegion(vcl::Region const& rRegion) override;
diff --git a/vcl/inc/qt5/QtGraphics.hxx b/vcl/inc/qt5/QtGraphics.hxx
index b04155bf1245..5212d30873b2 100644
--- a/vcl/inc/qt5/QtGraphics.hxx
+++ b/vcl/inc/qt5/QtGraphics.hxx
@@ -65,8 +65,6 @@ public:
 
     void setQImage(QImage* pQImage) { m_pQImage = pQImage; }
 
-    void freeResources() override {}
-
     OUString getRenderBackendName() const override { return u"qt"_ustr; }
 
     void setClipRegion(vcl::Region const& rRegion) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index f29f35948d5b..00abbc6df182 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -271,8 +271,6 @@ public:
 
     void Init() override;
 
-    void freeResources() override;
-
     OUString getRenderBackendName() const override
     {
         return "aqua";
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index fd3a13378b53..8fa7b54ca3f0 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -76,8 +76,6 @@ public:
 
     virtual void DeInit() {}
 
-    virtual void freeResources() = 0;
-
     virtual OUString getRenderBackendName() const = 0;
 
     virtual void setClipRegion( const vcl::Region& ) = 0;
diff --git a/vcl/inc/skia/osx/gdiimpl.hxx b/vcl/inc/skia/osx/gdiimpl.hxx
index b60280a09e6b..2bd5a308b523 100644
--- a/vcl/inc/skia/osx/gdiimpl.hxx
+++ b/vcl/inc/skia/osx/gdiimpl.hxx
@@ -26,8 +26,6 @@ public:
     AquaSkiaSalGraphicsImpl(AquaSalGraphics& rParent, AquaSharedAttributes& rShared);
     virtual ~AquaSkiaSalGraphicsImpl() override;
 
-    virtual void freeResources() override;
-
     virtual void UpdateGeometryProvider(SalGeometryProvider* provider) override
     {
         setProvider(provider);
diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 7e399c59effb..b37c29198ca8 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -56,7 +56,6 @@ public:
     virtual void ClearDevFontCache() override;
     virtual void ClearNativeControlCache() override;
 
-    virtual void freeResources() override;
     virtual void Flush() override;
 
     static void prepareSkia();
diff --git a/vcl/inc/skia/x11/gdiimpl.hxx b/vcl/inc/skia/x11/gdiimpl.hxx
index f864d51a000a..835f565e9c36 100644
--- a/vcl/inc/skia/x11/gdiimpl.hxx
+++ b/vcl/inc/skia/x11/gdiimpl.hxx
@@ -25,7 +25,6 @@ public:
     X11SkiaSalGraphicsImpl(X11SalGraphics& rParent);
 
     virtual void Init() override;
-    virtual void freeResources() override;
     virtual void Flush() override;
 
     static void prepareSkia();
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 261dd36651b5..58c273e576b2 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -123,7 +123,7 @@ public:
 private:
     using SalGraphics::GetPixel;
 
-    void                            freeResources();
+    void FreeColorMap();
 
     SalFrame*                       m_pFrame; // the SalFrame which created this Graphics or NULL
     SalVirtualDevice*               m_pVDev;  // the SalVirtualDevice which created this Graphics or NULL
diff --git a/vcl/quartz/AquaGraphicsBackend.cxx b/vcl/quartz/AquaGraphicsBackend.cxx
index 4b7358c83f94..daf413165f8f 100644
--- a/vcl/quartz/AquaGraphicsBackend.cxx
+++ b/vcl/quartz/AquaGraphicsBackend.cxx
@@ -197,7 +197,6 @@ AquaGraphicsBackend::AquaGraphicsBackend(AquaSharedAttributes& rShared)
 AquaGraphicsBackend::~AquaGraphicsBackend() {}
 
 void AquaGraphicsBackend::Init() {}
-void AquaGraphicsBackend::freeResources() {}
 
 void AquaGraphicsBackend::setClipRegion(vcl::Region const& rRegion)
 {
diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index b5a1035bf592..4874b056dad7 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -67,8 +67,6 @@ AquaSkiaSalGraphicsImpl::~AquaSkiaSalGraphicsImpl()
     DeInit(); // mac code doesn't call DeInit()
 }
 
-void AquaSkiaSalGraphicsImpl::freeResources() {}
-
 void AquaSkiaSalGraphicsImpl::createWindowSurfaceInternal(bool forceRaster)
 {
     assert(!mWindowContext);
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index f95b58eca0fe..93b4ed75980a 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -279,8 +279,6 @@ void WinSkiaSalGraphicsImpl::createWindowSurfaceInternal(bool forceRaster)
     }
 }
 
-void WinSkiaSalGraphicsImpl::freeResources() {}
-
 void WinSkiaSalGraphicsImpl::Flush() { performFlush(); }
 
 bool WinSkiaSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey const& rControlCacheKey,
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 4d15b6d5fd7a..ffad26bd9b1f 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -142,8 +142,6 @@ bool X11SkiaSalGraphicsImpl::avoidRecreateByResize() const
     return mSurface->width() == int(w) && mSurface->height() == int(h);
 }
 
-void X11SkiaSalGraphicsImpl::freeResources() {}
-
 void X11SkiaSalGraphicsImpl::Flush() { performFlush(); }
 
 std::unique_ptr<skwindow::WindowContext> createVulkanWindowContext(bool temporary)
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
index b21b39d6c731..4ec2b453a622 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -198,8 +198,6 @@ std::shared_ptr<SalBitmap> X11CairoSalGraphicsImpl::getBitmap(tools::Long nX, to
 
 void X11CairoSalGraphicsImpl::Init() {}
 
-void X11CairoSalGraphicsImpl::freeResources() {}
-
 bool X11CairoSalGraphicsImpl::drawPolyLineBezier(sal_uInt32, const Point*, const PolyFlags*)
 {
     return false;
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index fa2d903a3067..607809d1421f 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -181,8 +181,6 @@ public:
                           const SalBitmap& rMaskBitmap, const SalBitmap& rAlphaBitmap) override;
 
     bool supportsOperation(OutDevSupportType eType) const override;
-
-    void freeResources() override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 092ab26e6b85..0e17f8e16ac4 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -90,13 +90,11 @@ X11SalGraphics::~X11SalGraphics() COVERITY_NOEXCEPT_FALSE
 {
     DeInit();
     ReleaseFonts();
-    freeResources();
+    FreeColorMap();
 }
 
-void X11SalGraphics::freeResources()
+void X11SalGraphics::FreeColorMap()
 {
-    mxImpl->freeResources();
-
     if( m_pDeleteColormap )
     {
         m_pDeleteColormap.reset();
@@ -126,7 +124,7 @@ void X11SalGraphics::SetDrawable(Drawable aDrawable, cairo_surface_t* pSurface,
     // free screen specific resources if needed
     if( nXScreen != m_nXScreen )
     {
-        freeResources();
+        FreeColorMap();
         maX11Common.m_pColormap = &vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetColormap( nXScreen );
         m_nXScreen = nXScreen;
     }
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index db936ae39bef..ca222660e458 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -239,10 +239,6 @@ void WinSalGraphicsImpl::Init()
 {
 }
 
-void WinSalGraphicsImpl::freeResources()
-{
-}
-
 bool WinSalGraphicsImpl::drawEPS(tools::Long, tools::Long, tools::Long, tools::Long, void*, sal_uInt32)
 {
     return false;
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 9d4fa32233de..15f1a20b5881 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -68,8 +68,6 @@ public:
 
     virtual void Init() override;
 
-    virtual void freeResources() override;
-
     virtual OUString getRenderBackendName() const override { return "gdi"; }
 
     virtual void setClipRegion( const vcl::Region& ) override;