diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-22 16:25:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-22 16:26:51 +0100 |
| commit | bba580fad5ebe7643d4c6879f065d49102bf5069 (patch) | |
| tree | e0bde89ed1469ed5252b2b517b536ca4e27b0a84 /vcl | |
| parent | 1c3e88a4ffd927d4dda8bb9e0d05cddc6cd685c0 (diff) | |
loplugin:datamembershadow
Change-Id: If9e9371569750dd2c970450b808c6c5567faae55
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/opengl/win/gdiimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/opengl/win/gdiimpl.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx index 8102d2ef5c07..1ea54be23dca 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 93e7cb904293..6215c4c20a2d 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. |