vcl/inc/skia/x11/gdiimpl.hxx | 2 +- vcl/skia/x11/gdiimpl.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 9fc59269179698f39e220212b798026b042fbae6 Author: Luboš Luňák <[email protected]> AuthorDate: Mon Oct 14 15:43:08 2019 +0200 Commit: Luboš Luňák <[email protected]> CommitDate: Thu Oct 24 11:36:32 2019 +0200 fix warning from loplugin:datamembershadow Change-Id: I1a15cf12adff559032f7737c14f56346063d0562 diff --git a/vcl/inc/skia/x11/gdiimpl.hxx b/vcl/inc/skia/x11/gdiimpl.hxx index 8797fb583ab8..1c40aa6b2c28 100644 --- a/vcl/inc/skia/x11/gdiimpl.hxx +++ b/vcl/inc/skia/x11/gdiimpl.hxx @@ -24,7 +24,7 @@ class WindowContext; class VCL_PLUGIN_PUBLIC X11SkiaSalGraphicsImpl : public SkiaSalGraphicsImpl, public X11GraphicsImpl { private: - X11SalGraphics& mParent; + X11SalGraphics& mX11Parent; public: X11SkiaSalGraphicsImpl(X11SalGraphics& rParent); diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx index d1eee613501f..72f3e65b5859 100644 --- a/vcl/skia/x11/gdiimpl.cxx +++ b/vcl/skia/x11/gdiimpl.cxx @@ -23,7 +23,7 @@ X11SkiaSalGraphicsImpl::X11SkiaSalGraphicsImpl(X11SalGraphics& rParent) : SkiaSalGraphicsImpl(rParent, rParent.GetGeometryProvider()) - , mParent(rParent) + , mX11Parent(rParent) { } @@ -32,7 +32,7 @@ X11SkiaSalGraphicsImpl::~X11SkiaSalGraphicsImpl() {} void X11SkiaSalGraphicsImpl::Init() { // The m_pFrame and m_pVDev pointers are updated late in X11 - setProvider(mParent.GetGeometryProvider()); + setProvider(mX11Parent.GetGeometryProvider()); SkiaSalGraphicsImpl::Init(); } @@ -48,11 +48,11 @@ void X11SkiaSalGraphicsImpl::createSurface() displayParams.fColorType = GET_FORMAT; #undef GET_FORMAT sk_app::window_context_factory::XlibWindowInfo winInfo; - winInfo.fDisplay = mParent.GetXDisplay(); - winInfo.fWindow = mParent.GetDrawable(); + winInfo.fDisplay = mX11Parent.GetXDisplay(); + winInfo.fWindow = mX11Parent.GetDrawable(); assert(winInfo.fDisplay && winInfo.fWindow != None); winInfo.fFBConfig = nullptr; // not used - winInfo.fVisualInfo = const_cast<SalVisual*>(&mParent.GetVisual()); + winInfo.fVisualInfo = const_cast<SalVisual*>(&mX11Parent.GetVisual()); winInfo.fWidth = GetWidth(); winInfo.fHeight = GetHeight(); switch (renderMethodToUse()) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
