mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: change instances of maName to more descriptive names

Browse Source 
Change-Id: Iee410ec4d256eb5b663d88e048d5bf6200845256
Reviewed-on: https://gerrit.libreoffice.org/20959
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
This commit is contained in:
Chris Sherlock
2015-12-27 02:28:17 +11:00
parent 422bedb783
commit 1d4c0528a8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/oox/helper/grabbagstack.hxx
View File

@@ -22,7 +22,7 @@ namespace oox {
struct GrabBagStackElement struct GrabBagStackElement
{ {
OUString maName; OUString maElementName;
std::vector<css::beans::PropertyValue> maPropertyList; std::vector<css::beans::PropertyValue> maPropertyList;
}; };
@@ -34,11 +34,11 @@ private:
GrabBagStackElement mCurrentElement; GrabBagStackElement mCurrentElement;
public: public:
GrabBagStack(const OUString& aName); GrabBagStack(const OUString& aElementName);
virtual ~GrabBagStack(); virtual ~GrabBagStack();
OUString getCurrentName() { return mCurrentElement.maName;} OUString getCurrentName() { return mCurrentElement.maElementName;}
css::beans::PropertyValue getRootProperty(); css::beans::PropertyValue getRootProperty();

2
include/oox/ppt/customshowlistcontext.hxx
View File

@@ -28,7 +28,7 @@ namespace oox { namespace ppt {
struct CustomShow struct CustomShow
{ {
OUString maName; OUString maCustomShowName;
OUString mnId; OUString mnId;
std::vector< OUString >maSldLst; std::vector< OUString >maSldLst;
}; };

10
oox/source/helper/grabbagstack.cxx
View File

@@ -18,9 +18,9 @@ namespace oox
using namespace css::beans; using namespace css::beans;
using namespace css::uno; using namespace css::uno;
GrabBagStack::GrabBagStack(const OUString& aName) GrabBagStack::GrabBagStack(const OUString& aElementName)
{ {
mCurrentElement.maName = aName; mCurrentElement.maElementName = aElementName;
} }
GrabBagStack::~GrabBagStack() GrabBagStack::~GrabBagStack()
@@ -37,7 +37,7 @@ PropertyValue GrabBagStack::getRootProperty()
pop(); pop();
PropertyValue aProperty; PropertyValue aProperty;
aProperty.Name = mCurrentElement.maName; aProperty.Name = mCurrentElement.maElementName;
aProperty.Value = makeAny(comphelper::containerToSequence(mCurrentElement.maPropertyList)); aProperty.Value = makeAny(comphelper::containerToSequence(mCurrentElement.maPropertyList));
return aProperty; return aProperty;
@@ -54,13 +54,13 @@ void GrabBagStack::appendElement(const OUString& aName, Any aAny)
void GrabBagStack::push(const OUString& aKey) void GrabBagStack::push(const OUString& aKey)
{ {
mStack.push(mCurrentElement); mStack.push(mCurrentElement);
mCurrentElement.maName = aKey; mCurrentElement.maElementName = aKey;
mCurrentElement.maPropertyList.clear(); mCurrentElement.maPropertyList.clear();
} }
void GrabBagStack::pop() void GrabBagStack::pop()
{ {
OUString aName = mCurrentElement.maName; OUString aName = mCurrentElement.maElementName;
Sequence<PropertyValue> aSequence(comphelper::containerToSequence(mCurrentElement.maPropertyList)); Sequence<PropertyValue> aSequence(comphelper::containerToSequence(mCurrentElement.maPropertyList));
mCurrentElement = mStack.top(); mCurrentElement = mStack.top();
mStack.pop(); mStack.pop();

2
oox/source/ppt/customshowlistcontext.cxx
View File

@@ -43,7 +43,7 @@ CustomShowContext::CustomShowContext( FragmentHandler2& rParent,
: FragmentHandler2( rParent ) : FragmentHandler2( rParent )
, mrCustomShow( rCustomShow ) , mrCustomShow( rCustomShow )
{ {
mrCustomShow.maName = rxAttribs->getOptionalValue( XML_name ); mrCustomShow.maCustomShowName = rxAttribs->getOptionalValue( XML_name );
mrCustomShow.mnId = rxAttribs->getOptionalValue( XML_id ); mrCustomShow.mnId = rxAttribs->getOptionalValue( XML_id );
} }