[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/opengl vcl/source

[Michael Stahl]

 vcl/inc/opengl/DeviceInfo.hxx        |    2 +-
 vcl/inc/opengl/x11/X11DeviceInfo.hxx |    1 -
 vcl/opengl/x11/X11DeviceInfo.cxx     |    4 ----
 vcl/source/font/fontcharmap.cxx      |    6 +++---
 4 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 680464618dc67bdf0fb9c948f46b8eb1acae93ea
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 22 11:25:46 2017 +0200

    vcl: [loplugin:badstatics] rename xDefaultImplFontCharMap
    
    It looks harmless.
    
    Change-Id: Ibe54b9059f46ced95602914bf852d342aef89905

diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index 8d5137db308f..8da0e78c05c0 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -32,7 +32,7 @@ CmapResult::CmapResult( bool bSymbolic,
 ,   mbRecoded( false)
 {}
 
-static ImplFontCharMapRef xDefaultImplFontCharMap;
+static ImplFontCharMapRef g_pDefaultImplFontCharMap;
 static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0};
 static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100};
 
@@ -73,9 +73,9 @@ ImplFontCharMapRef const & ImplFontCharMap::getDefaultMap( bool bSymbols )
     }
 
     CmapResult aDefaultCR( bSymbols, pRangeCodes, nCodesCount/2 );
-    xDefaultImplFontCharMap = ImplFontCharMapRef(new ImplFontCharMap(aDefaultCR));
+    g_pDefaultImplFontCharMap = ImplFontCharMapRef(new ImplFontCharMap(aDefaultCR));
 
-    return xDefaultImplFontCharMap;
+    return g_pDefaultImplFontCharMap;
 }
 
 bool ImplFontCharMap::isDefaultMap() const
commit f2efde611c5a682a0084177e87454df188fe7df8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 22 14:33:19 2017 +0200

    vcl: [loplugin:badstatics] X11OpenGLDeviceInfo
    
    class X11OpenGLDeviceInfo actually looks harmless but it has an out-of-line
    destructor so the plugin can't see that it's harmless, so use
    default destructor instead.
    
    Change-Id: I50de6916360a944cbda3a85f4062e72e4c6d3768

diff --git a/vcl/inc/opengl/DeviceInfo.hxx b/vcl/inc/opengl/DeviceInfo.hxx
index 402a3d02e8d7..b0ad3a6cfec6 100644
--- a/vcl/inc/opengl/DeviceInfo.hxx
+++ b/vcl/inc/opengl/DeviceInfo.hxx
@@ -13,7 +13,7 @@
 class OpenGLDeviceInfo
 {
 public:
-    virtual ~OpenGLDeviceInfo();
+    virtual ~OpenGLDeviceInfo() = 0;
 
     virtual bool isDeviceBlocked() = 0;
 };
diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
index 58cb0c1bf4d9..fdc5102107ec 100644
--- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx
+++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
@@ -40,7 +40,6 @@ private:
 
 public:
     X11OpenGLDeviceInfo();
-    virtual ~X11OpenGLDeviceInfo() override;
 
     virtual bool isDeviceBlocked() override;
 
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 8b15809ea107..c270adf08d32 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -117,10 +117,6 @@ X11OpenGLDeviceInfo::X11OpenGLDeviceInfo():
     GetData();
 }
 
-X11OpenGLDeviceInfo::~X11OpenGLDeviceInfo()
-{
-}
-
 void X11OpenGLDeviceInfo::GetData()
 {
     if (!glx::glxtest_pipe)