diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx index 10bc99627936..c7ba1b106800 100644 --- a/include/oox/helper/grabbagstack.hxx +++ b/include/oox/helper/grabbagstack.hxx @@ -22,7 +22,7 @@ namespace oox { struct GrabBagStackElement { - OUString maName; + OUString maElementName; std::vector maPropertyList; }; @@ -34,11 +34,11 @@ private: GrabBagStackElement mCurrentElement; public: - GrabBagStack(const OUString& aName); + GrabBagStack(const OUString& aElementName); virtual ~GrabBagStack(); - OUString getCurrentName() { return mCurrentElement.maName;} + OUString getCurrentName() { return mCurrentElement.maElementName;} css::beans::PropertyValue getRootProperty(); diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx index fac3b0216b73..136d6e53adf8 100644 --- a/include/oox/ppt/customshowlistcontext.hxx +++ b/include/oox/ppt/customshowlistcontext.hxx @@ -28,7 +28,7 @@ namespace oox { namespace ppt { struct CustomShow { - OUString maName; + OUString maCustomShowName; OUString mnId; std::vector< OUString >maSldLst; }; 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 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 ); }