[Libreoffice-commits] core.git: vcl/inc vcl/skia

[Stephan Bergmann (via logerrit)]

 vcl/inc/skia/win/gdiimpl.hxx |    2 ++
 vcl/skia/win/gdiimpl.cxx     |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e9e0ccae48385fb949c2c3f0aac678784ab14705
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 5 09:45:13 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Dec 5 13:29:47 2019 +0100

    Silence loplugin:unnecessaryoverride (clang-cl)
    
    ("public virtual function just calls public parent")
    
    Change-Id: Ifd8d6c794ae32af1fe5d2a97389ec87394fdffbc
    Reviewed-on: https://gerrit.libreoffice.org/84512
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 75531ae9a164..37c8ad374aa8 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -55,7 +55,9 @@ private:
 public:
     WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics, SalGeometryProvider* mpProvider);
 
+#if 0 // TODO
     virtual void Init() override;
+#endif
     virtual void DeInit() override;
 
     virtual void freeResources() override;
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index dd63f4d6121e..53979f39aad4 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -24,9 +24,9 @@ WinSkiaSalGraphicsImpl::WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics,
 {
 }
 
+#if 0 // TODO
 void WinSkiaSalGraphicsImpl::Init()
 {
-#if 0 // TODO
     if (!IsOffscreen() && mpContext.is() && mpContext->isInitialized())
     {
         const GLWinWindow& rGLWindow = static_cast<const GLWinWindow&>(mpContext->getOpenGLWindow());
@@ -39,9 +39,8 @@ void WinSkiaSalGraphicsImpl::Init()
             DeInit();
         }
     }
-#endif
-    SkiaSalGraphicsImpl::Init();
 }
+#endif
 
 void WinSkiaSalGraphicsImpl::createWindowContext()
 {