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

[Tor Lillqvist]

 vcl/opengl/gdiimpl.cxx     |   10 +++++-----
 vcl/unx/gtk/gtksalmenu.cxx |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c994d59fe05a6b54d8821ac0db9efa9b87fe2e7e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 11 15:01:11 2016 +0300

    loplugin:implicitboolconversion
    
    Silly fix for "Implicit conversion (IntegralCast) from 'bool' to
    'gint8' (aka 'signed char')". The GLib TRUE is defined as !FALSE, thus
    it is a bool value, which the loplugin doesn't then like being
    assigned to a 'signed char'.
    
    Change-Id: I04ae41c0ff89adad8962954e04215026b5f79c4c

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 4145afa..66f138d 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -642,7 +642,7 @@ bool GtkSalMenu::TakeFocus()
     //(given that we wnt to show it with no menus popped down)
     GdkEvent *event = gdk_event_new(GDK_KEY_PRESS);
     event->key.window = GDK_WINDOW(g_object_ref(gtk_widget_get_window(mpMenuBarWidget)));
-    event->key.send_event = TRUE;
+    event->key.send_event = 1 /* TRUE */;
     event->key.time = gtk_get_current_event_time();
     event->key.state = 0;
     event->key.keyval = 0;
commit 9b1febead3f026a53211de492fdb72d7ae89e2e4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 11 14:52:38 2016 +0300

    There is nothing called 'flushAndSwap'
    
    Probably what is meant is the name of the function, which is doFlush().
    
    Change-Id: Ia949a2f8ce19950b1cd0b676c5146488ce7182ee

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index c2b2ae3..b23b382 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -2527,13 +2527,13 @@ void OpenGLSalGraphicsImpl::doFlush()
 
     if( !maOffscreenTex )
     {
-        VCL_GL_INFO( "flushAndSwap - odd no texture !" );
+        VCL_GL_INFO( "doFlush - odd no texture !" );
         return;
     }
 
     if( mnDrawCountAtFlush == mnDrawCount )
     {
-        VCL_GL_INFO( "eliding redundant flushAndSwap, no drawing since last!" );
+        VCL_GL_INFO( "eliding redundant doFlush, no drawing since last!" );
         return;
     }
 
@@ -2541,7 +2541,7 @@ void OpenGLSalGraphicsImpl::doFlush()
 
     OpenGLZone aZone;
 
-    VCL_GL_INFO( "flushAndSwap" );
+    VCL_GL_INFO( "doFlush" );
 
     if( !mpWindowContext.is() )
     {
@@ -2557,7 +2557,7 @@ void OpenGLSalGraphicsImpl::doFlush()
     mpWindowContext->makeCurrent();
     CHECK_GL_ERROR();
 
-    VCL_GL_INFO( "flushAndSwap - acquire default framebuffer" );
+    VCL_GL_INFO( "doFlush - acquire default framebuffer" );
 
     mpWindowContext->state()->sync();
 
@@ -2614,7 +2614,7 @@ void OpenGLSalGraphicsImpl::doFlush()
             mpWindowContext->swapBuffers();
     }
 
-    VCL_GL_INFO( "flushAndSwap - end." );
+    VCL_GL_INFO( "doFlush - end." );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */