diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-27 02:28:17 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-26 19:05:45 +0000 |
| commit | 1d4c0528a8085a86fa2e260847f5b794ebb0c41d (patch) | |
| tree | 560ed9e8a2950c19c7a377bf5188570223f99e30 /oox | |
| parent | 422bedb783b9484a7a4b0de5b7ee4634cf6c972c (diff) | |
oox: change instances of maName to more descriptive names
Change-Id: Iee410ec4d256eb5b663d88e048d5bf6200845256
Reviewed-on: https://gerrit.libreoffice.org/20959
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/helper/grabbagstack.cxx | 10 | ||||
| -rw-r--r-- | oox/source/ppt/customshowlistcontext.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx index ea0df7f3cd2e..71bea8e26bea 100644 --- a/oox/source/helper/grabbagstack.cxx +++ b/oox/source/helper/grabbagstack.cxx @@ -18,9 +18,9 @@ namespace oox using namespace css::beans; using namespace css::uno; -GrabBagStack::GrabBagStack(const OUString& aName) +GrabBagStack::GrabBagStack(const OUString& aElementName) { - mCurrentElement.maName = aName; + mCurrentElement.maElementName = aElementName; } GrabBagStack::~GrabBagStack() @@ -37,7 +37,7 @@ PropertyValue GrabBagStack::getRootProperty() pop(); PropertyValue aProperty; - aProperty.Name = mCurrentElement.maName; + aProperty.Name = mCurrentElement.maElementName; aProperty.Value = makeAny(comphelper::containerToSequence(mCurrentElement.maPropertyList)); return aProperty; @@ -54,13 +54,13 @@ void GrabBagStack::appendElement(const OUString& aName, Any aAny) void GrabBagStack::push(const OUString& aKey) { mStack.push(mCurrentElement); - mCurrentElement.maName = aKey; + mCurrentElement.maElementName = aKey; mCurrentElement.maPropertyList.clear(); } void GrabBagStack::pop() { - OUString aName = mCurrentElement.maName; + OUString aName = mCurrentElement.maElementName; Sequence<PropertyValue> aSequence(comphelper::containerToSequence(mCurrentElement.maPropertyList)); mCurrentElement = mStack.top(); mStack.pop(); diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index 133fd25cda24..e45b98befb40 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -43,7 +43,7 @@ CustomShowContext::CustomShowContext( FragmentHandler2& rParent, : FragmentHandler2( rParent ) , mrCustomShow( rCustomShow ) { - mrCustomShow.maName = rxAttribs->getOptionalValue( XML_name ); + mrCustomShow.maCustomShowName = rxAttribs->getOptionalValue( XML_name ); mrCustomShow.mnId = rxAttribs->getOptionalValue( XML_id ); } |