[Libreoffice-commits] core.git: oox/source

[Miklos Vajna]

 oox/source/shape/LockedCanvasContext.cxx |    6 +++---
 oox/source/shape/LockedCanvasContext.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0d6cb9f8455844c58ff52f220eebbf04ad18bddc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jul 21 09:05:21 2017 +0200

    oox: fix inconsistent param naming in interface/implementation
    
    Make sure they match.
    
    Change-Id: Ib3ce948a29472281705e361792c924893ad97b32
    Reviewed-on: https://gerrit.libreoffice.org/40259
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index a36cb601b492..add56c4b09b1 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -27,9 +27,9 @@ LockedCanvasContext::LockedCanvasContext(ContextHandler2Helper& rParent)
 
 LockedCanvasContext::~LockedCanvasContext() = default;
 
-::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext(sal_Int32 aElementToken, const ::oox::AttributeList& /*rAttribs*/)
+::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& /*rAttribs*/)
 {
-    switch (getBaseToken(aElementToken))
+    switch (getBaseToken(nElementToken))
     {
     case XML_lockedCanvas:
         break;
@@ -52,7 +52,7 @@ LockedCanvasContext::~LockedCanvasContext() = default;
         return new oox::drawingml::ShapeGroupContext(*this, pMasterShape, mpShape);
     }
     default:
-        SAL_WARN("oox", "LockedCanvasContext::createFastChildContext: unhandled element:" << getBaseToken(aElementToken));
+        SAL_WARN("oox", "LockedCanvasContext::createFastChildContext: unhandled element:" << getBaseToken(nElementToken));
         break;
     }
     return nullptr;
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index 6817008e9a89..d500f12dd082 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -25,7 +25,7 @@ public:
     explicit LockedCanvasContext(oox::core::ContextHandler2Helper& rParent);
     ~LockedCanvasContext() override;
 
-    oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) override;
+    oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const ::oox::AttributeList& rAttribs) override;
 
     const oox::drawingml::ShapePtr& getShape() const
     {