include/oox/helper/grabbagstack.hxx | 6 +++---
include/oox/ppt/customshowlistcontext.hxx | 2 +-
oox/source/helper/grabbagstack.cxx | 10 +++++-----
oox/source/ppt/customshowlistcontext.cxx | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1d4c0528a8085a86fa2e260847f5b794ebb0c41d
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sun Dec 27 02:28:17 2015 +1100
oox: change instances of maName to more descriptive names
Change-Id: Iee410ec4d256eb5b663d88e048d5bf6200845256
Reviewed-on: https://gerrit.libreoffice.org/20959
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/include/oox/helper/grabbagstack.hxx
b/include/oox/helper/grabbagstack.hxx
index 10bc996..c7ba1b1 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<css::beans::PropertyValue> 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 fac3b02..136d6e5 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 ea0df7f..71bea8e 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 133fd25..e45b98b 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
