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

[Miklos Vajna]

 vcl/source/opengl/OpenGLContext.cxx |    8 ++++----
 vcl/unx/gtk3/gtk3gtkinst.cxx        |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2465cb26763b2ed8de65f35bce791fb55fe0e746
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 28 14:04:44 2016 +0200

    vcl: fix loplugin:stylepolice
    
    Change-Id: I40455e04a5f69dc0956ccb01c48d8a40245a4506

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 3da890a..2b1e6be 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -790,8 +790,8 @@ bool OpenGLContext::ImplInit()
     m_aGLWin.GLExtensions = glGetString( GL_EXTENSIONS );
     SAL_INFO("vcl.opengl", "available GL  extensions: " << m_aGLWin.GLExtensions);
 
-    XWindowAttributes xWinAttr;
-    if( !XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, &xWinAttr ) )
+    XWindowAttributes aWinAttr;
+    if( !XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, &aWinAttr ) )
     {
         SAL_WARN("vcl.opengl", "Failed to get window attributes on " << m_aGLWin.win);
         m_aGLWin.Width = 0;
@@ -799,8 +799,8 @@ bool OpenGLContext::ImplInit()
     }
     else
     {
-        m_aGLWin.Width = xWinAttr.width;
-        m_aGLWin.Height = xWinAttr.height;
+        m_aGLWin.Width = aWinAttr.width;
+        m_aGLWin.Height = aWinAttr.height;
     }
 
     if( m_aGLWin.HasGLXExtension("GLX_SGI_swap_control" ) )
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9c33c40..768f4b1 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -590,7 +590,7 @@ void VclGtkClipboard::setContents(
     m_aContents = xTrans;
     m_aOwner = xClipboardOwner;
 
-    std::list< Reference< datatransfer::clipboard::XClipboardListener > > xListeners( m_aListeners );
+    std::list< Reference< datatransfer::clipboard::XClipboardListener > > aListeners( m_aListeners );
     datatransfer::clipboard::ClipboardEvent aEv;
 
     if (m_aContents.is())
@@ -624,7 +624,7 @@ void VclGtkClipboard::setContents(
     if( xOldOwner.is() && xOldOwner != xClipboardOwner )
         xOldOwner->lostOwnership( this, xOldContents );
     for( std::list< Reference< datatransfer::clipboard::XClipboardListener > >::iterator it =
-         xListeners.begin(); it != xListeners.end() ; ++it )
+         aListeners.begin(); it != aListeners.end() ; ++it )
     {
         (*it)->changedContents( aEv );
     }