diff options
author | Michael T. Whiteley <mike@whiteley.org> | 2011-12-07 02:33:51 -0800 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-08 11:32:41 +0200 |
commit | dcfd4beb213c551f6ef6ba379651bf303bd9017a (patch) | |
tree | a819f50716357c2a5561f6b9a09809cfc52d7dbf /xmloff/source | |
parent | ad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff) |
childs -> children
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/draw/ximp3dscene.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/IgnoreTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/MergeElemTContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/MetaTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/PersAttrListTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerContext.hxx | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index bff6431d0e0a..a98bd329aab2 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -131,9 +131,9 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { SetStyle(); - mxChilds = uno::Reference< drawing::XShapes >::query( mxShape ); - if( mxChilds.is() ) - GetImport().GetShapeImport()->pushGroupForSorting( mxChilds ); + mxChildren = uno::Reference< drawing::XShapes >::query( mxShape ); + if( mxChildren.is() ) + GetImport().GetShapeImport()->pushGroupForSorting( mxChildren ); SetLayer(); @@ -172,7 +172,7 @@ void SdXML3DSceneShapeContext::EndElement() setSceneAttributes( xPropSet ); } - if( mxChilds.is() ) + if( mxChildren.is() ) GetImport().GetShapeImport()->popGroupAndSort(); // call parent @@ -209,7 +209,7 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPr if(!pContext) { pContext = GetImport().GetShapeImport()->Create3DSceneChildContext( - GetImport(), nPrefix, rLocalName, xAttrList, mxChilds); + GetImport(), nPrefix, rLocalName, xAttrList, mxChildren); } // call parent when no own context was created diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 7ed5d9363476..58989d158c1b 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -44,14 +44,14 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt { // the shape group this group is working on // this is the scene at the same time - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChilds; + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); } SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } protected: void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) - { mxChilds = rNew; } + { mxChildren = rNew; } public: TYPEINFO(); diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 28d411e74fa3..2a03e47a818a 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -85,7 +85,7 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPref { // call GroupChildContext function at common ShapeImport pContext = GetImport().GetShapeImport()->CreateGroupChildContext( - GetImport(), nPrefix, rLocalName, xAttrList, mxChilds); + GetImport(), nPrefix, rLocalName, xAttrList, mxChildren); } // call parent when no own context was created @@ -108,9 +108,9 @@ void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttri { SetStyle( false ); - mxChilds = uno::Reference< drawing::XShapes >::query( mxShape ); - if( mxChilds.is() ) - GetImport().GetShapeImport()->pushGroupForSorting( mxChilds ); + mxChildren = uno::Reference< drawing::XShapes >::query( mxShape ); + if( mxChildren.is() ) + GetImport().GetShapeImport()->pushGroupForSorting( mxChildren ); } GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes ); @@ -120,7 +120,7 @@ void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttri void SdXMLGroupShapeContext::EndElement() { - if( mxChilds.is() ) + if( mxChildren.is() ) GetImport().GetShapeImport()->popGroupAndSort(); SdXMLShapeContext::EndElement(); diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 9295a75fe1f9..8bd98bdd9de3 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -42,7 +42,7 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext { // the shape group this group is working on - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChilds; + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; protected: void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 45a311c3b5d2..71d390dd0748 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -64,7 +64,7 @@ public: // EndElement instead if this is required. virtual ~XMLIgnoreTransformerContext(); - // Create a childs element context. By default, the import's + // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index b15c0fb857c6..eb52101b8540 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -50,7 +50,7 @@ public: virtual ~XMLParagraphTransformerContext(); - // Create a childs element context. By default, the import's + // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index 0d48a4069d08..7ccca93c84b3 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -61,7 +61,7 @@ public: // EndElement instead if this is required. virtual ~XMLMetaTransformerContext(); - // Create a childs element context. By default, the import's + // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 54aca4b14819..933197cb2f5a 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -79,7 +79,7 @@ public: // EndElement instead if this is required. virtual ~XMLPersAttrListTContext(); - // Create a childs element context. By default, the import's + // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 07b33e026ed9..3866cf81de2e 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -80,7 +80,7 @@ public: // EndElement instead if this is required. virtual ~XMLTransformerContext(); - // Create a childs element context. By default, the import's + // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, |