summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
authorMichael T. Whiteley <mike@whiteley.org>2011-12-07 02:33:51 -0800
committerTor Lillqvist <tlillqvist@suse.com>2011-12-08 11:32:41 +0200
commitdcfd4beb213c551f6ef6ba379651bf303bd9017a (patch)
treea819f50716357c2a5561f6b9a09809cfc52d7dbf /toolkit/source
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/awt/vclxcontainer.cxx10
-rw-r--r--toolkit/source/controls/tree/treedatamodel.cxx58
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx2
-rw-r--r--toolkit/source/helper/unowrapper.cxx2
4 files changed, 36 insertions, 36 deletions
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 1245d0c2efc0..5f4685c08077 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -92,17 +92,17 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
{
SolarMutexGuard aGuard;
- // Bei allen Childs das Container-Interface abfragen...
+ // Bei allen Children das Container-Interface abfragen...
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq;
Window* pWindow = GetWindow();
if ( pWindow )
{
- sal_uInt16 nChilds = pWindow->GetChildCount();
- if ( nChilds )
+ sal_uInt16 nChildren = pWindow->GetChildCount();
+ if ( nChildren )
{
- aSeq = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >( nChilds );
+ aSeq = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >( nChildren );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pChildRefs = aSeq.getArray();
- for ( sal_uInt16 n = 0; n < nChilds; n++ )
+ for ( sal_uInt16 n = 0; n < nChildren; n++ )
{
Window* pChild = pWindow->GetChild( n );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xWP = pChild->GetComponentInterface( sal_True );
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index e5bf76733ca4..8854c4c2f0ac 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -69,7 +69,7 @@ public:
void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes );
// XMutableTreeDataModel
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode > SAL_CALL createNode( const ::com::sun::star::uno::Any& DisplayValue, ::sal_Bool ChildsOnDemand ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode > SAL_CALL createNode( const ::com::sun::star::uno::Any& DisplayValue, ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRoot( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& RootNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XTreeDataModel
@@ -97,7 +97,7 @@ class MutableTreeNode: public ::cppu::WeakAggImplHelper2< XMutableTreeNode, XSer
friend class MutableTreeDataModel;
public:
- MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildsOnDemand );
+ MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildrenOnDemand );
virtual ~MutableTreeNode();
void setParent( MutableTreeNode* pParent );
@@ -139,10 +139,10 @@ public:
}
private:
- TreeNodeVector maChilds;
+ TreeNodeVector maChildren;
Any maDisplayValue;
Any maDataValue;
- sal_Bool mbHasChildsOnDemand;
+ sal_Bool mbHasChildrenOnDemand;
::osl::Mutex maMutex;
MutableTreeNode* mpParent;
MutableTreeDataModelRef mxModel;
@@ -197,9 +197,9 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr
// XMutableTreeDataModel
//---------------------------------------------------------------------
-Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildsOnDemand ) throw (RuntimeException)
+Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) throw (RuntimeException)
{
- return new MutableTreeNode( this, aValue, bChildsOnDemand );
+ return new MutableTreeNode( this, aValue, bChildrenOnDemand );
}
//---------------------------------------------------------------------
@@ -319,9 +319,9 @@ Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( )
// class MutabelTreeNode
///////////////////////////////////////////////////////////////////////
-MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildsOnDemand )
+MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, sal_Bool bChildrenOnDemand )
: maDisplayValue( rValue )
-, mbHasChildsOnDemand( bChildsOnDemand )
+, mbHasChildrenOnDemand( bChildrenOnDemand )
, mpParent( 0 )
, mxModel( xModel )
, mbIsInserted( false )
@@ -332,8 +332,8 @@ MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const A
MutableTreeNode::~MutableTreeNode()
{
- TreeNodeVector::iterator aIter( maChilds.begin() );
- while( aIter != maChilds.end() )
+ TreeNodeVector::iterator aIter( maChildren.begin() );
+ while( aIter != maChildren.end() )
(*aIter++)->setParent(0);
}
@@ -407,7 +407,7 @@ void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >&
if( !xImpl.is() || xImpl->mbIsInserted || (this == xImpl.get()) )
throw IllegalArgumentException();
- maChilds.push_back( xImpl );
+ maChildren.push_back( xImpl );
xImpl->setParent(this);
xImpl->mbIsInserted = true;
@@ -420,7 +420,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
- if( (nChildIndex < 0) || (nChildIndex > (sal_Int32)maChilds.size()) )
+ if( (nChildIndex < 0) || (nChildIndex > (sal_Int32)maChildren.size()) )
throw IndexOutOfBoundsException();
Reference< XTreeNode > xNode( xChildNode.get() );
@@ -430,11 +430,11 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
xImpl->mbIsInserted = true;
- TreeNodeVector::iterator aIter( maChilds.begin() );
- while( (nChildIndex-- > 0) && (aIter != maChilds.end()) )
+ TreeNodeVector::iterator aIter( maChildren.begin() );
+ while( (nChildIndex-- > 0) && (aIter != maChildren.end()) )
aIter++;
- maChilds.insert( aIter, xImpl );
+ maChildren.insert( aIter, xImpl );
xImpl->setParent( this );
broadcast_changes( xNode, true );
@@ -448,16 +448,16 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw
MutableTreeNodeRef xImpl;
- if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChilds.size()) )
+ if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChildren.size()) )
{
- TreeNodeVector::iterator aIter( maChilds.begin() );
- while( nChildIndex-- && (aIter != maChilds.end()) )
+ TreeNodeVector::iterator aIter( maChildren.begin() );
+ while( nChildIndex-- && (aIter != maChildren.end()) )
aIter++;
- if( aIter != maChilds.end() )
+ if( aIter != maChildren.end() )
{
xImpl = (*aIter);
- maChilds.erase( aIter );
+ maChildren.erase( aIter );
}
}
@@ -472,14 +472,14 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw
//---------------------------------------------------------------------
-void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildsOnDemand ) throw (RuntimeException)
+void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand ) throw (RuntimeException)
{
bool bChanged;
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
- bChanged = mbHasChildsOnDemand != bChildsOnDemand;
- mbHasChildsOnDemand = bChildsOnDemand;
+ bChanged = mbHasChildrenOnDemand != bChildrenOnDemand;
+ mbHasChildrenOnDemand = bChildrenOnDemand;
}
if( bChanged )
@@ -554,9 +554,9 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
- if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChilds.size()) )
+ if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) )
throw IndexOutOfBoundsException();
- return getReference( maChilds[nChildIndex].get() );
+ return getReference( maChildren[nChildIndex].get() );
}
//---------------------------------------------------------------------
@@ -564,7 +564,7 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd
sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) throw (RuntimeException)
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
- return (sal_Int32)maChilds.size();
+ return (sal_Int32)maChildren.size();
}
//---------------------------------------------------------------------
@@ -584,10 +584,10 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod
MutableTreeNodeRef xImpl( MutableTreeNode::getImplementation( xNode, false ) );
if( xImpl.is() )
{
- sal_Int32 nChildCount = maChilds.size();
+ sal_Int32 nChildCount = maChildren.size();
while( nChildCount-- )
{
- if( maChilds[nChildCount] == xImpl )
+ if( maChildren[nChildCount] == xImpl )
return nChildCount;
}
}
@@ -600,7 +600,7 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod
sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand( ) throw (RuntimeException)
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
- return mbHasChildsOnDemand;
+ return mbHasChildrenOnDemand;
}
//---------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 881a542d15ff..a10a799fcd94 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -776,7 +776,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT
// eigenes Peer erzeugen
UnoControl::createPeer( rxToolkit, rParent );
- // alle Peers der Childs erzeugen
+ // alle Peers der Children erzeugen
if ( !mbCreatingCompatiblePeer )
{
// Evaluate "Step" property
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 105770f03b6d..81476ed37d5a 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -258,7 +258,7 @@ sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
void UnoWrapper::WindowDestroyed( Window* pWindow )
{
- // ggf. existieren noch von ::com::sun::star::loader::Java erzeugte Childs, die sonst erst
+ // ggf. existieren noch von ::com::sun::star::loader::Java erzeugte Children, die sonst erst
// im Garbage-Collector zerstoert werden...
Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
while ( pChild )