vcl/inc/opengl/win/gdiimpl.hxx | 2 +-
vcl/opengl/win/gdiimpl.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bba580fad5ebe7643d4c6879f065d49102bf5069
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 22 16:25:51 2016 +0100
loplugin:datamembershadow
Change-Id: If9e9371569750dd2c970450b808c6c5567faae55
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 8102d2e..1ea54be 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -20,7 +20,7 @@ class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
{
friend class WinLayout;
private:
- WinSalGraphics& mrParent;
+ WinSalGraphics& mrWinParent;
bool RenderCompatibleDC(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC&
rBlack,
int nX, int nY, TextureCombo& rCombo);
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 93e7cb9..6215c4c 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -700,7 +700,7 @@ OpenGLContext* WinSalInstance::CreateOpenGLContext()
WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics,
SalGeometryProvider
*mpProvider):
OpenGLSalGraphicsImpl(rGraphics,mpProvider),
- mrParent(rGraphics)
+ mrWinParent(rGraphics)
{
}
@@ -714,7 +714,7 @@ rtl::Reference<OpenGLContext>
WinOpenGLSalGraphicsImpl::CreateWinContext()
{
rtl::Reference<WinOpenGLContext> xContext(new WinOpenGLContext);
xContext->setVCLOnly();
- if (!xContext->init(mrParent.mhLocalDC, mrParent.mhWnd))
+ if (!xContext->init(mrWinParent.mhLocalDC, mrWinParent.mhWnd))
{
SAL_WARN("vcl.opengl", "Context could not be created.");
return rtl::Reference<OpenGLContext>();
@@ -727,7 +727,7 @@ void WinOpenGLSalGraphicsImpl::Init()
if (!IsOffscreen() && mpContext.is() && mpContext->isInitialized())
{
const GLWinWindow& rGLWindow = static_cast<const
GLWinWindow&>(mpContext->getOpenGLWindow());
- if (rGLWindow.hWnd != mrParent.mhWnd || rGLWindow.hDC ==
mrParent.mhLocalDC)
+ if (rGLWindow.hWnd != mrWinParent.mhWnd || rGLWindow.hDC ==
mrWinParent.mhLocalDC)
{
// This can legitimately happen, SalFrame keeps 2x
// SalGraphics which share the same hWnd and hDC.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
