replacing childs w/ children (more later)
Mike
From 8ca96e7fa7e37f40a85d67b7511bcb6fb35ce9f0 Mon Sep 17 00:00:00 2001
From: Michael T. Whiteley <mike@whiteley.org>
Date: Wed, 7 Dec 2011 02:33:51 -0800
Subject: [PATCH] childs -> children
---
UnoControls/source/base/basecontainercontrol.cxx | 2 +-
UnoControls/source/controls/progressmonitor.cxx | 2 +-
UnoControls/source/controls/statusindicator.cxx | 2 +-
animations/source/animcore/animcore.cxx | 62 ++++----
autodoc/inc/ary/symtreenode.hxx | 2 +-
basctl/source/basicide/baside2.hxx | 2 +-
basctl/source/basicide/baside2b.cxx | 2 +-
basctl/source/basicide/bastype2.hxx | 2 +-
basctl/source/basicide/bastype3.cxx | 10 +-
basctl/source/dlged/dlgedobj.cxx | 22 ++--
basctl/source/inc/dlgedobj.hxx | 4 +-
basic/source/sbx/sbxvar.cxx | 8 +-
connectivity/source/inc/dbase/dindexnode.hxx | 4 +-
connectivity/source/parse/sqlnode.cxx | 2 +-
cui/source/customize/acccfg.cxx | 2 +-
cui/source/customize/cfgutil.cxx | 12 +-
cui/source/customize/selector.cxx | 12 +-
cui/source/dialogs/scriptdlg.cxx | 10 +-
cui/source/inc/cfgutil.hxx | 2 +-
cui/source/inc/scriptdlg.hxx | 2 +-
cui/source/inc/selector.hxx | 4 +-
dbaccess/source/ui/browser/formadapter.cxx | 2 +-
dbaccess/source/ui/browser/unodatbr.cxx | 6 +-
dbaccess/source/ui/control/FieldDescControl.cxx | 2 +-
dbaccess/source/ui/control/dbtreelistbox.cxx | 10 +-
dbaccess/source/ui/control/marktree.cxx | 6 +-
dbaccess/source/ui/control/tabletree.cxx | 4 +-
dbaccess/source/ui/dlg/adtabdlg.cxx | 6 +-
dbaccess/source/ui/dlg/tablespage.cxx | 2 +-
dbaccess/source/ui/inc/TableDesignView.hxx | 2 +-
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 +-
dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +-
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 4 +-
.../source/ui/tabledesign/TableFieldDescWin.cxx | 2 +-
dmake/unix/runargv.c | 6 +-
.../source/primitive2d/graphicprimitive2d.cxx | 2 +-
.../source/processor2d/vclmetafileprocessor2d.cxx | 2 +-
editeng/inc/editeng/outliner.hxx | 8 +-
.../accessibility/AccessibleEditableTextPara.cxx | 2 +-
.../source/accessibility/AccessibleImageBullet.cxx | 2 +-
editeng/source/outliner/outlin2.cxx | 2 +-
editeng/source/outliner/outliner.cxx | 14 +-
editeng/source/outliner/outlvw.cxx | 26 ++--
editeng/source/outliner/paralist.cxx | 6 +-
editeng/source/outliner/paralist.hxx | 6 +-
extensions/source/propctrlr/selectlabeldialog.cxx | 2 +-
forms/source/inc/InterfaceContainer.hxx | 2 +-
forms/source/xforms/binding.cxx | 2 +-
forms/source/xforms/binding.hxx | 2 +-
framework/inc/classes/framecontainer.hxx | 4 +-
framework/inc/helper/oframes.hxx | 2 +-
framework/inc/helper/statusindicatorfactory.hxx | 2 +-
framework/inc/services/desktop.hxx | 2 +-
framework/source/helper/oframes.cxx | 2 +-
framework/source/jobs/helponstartup.cxx | 4 +-
framework/source/services/desktop.cxx | 16 +-
framework/source/services/frame.cxx | 10 +-
l10ntools/inc/xmlparse.hxx | 2 +-
l10ntools/source/filter/utils/FileHelper.java | 16 +-
l10ntools/source/filter/utils/XMLHelper.java | 36 ++--
l10ntools/source/helpmerge.cxx | 2 +-
l10ntools/source/xmlparse.cxx | 6 +-
moz/seamonkey-source-1.1.14.patch | 146 ++++++++--------
package/source/xstor/xstorage.cxx | 2 +-
.../ifc/accessibility/_XAccessibleSelection.java | 18 +-
.../java/ifc/accessibility/_XAccessibleTable.java | 8 +-
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 4 +-
.../mod/_svtools/AccessibleIconChoiceCtrl.java | 2 +-
.../layoutprocessor/TableCellLayoutController.java | 2 +-
.../star/report/pentaho/model/OfficeStyles.java | 8 +-
.../star/report/pentaho/output/StylesWriter.java | 8 +-
.../parser/style/OfficeStyleReadHandler.java | 10 +-
.../parser/style/OfficeStylesReadHandler.java | 40 +++---
.../parser/style/PageLayoutReadHandler.java | 10 +-
.../parser/style/StyleDefinitionReadHandler.java | 12 +-
rsc/doku/feinkonz.43/rsc.sdw | Bin 89271 -> 89277 bytes
.../AccessibleDocumentPagePreview.cxx | 180 ++++++++++----------
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 14 +-
sc/source/ui/inc/acredlin.hxx | 6 +-
sc/source/ui/inc/anyrefdg.hxx | 2 +-
sc/source/ui/miscdlgs/acredlin.cxx | 30 ++--
sc/source/ui/miscdlgs/anyrefdg.cxx | 6 +-
scripting/source/basprov/basprov.cxx | 8 +-
.../source/provider/BrowseNodeFactoryImpl.cxx | 14 +-
sd/source/filter/ppt/pptinanimations.cxx | 2 +-
sd/source/ui/dlg/navigatr.cxx | 2 +-
sd/source/ui/dlg/sdtreelb.cxx | 24 ++--
sd/source/ui/func/unmovss.cxx | 2 +-
sd/source/ui/inc/sdtreelb.hxx | 4 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 10 +-
sd/source/ui/view/outlnvsh.cxx | 6 +-
sfx2/inc/docvor.hxx | 4 +-
sfx2/inc/sfx2/objsh.hxx | 2 +-
sfx2/source/appl/newhelp.cxx | 6 +-
sfx2/source/appl/newhelp.hxx | 2 +-
sfx2/source/appl/workwin.cxx | 146 ++++++++--------
sfx2/source/dialog/splitwin.cxx | 24 ++--
sfx2/source/dialog/templdlg.cxx | 24 ++--
sfx2/source/doc/docvor.cxx | 34 ++--
sfx2/source/doc/objcont.cxx | 2 +-
sfx2/source/doc/objmisc.cxx | 2 +-
sfx2/source/inc/workwin.hxx | 16 +-
sfx2/source/view/frame.cxx | 4 +-
sfx2/source/view/frame2.cxx | 2 +-
sfx2/source/view/viewfrm2.cxx | 4 +-
svtools/inc/svtools/svlbox.hxx | 12 +-
svtools/inc/svtools/svtabbx.hxx | 4 +-
svtools/inc/svtools/svtreebx.hxx | 12 +-
svtools/inc/svtools/treelist.hxx | 24 ++--
svtools/source/contnr/svimpbox.cxx | 24 ++--
svtools/source/contnr/svlbox.cxx | 38 ++--
svtools/source/contnr/svtabbx.cxx | 4 +-
svtools/source/contnr/svtreebx.cxx | 40 +++---
svtools/source/contnr/treelist.cxx | 176 ++++++++++----------
svtools/source/dialogs/filedlg2.cxx | 10 +-
svtools/source/dialogs/filedlg2.hxx | 2 +-
svtools/source/inc/svimpbox.hxx | 2 +-
svtools/source/uno/treecontrolpeer.cxx | 8 +-
svtools/workben/treecontrol/treetest.cxx | 6 +-
svx/inc/accessibility.hrc | 2 +-
svx/inc/svx/checklbx.hxx | 2 +-
svx/inc/svx/dlgctrl.hxx | 2 +-
.../accessibility/svxrectctaccessiblecontext.cxx | 34 ++--
svx/source/dialog/checklbx.cxx | 4 +-
svx/source/dialog/dlgctrl.cxx | 2 +-
svx/source/form/fmexpl.cxx | 16 +-
svx/source/form/fmshimp.cxx | 2 +-
svx/source/form/fmvwimp.cxx | 6 +-
svx/source/form/formcontroller.cxx | 20 +-
svx/source/form/navigatortree.cxx | 8 +-
svx/source/form/navigatortreemodel.cxx | 6 +-
svx/source/inc/fmexpl.hxx | 6 +-
svx/source/inc/formcontroller.hxx | 2 +-
svx/source/inc/svxrectctaccessiblecontext.hxx | 4 +-
.../chinese_dictionarydialog.cxx | 4 +-
sw/inc/SwNumberTree.hxx | 2 +-
sw/inc/crsrsh.hxx | 2 +-
sw/source/core/SwNumberTree/SwNumberTree.cxx | 4 +-
sw/source/core/crsr/crstrvl.cxx | 6 +-
sw/source/core/docnode/section.cxx | 6 +-
sw/source/core/draw/dview.cxx | 6 +-
sw/source/core/inc/dview.hxx | 6 +-
sw/source/ui/dbui/dbtree.cxx | 14 +-
sw/source/ui/dialog/uiregionsw.cxx | 4 +-
sw/source/ui/inc/conttree.hxx | 2 +-
sw/source/ui/inc/dbtree.hxx | 2 +-
sw/source/ui/inc/redlndlg.hxx | 4 +-
sw/source/ui/index/cnttab.cxx | 4 +-
sw/source/ui/misc/redlndlg.cxx | 34 ++--
sw/source/ui/utlui/content.cxx | 24 ++--
sw/source/ui/utlui/navipi.cxx | 14 +-
toolkit/source/awt/vclxcontainer.cxx | 10 +-
toolkit/source/controls/tree/treedatamodel.cxx | 58 +++---
toolkit/source/controls/unocontrolcontainer.cxx | 2 +-
toolkit/source/helper/unowrapper.cxx | 2 +-
ucb/source/ucp/file/bc.cxx | 2 +-
ucb/source/ucp/file/shell.cxx | 26 ++--
ucb/source/ucp/file/shell.hxx | 6 +-
ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 6 +-
vcl/inc/vcl/window.hxx | 20 +-
vcl/inc/window.h | 4 +-
vcl/source/app/svapp.cxx | 4 +-
vcl/source/gdi/octree.cxx | 6 +-
vcl/source/window/tabdlg.cxx | 2 +-
vcl/source/window/window.cxx | 82 +++++-----
vcl/unx/gtk/a11y/atklistener.cxx | 2 +-
xmlhelp/source/treeview/tvread.cxx | 20 +-
xmloff/inc/xmloff/xmlictxt.hxx | 2 +-
xmloff/source/draw/ximp3dscene.cxx | 10 +-
xmloff/source/draw/ximp3dscene.hxx | 4 +-
xmloff/source/draw/ximpgrp.cxx | 10 +-
xmloff/source/draw/ximpgrp.hxx | 2 +-
xmloff/source/transform/IgnoreTContext.hxx | 2 +-
xmloff/source/transform/MergeElemTContext.cxx | 2 +-
xmloff/source/transform/MetaTContext.hxx | 2 +-
xmloff/source/transform/PersAttrListTContext.hxx | 2 +-
xmloff/source/transform/TransformerContext.hxx | 2 +-
178 files changed, 1084 insertions(+), 1084 deletions(-)
diff --git a/UnoControls/source/base/basecontainercontrol.cxx
b/UnoControls/source/base/basecontainercontrol.cxx
index af1d349..1105941 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -166,7 +166,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >&
// create own peer
BaseControl::createPeer( xToolkit, xParent );
- // create peers at all childs
+ // create peers at all children
Sequence< Reference< XControl > > seqControlList = getControls();
sal_uInt32 nControls = seqControlList.getLength();
diff --git a/UnoControls/source/controls/progressmonitor.cxx
b/UnoControls/source/controls/progressmonitor.cxx
index e039ff3..4b5da432 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -659,7 +659,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
// calc new layout for controls
impl_recalcLayout () ;
// clear background (!)
- // [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
+ // [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
diff --git a/UnoControls/source/controls/statusindicator.cxx
b/UnoControls/source/controls/statusindicator.cxx
index 1c5aed7..c8f73d7 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -418,7 +418,7 @@ void SAL_CALL StatusIndicator::setPosSize (
// calc new layout for controls
impl_recalcLayout ( WindowEvent(static_cast< OWeakObject*
(this),0,0,nWidth,nHeight,0,0,0,0) ) ;
// clear background (!)
- // [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
+ // [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 2bd2e7f..9a837f6 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -352,7 +352,7 @@ private:
double mfIterateInterval;
/** sorted list of child nodes for XTimeContainer*/
- ChildList_t maChilds;
+ ChildList_t maChildren;
};
// ====================================================================
@@ -360,7 +360,7 @@ private:
class TimeContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
{
public:
- TimeContainerEnumeration( const ChildList_t &rChilds );
+ TimeContainerEnumeration( const ChildList_t &rChildren );
virtual ~TimeContainerEnumeration();
// Methods
@@ -369,7 +369,7 @@ public:
private:
/** sorted list of child nodes */
- ChildList_t maChilds;
+ ChildList_t maChildren;
/** current iteration position */
ChildList_t::iterator maIter;
@@ -378,10 +378,10 @@ private:
Mutex maMutex;
};
-TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds )
-: maChilds( rChilds )
+TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChildren )
+: maChildren( rChildren )
{
- maIter = maChilds.begin();
+ maIter = maChildren.begin();
}
TimeContainerEnumeration::~TimeContainerEnumeration()
@@ -393,7 +393,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce
{
Guard< Mutex > aGuard( maMutex );
- return maIter != maChilds.end();
+ return maIter != maChildren.end();
}
Any SAL_CALL TimeContainerEnumeration::nextElement()
@@ -401,7 +401,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
{
Guard< Mutex > aGuard( maMutex );
- if( maIter == maChilds.end() )
+ if( maIter == maChildren.end() )
throw NoSuchElementException();
return makeAny( (*maIter++) );
@@ -1178,13 +1178,13 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw
(RuntimeExce
{
xNewNode = new AnimationNode( *this );
- if( maChilds.size() )
+ if( maChildren.size() )
{
Reference< XTimeContainer > xContainer( xNewNode, UNO_QUERY );
if( xContainer.is() )
{
- ChildList_t::iterator aIter( maChilds.begin() );
- ChildList_t::iterator aEnd( maChilds.end() );
+ ChildList_t::iterator aIter( maChildren.begin() );
+ ChildList_t::iterator aEnd( maChildren.end() );
while( aIter != aEnd )
{
Reference< XCloneable > xCloneable((*aIter++), UNO_QUERY );
@@ -1813,7 +1813,7 @@ Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
{
Guard< Mutex > aGuard( maMutex );
- return !maChilds.empty();
+ return !maChildren.empty();
}
// --------------------------------------------------------------------
@@ -1824,7 +1824,7 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
{
Guard< Mutex > aGuard( maMutex );
- return new TimeContainerEnumeration( maChilds);
+ return new TimeContainerEnumeration( maChildren);
}
// --------------------------------------------------------------------
@@ -1839,14 +1839,14 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const
Referenc
if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException();
- ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
- if( before == maChilds.end() )
+ ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild);
+ if( before == maChildren.end() )
throw NoSuchElementException();
- if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+ if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
- maChilds.insert( before, newChild );
+ maChildren.insert( before, newChild );
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
newChild->setParent( xThis );
@@ -1865,18 +1865,18 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const
Reference
if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException();
- ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
- if( before == maChilds.end() )
+ ChildList_t::iterator before = ::std::find(maChildren.begin(), maChildren.end(), refChild);
+ if( before == maChildren.end() )
throw NoSuchElementException();
- if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+ if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
++before;
- if( before != maChilds.end() )
- maChilds.insert( before, newChild );
+ if( before != maChildren.end() )
+ maChildren.insert( before, newChild );
else
- maChilds.push_back( newChild );
+ maChildren.push_back( newChild );
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
newChild->setParent( xThis );
@@ -1895,11 +1895,11 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const
Referenc
if( !newChild.is() || !oldChild.is() )
throw IllegalArgumentException();
- ChildList_t::iterator replace = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
- if( replace == maChilds.end() )
+ ChildList_t::iterator replace = ::std::find(maChildren.begin(), maChildren.end(), oldChild);
+ if( replace == maChildren.end() )
throw NoSuchElementException();
- if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+ if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
Reference< XInterface > xNull( 0 );
@@ -1924,14 +1924,14 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const
Reference
if( !oldChild.is() )
throw IllegalArgumentException();
- ChildList_t::iterator old = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
- if( old == maChilds.end() )
+ ChildList_t::iterator old = ::std::find(maChildren.begin(), maChildren.end(), oldChild);
+ if( old == maChildren.end() )
throw NoSuchElementException();
Reference< XInterface > xNull( 0 );
oldChild->setParent( xNull );
- maChilds.erase( old );
+ maChildren.erase( old );
return oldChild;
}
@@ -1947,7 +1947,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const
Reference
if( !newChild.is() )
throw IllegalArgumentException();
- if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+ if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException();
Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
@@ -1956,7 +1956,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const
Reference
if( xThis == xChild )
throw IllegalArgumentException();
- maChilds.push_back( newChild );
+ maChildren.push_back( newChild );
newChild->setParent( xThis );
diff --git a/autodoc/inc/ary/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx
index 6eccef6..8686e88 100644
--- a/autodoc/inc/ary/symtreenode.hxx
+++ b/autodoc/inc/ary/symtreenode.hxx
@@ -101,7 +101,7 @@ class Node
/** Gets a child with a specific name and of a specific type.
- There may be more childs with the same name.
+ There may be more children with the same name.
@return id_t(0), if no matching child is found.
*/
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index e9378ab..1804df9 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -225,7 +225,7 @@ public:
WatchTreeListBox( Window* pParent, WinBits nWinBits );
~WatchTreeListBox();
- void RequestingChilds( SvLBoxEntry * pParent );
+ void RequestingChildren( SvLBoxEntry * pParent );
void UpdateWatches( bool bBasicStopped = false );
using SvTabListBox::SetTabs;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index dfef385..857cec2 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1758,7 +1758,7 @@ void WatchTreeListBox::SetTabs()
}
}
-void WatchTreeListBox::RequestingChilds( SvLBoxEntry * pParent )
+void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
{
if( !StarBASIC::IsRunning() )
return;
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 645cbe0..6f11627 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -159,7 +159,7 @@ private:
void SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
protected:
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void ExpandedHdl();
virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
virtual long ExpandingHdl();
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index ab353b3..0edbddc 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -50,11 +50,11 @@ using namespace ::com::sun::star;
typedef std::deque< SvLBoxEntry* > EntryArray;
-void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
+void BasicTreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
{
BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
ScriptDocument aDocument( aDesc.GetDocument() );
- OSL_ENSURE( aDocument.isAlive(), "BasicTreeListBox::RequestingChilds: invalid document!" );
+ OSL_ENSURE( aDocument.isAlive(), "BasicTreeListBox::RequestingChildren: invalid document!" );
if ( !aDocument.isAlive() )
return;
@@ -124,7 +124,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
}
else
{
- OSL_FAIL( "BasicTreeListBox::RequestingChilds: Error loading library!" );
+ OSL_FAIL( "BasicTreeListBox::RequestingChildren: Error loading library!" );
}
}
}
@@ -137,7 +137,7 @@ void BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
}
else {
- OSL_FAIL( "BasicTreeListBox::RequestingChilds: Unknown Type!" );
+ OSL_FAIL( "BasicTreeListBox::RequestingChildren: Unknown Type!" );
}
}
@@ -146,7 +146,7 @@ void BasicTreeListBox::ExpandedHdl()
SvLBoxEntry* pEntry = GetHdlEntry();
DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
- if ( !IsExpanded( pEntry ) && pEntry->HasChildsOnDemand() )
+ if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() )
{
SvLBoxEntry* pChild = FirstChild( pEntry );
while ( pChild )
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index aa79ef1..eb06efe 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -593,7 +593,7 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru
if ( pForm )
{
// stop listening with all children
- ::std::vector<DlgEdObj*> aChildList = pForm->GetChilds();
+ ::std::vector<DlgEdObj*> aChildList = pForm->GetChildren();
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = aChildList.begin() ; aIter != aChildList.end() ; ++aIter )
{
@@ -1428,14 +1428,14 @@ void DlgEdForm::SetPropsFromRect()
void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
{
- pChilds.push_back( pDlgEdObj );
+ pChildren.push_back( pDlgEdObj );
}
//----------------------------------------------------------------------------
void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
{
- pChilds.erase( ::std::find( pChilds.begin() , pChilds.end() , pDlgEdObj ) );
+ pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) );
}
//----------------------------------------------------------------------------
@@ -1500,7 +1500,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
bool bAdjustedPageSize = pEditor->AdjustPageSize();
SetRectFromProps();
::std::vector< DlgEdObj* >::iterator aIter;
- ::std::vector< DlgEdObj* > aChildList = ((DlgEdForm*)this)->GetChilds();
+ ::std::vector< DlgEdObj* > aChildList = ((DlgEdForm*)this)->GetChildren();
if ( bAdjustedPageSize )
{
@@ -1590,7 +1590,7 @@ void DlgEdForm::UpdateTabIndices()
{
// stop listening with all children
::std::vector<DlgEdObj*>::iterator aIter;
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
+ for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening( sal_False );
}
@@ -1642,7 +1642,7 @@ void DlgEdForm::UpdateTabIndices()
}
// start listening with all children
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
+ for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->StartListening();
}
@@ -1687,7 +1687,7 @@ void DlgEdForm::UpdateGroups()
if ( xTabModel.is() )
{
// create a global list of controls that belong to the dialog
- ::std::vector<DlgEdObj*> aChildList = GetChilds();
+ ::std::vector<DlgEdObj*> aChildList = GetChildren();
sal_uInt32 nSize = aChildList.size();
Sequence< Reference< awt::XControl > > aSeqControls( nSize );
for ( sal_uInt32 i = 0; i < nSize; ++i )
@@ -1757,9 +1757,9 @@ void DlgEdForm::NbcMove( const Size& rSize )
SetPropsFromRect();
StartListening();
- // set geometry properties of all childs
+ // set geometry properties of all children
::std::vector<DlgEdObj*>::iterator aIter;
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
+ for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
@@ -1781,9 +1781,9 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const
Fract
SetPropsFromRect();
StartListening();
- // set geometry properties of all childs
+ // set geometry properties of all children
::std::vector<DlgEdObj*>::iterator aIter;
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
+ for ( aIter = pChildren.begin() ; aIter != pChildren.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index ebe1186..096a1e7 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -147,7 +147,7 @@ class DlgEdForm: public DlgEdObj
private:
DlgEditor* pDlgEditor;
- ::std::vector<DlgEdObj*> pChilds;
+ ::std::vector<DlgEdObj*> pChildren;
mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo > mpDeviceInfo;
@@ -169,7 +169,7 @@ public:
virtual void AddChild( DlgEdObj* pDlgEdObj );
virtual void RemoveChild( DlgEdObj* pDlgEdObj );
- virtual ::std::vector<DlgEdObj*> GetChilds() const { return pChilds; }
+ virtual ::std::vector<DlgEdObj*> GetChildren() const { return pChildren; }
virtual void UpdateStep();
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index b73532b..f297476 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -377,11 +377,11 @@ void SbxVariable::SetParent( SbxObject* p )
{
// then this had to be a child of the new parent
sal_Bool bFound = sal_False;
- SbxArray *pChilds = p->GetObjects();
- if ( pChilds )
+ SbxArray *pChildren = p->GetObjects();
+ if ( pChildren )
{
- for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
- bFound = ( this == pChilds->Get(nIdx) );
+ for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChildren->Count(); ++nIdx )
+ bFound = ( this == pChildren->Get(nIdx) );
}
if ( !bFound )
{
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx
b/connectivity/source/inc/dbase/dindexnode.hxx
index c075ee3..29487bd 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -170,7 +170,7 @@ namespace connectivity
ODbaseIndex& GetIndex() {return rIndex;}
const ODbaseIndex& GetIndex() const {return rIndex;}
- // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+ // Setzen des Children, ueber Referenz, um die PagePos zu erhalten
void SetChild(ONDXPagePtr aCh);
void SetParent(ONDXPagePtr aPa);
@@ -247,7 +247,7 @@ namespace connectivity
const ONDXKey& GetKey() const { return aKey;}
ONDXKey& GetKey() { return aKey;}
- // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten
+ // Setzen des Children, ueber Referenz, um die PagePos zu erhalten
void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL);
void SetKey(ONDXKey& rKey) {aKey = rKey;}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index dfc3796..034d44b 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1662,7 +1662,7 @@ sal_Bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
// Parameters are not equal!
bResult = bResult && !SQL_ISRULE(this, parameter);
- // compare childs
+ // compare children
for (sal_uInt32 i=0; bResult && i < count(); i++)
bResult = *getChild(i) == *rParseNode.getChild(i);
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 94bd8e3..e976a9d 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1154,7 +1154,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L,
sal_True, LIST_APPEND );
pE1->SetUserData(pU1);
- pE1->EnableChildsOnDemand( sal_False );
+ pE1->EnableChildrenOnDemand( sal_False );
}
pIt = aEntriesBox.Next(pIt);
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f2917e1f..b25e2e4 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -642,7 +642,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
String aTitle(pImp->m_sDlgMacros);
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -728,7 +728,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
if ( grandchildren[m]->getType() ==
browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -751,7 +751,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO
last parameter should contain user data
aArr.Insert( pInfo, aArr.Count() );
pEntry->SetUserData( pInfo );
- pEntry->EnableChildsOnDemand( sal_True );
+ pEntry->EnableChildrenOnDemand( sal_True );
}
MakeVisible( GetEntry( 0,0 ) );
@@ -1063,7 +1063,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
return bRet;
}
-void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
+void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
/* Beschreibung
Ein Basic oder eine Bibliothek werden ge"offnet
*/
@@ -1148,7 +1148,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
if ( grandchildren[m]->getType() ==
browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -1179,7 +1179,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0,
pFamily );
aArr.Insert( pGrpInfo, aArr.Count() );
pStyleEntry->SetUserData( pGrpInfo );
- pStyleEntry->EnableChildsOnDemand( sal_False );
+ pStyleEntry->EnableChildrenOnDemand( sal_False );
}
}
break;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 2736368..2e9cd25 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -303,7 +303,7 @@ namespace
}
}
-void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >&
_rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildsOnDemand )
+void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >&
_rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildrenOnDemand )
{
OSL_PRECOND( _rxRootNode.is(), "SvxConfigGroupListBox_Impl::fillScriptList: invalid root
node!" );
if ( !_rxRootNode.is() )
@@ -380,13 +380,13 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference<
browse::XBrows
pNewEntry->SetUserData( pInfo );
aArr.Insert( pInfo, aArr.Count() );
- if ( _bCheapChildsOnDemand )
+ if ( _bCheapChildrenOnDemand )
{
/* i30923 - Would be nice if there was a better
* way to determine if a basic lib had children
* without having to ask for them (which forces
* the library to be loaded */
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
}
else
{
@@ -399,7 +399,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
break;
}
}
@@ -565,7 +565,7 @@ void SvxConfigGroupListBox_Impl::Init()
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildsOnDemand( sal_True );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -899,7 +899,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
return bRet;
}
-void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
+void SvxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
{
SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
pInfo->bWasOpened = sal_True;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index d7f3dd2..7e021d0 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -423,7 +423,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-void SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
+void SFTreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
{
SFEntry* userData = 0;
if ( !pEntry )
@@ -992,7 +992,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
while ( !bValid );
// open up parent node (which ensures it's loaded)
- aScriptsBox.RequestingChilds( pEntry );
+ aScriptsBox.RequestingChildren( pEntry );
Sequence< Any > args( 1 );
args[ 0 ] <<= aNewName;
@@ -1044,8 +1044,8 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
SAL_WNODEPRECATED_DECLARATIONS_POP
// If the Parent is not loaded then set to
- // loaded, this will prevent RequestingChilds ( called
- // from vcl via RequestingChilds ) from
+ // loaded, this will prevent RequestingChildren ( called
+ // from vcl via RequestingChildren ) from
// creating new ( duplicate ) children
SFEntry* userData = (SFEntry*)pEntry->GetUserData();
if ( userData && !userData->isLoaded() )
@@ -1284,7 +1284,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
}
if ( !pTmpEntry )
break;
- aScriptsBox.RequestingChilds( pEntry );
+ aScriptsBox.RequestingChildren( pEntry );
}
aScriptsBox.SetCurEntry( pEntry );
}
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index b893768..81e2235 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -182,7 +182,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
SfxStylesInfo_Impl* pStylesInfo;
protected:
- virtual void RequestingChilds( SvLBoxEntry *pEntry);
+ virtual void RequestingChildren( SvLBoxEntry *pEntry);
using SvListView::Expand;
virtual sal_Bool Expand( SvLBoxEntry* pParent );
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 860a2c3..394f289 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -86,7 +86,7 @@ private:
protected:
void ExpandTree( SvLBoxEntry* pRootEntry );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void ExpandedHdl();
virtual long ExpandingHdl();
public:
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index d7c6641..ed6cad8 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -162,11 +162,11 @@ private:
void fillScriptList(
const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >&
_rxRootNode,
SvLBoxEntry* _pParentEntry,
- bool _bCheapChildsOnDemand
+ bool _bCheapChildrenOnDemand
);
protected:
- virtual void RequestingChilds( SvLBoxEntry *pEntry);
+ virtual void RequestingChildren( SvLBoxEntry *pEntry);
virtual sal_Bool Expand( SvLBoxEntry* pParent );
using SvListView::Expand;
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 73ba7f2..874a4e7 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1149,7 +1149,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException )
m_aDisposeListeners.disposeAndClear(aEvt);
m_aContainerListeners.disposeAndClear(aEvt);
- // dispose all childs
+ // dispose all children
for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter =
m_aChildren.begin();
aIter != m_aChildren.end();
++aIter
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 9ca1392..5a8b8a1 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2142,7 +2142,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image&
_rDb
m_pTreeView->getListBox().InsertEntry(
_rQueryName, _rQueryImage, _rQueryImage, pDatasourceEntry,
- sal_True /*ChildsOnDemand*/, LIST_APPEND, pQueriesData );
+ sal_True /*ChildrenOnDemand*/, LIST_APPEND, pQueriesData );
}
// the child for the tables container
@@ -2152,7 +2152,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image&
_rDb
m_pTreeView->getListBox().InsertEntry(
_rTableName, _rTableImage, _rTableImage, pDatasourceEntry,
- sal_True /*ChildsOnDemand*/, LIST_APPEND, pTablesData );
+ sal_True /*ChildrenOnDemand*/, LIST_APPEND, pTablesData );
}
}
@@ -2228,7 +2228,7 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent,
const
//------------------------------------------------------------------------------
IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent)
{
- if (_pParent->HasChilds())
+ if (_pParent->HasChildren())
// nothing to to ...
return 1L;
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 40a8aaa..b3e307f 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -263,7 +263,7 @@ OFieldDescControl::~OFieldDescControl()
pLastFocusWindow = NULL;
//////////////////////////////////////////////////////////////////////
- // Childs zerstoeren
+ // Children zerstoeren
DeactivateAggregate( tpDefault );
DeactivateAggregate( tpRequired );
DeactivateAggregate( tpTextLen );
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 6918dce..858431a 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -120,14 +120,14 @@ DBTreeListBox::~DBTreeListBox()
SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const
IEntryFilter* _pFilter ) const
{
SvLBoxTreeList* myModel = GetModel();
- SvTreeEntryList* pChilds = myModel->GetChildList(pStart);
+ SvTreeEntryList* pChildren = myModel->GetChildList(pStart);
SvLBoxEntry* pEntry = NULL;
- if ( pChilds )
+ if ( pChildren )
{
- size_t nCount = pChilds->size();
+ size_t nCount = pChildren->size();
for (size_t i = 0; i < nCount; ++i)
{
- pEntry = static_cast<SvLBoxEntry*>((*pChilds)[ i ]);
+ pEntry = static_cast<SvLBoxEntry*>((*pChildren)[ i ]);
SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
if ( pItem->GetText().Equals(aName) )
{
@@ -149,7 +149,7 @@ void DBTreeListBox::EnableExpandHandler(SvLBoxEntry* _pEntry)
}
// -------------------------------------------------------------------------
-void DBTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
+void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent )
{
if (m_aPreExpandHandler.IsSet())
{
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 58c43ac..4858b9a 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -117,7 +117,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt )
SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState(_pEntry);
- if (!GetModel()->HasChilds(_pEntry))
+ if (!GetModel()->HasChildren(_pEntry))
// nothing to do in this bottom-up routine if there are no children ...
return eState;
#ifdef DBG_UTIL
@@ -202,7 +202,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState( _pEntry);
- if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken
+ if (GetModel()->HasChildren(_pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -217,7 +217,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
while(pEntry)
{
SetCheckButtonState(pEntry,eState);
- if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken
+ if(GetModel()->HasChildren(pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index ea09ed0..84ce4b0 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -398,7 +398,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked,
// special emphasizing handling for the "all objects" entry
sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry);
- if ( GetModel()->HasChilds(_pEntry) // the entry has children
+ if ( GetModel()->HasChildren(_pEntry) // the entry has children
|| bAllObjectsEntryAffected // or it is the "all objects" entry
)
{
@@ -416,7 +416,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked,
SvLBoxEntry* pChildLoop = FirstChild(_pEntry);
while (pChildLoop)
{
- if (GetModel()->HasChilds(pChildLoop))
+ if (GetModel()->HasChildren(pChildLoop))
implEmphasize(pChildLoop, sal_False, sal_True, sal_False);
pChildLoop = NextSibling(pChildLoop);
}
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 04f76cd..7fa80c1 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
m_rTableList.UpdateTableList( m_xConnection, sTables, sViews );
SvLBoxEntry* pEntry = m_rTableList.First();
- while( pEntry && m_rTableList.GetModel()->HasChilds( pEntry ) )
+ while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) )
{
m_rTableList.Expand( pEntry );
pEntry = m_rTableList.Next( pEntry );
@@ -235,7 +235,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
bool TableListFacade::isLeafSelected() const
{
SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
- return pEntry && !m_rTableList.GetModel()->HasChilds( pEntry );
+ return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry );
}
//==============================================================================
@@ -335,7 +335,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
bool QueryListFacade::isLeafSelected() const
{
SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
- return pEntry && !m_rQueryList.GetModel()->HasChilds( pEntry );
+ return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry );
}
//==============================================================================
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index f8bddfc..160f9b4 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -492,7 +492,7 @@ DBG_NAME(OTableSubscriptionPage)
SvLBoxEntry* pSchema = NULL;
SvLBoxEntry* pCatalog = NULL;
- if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED &&
!m_aTablesList.GetModel()->HasChilds(pEntry))
+ if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED &&
!m_aTablesList.GetModel()->HasChildren(pEntry))
{ // checked and a leaf, which means it's no catalog, no schema, but a real table
::rtl::OUString sCatalog;
if(m_aTablesList.GetModel()->HasParent(pEntry))
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 9f4a96b..9e97846 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -47,7 +47,7 @@ namespace dbaui
OTableEditorCtrl* m_pEditorCtrl;
void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
- void ArrangeChilds( long nSplitPos ,Rectangle& rRect);
+ void ArrangeChildren( long nSplitPos ,Rectangle& rRect);
DECL_LINK( SplitHdl, Splitter* );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 86e8ee2..bd40f3a 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -122,7 +122,7 @@ namespace dbaui
void EnableExpandHandler(SvLBoxEntry* _pEntry);
SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const
IEntryFilter* _pFilter = NULL ) const;
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void SelectHdl();
virtual void DeselectHdl();
// Window
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 39d0fa2..5f4eb5a 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -792,7 +792,7 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
m_aDragScrollTimer.Stop();
//////////////////////////////////////////////////////////////////////
- // Position des Childs nach Verschieben anpassen
+ // Position des Children nach Verschieben anpassen
//////////////////////////////////////////////////////////////////////
// Fenster duerfen nicht aus Anzeigebereich herausbewegt werden
Point aDragWinPos = rTEvt.GetMouseEvent().GetPosPixel() - m_aDragOffset;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 63364f3..d795075 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -460,7 +460,7 @@ void OTableWindow::MouseButtonDown( const MouseEvent& rEvt )
{
//////////////////////////////////////////////////////////////////////
// Wenn sizing, dann bekommt Parent die Nachricht,
- // dass jetzt die Fenstergroesse seines Childs veraendert wird
+ // dass jetzt die Fenstergroesse seines Children veraendert wird
if( m_nSizingFlags )
getTableView()->BeginChildSizing( this, GetPointer() );
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 21d36d9..fd1a745 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -59,7 +59,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD
ImplInitSettings( sal_True, sal_True, sal_True );
//////////////////////////////////////////////////////////////////////
- // Childs erzeugen
+ // Children erzeugen
m_pEditorCtrl = new OTableEditorCtrl( this);
m_pFieldDescWin = new OTableFieldDescWin( this );
@@ -77,7 +77,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD
OTableBorderWindow::~OTableBorderWindow()
{
//////////////////////////////////////////////////////////////////////
- // Childs zerstoeren
+ // Children zerstoeren
//
::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pEditorCtrl->Hide();
m_pFieldDescWin->Hide();
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 8e4b651..4321d04 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -87,7 +87,7 @@ OTableFieldDescWin::~OTableFieldDescWin()
{
DBG_DTOR(OTableFieldDescWin,NULL);
//////////////////////////////////////////////////////////////////////
- // Childs zerstoeren
+ // Children zerstoeren
m_pHelpBar->Hide();
getGenPage()->Hide();
m_pHeader->Hide();
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4e87862..d4c0a21 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -577,7 +577,7 @@ char **cmd; /* Simulate a reference to *cmd. */
/* Really spawn or fork a child. */
#if defined( USE_SPAWN )
- /* As no other childs are started while the output is redirected this
+ /* As no other children are started while the output is redirected this
* is save. */
if( Is_exec_shell ) {
/* Add error checking? */
@@ -781,7 +781,7 @@ int pqid;
return 0;
} else {
Fatal( "dmake was interrupted or a child terminated. "
- "Stopping all childs ..." );
+ "Stopping all children ..." );
}
} else {
/* The child we were waiting for is missing or no child is
@@ -803,7 +803,7 @@ int pqid;
}
_proc_cnt = 0;
}
- /* The pid we were waiting for or any of the remaining childs
+ /* The pid we were waiting for or any of the remaining children
* (pid == -1) is missing. This should not happen and means
* that the process got lost or was treated elsewhere. */
Fatal( "Internal Error: Child is missing but still listed in _procs[x] %d: %s\n"
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 789b79c..239f3cc 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -319,7 +319,7 @@ namespace drawinglayer
if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth()
|| aMetaFileRealSize.getHeight() >
aMetaFilePrefSize.getHeight())
{
- // clipping needed. Embed to MaskPrimitive2D. Create childs
and mask polygon
+ // clipping needed. Embed to MaskPrimitive2D. Create children
and mask polygon
const primitive2d::Primitive2DSequence
aChildContent(&xPrimitive, 1);
basegfx::B2DPolygon
aMaskPolygon(basegfx::tools::createUnitPolygon());
aMaskPolygon.transform(aTransform);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 2528dd6..9942574 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2021,7 +2021,7 @@ namespace drawinglayer
mpPDFExtOutDevData->BeginStructureElement(rTagElement);
}
- // proccess childs normally
+ // proccess children normally
process(rStructureTagCandidate.getChildren());
if(mpPDFExtOutDevData && bTagUsed)
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index d2759a4..dbcc958 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -234,7 +234,7 @@ private:
EDITENG_DLLPRIVATE sal_uLong ImpCheckMousePos( const Point& rPosPixel, MouseTarget&
reTarget);
EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara );
- EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds );
+ EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren );
EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
EDITENG_DLLPRIVATE sal_uInt16 ImpInitPaste( sal_uLong& rStart );
@@ -279,7 +279,7 @@ public:
// Retruns the number of selected paragraphs
sal_uLong Select( Paragraph* pParagraph,
sal_Bool bSelect=sal_True,
- sal_Bool bWChilds=sal_True);
+ sal_Bool bWChildren=sal_True);
String GetSelected() const;
void SelectRange( sal_uLong nFirst, sal_uInt16 nCount );
@@ -626,7 +626,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
sal_Bool ImplHasBullet( sal_uInt16 nPara ) const;
Size ImplGetBulletSize( sal_uInt16 nPara );
sal_uInt16 ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt );
- void ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool
bRecalcChilds );
+ void ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool
bRecalcChildren );
String ImplGetBulletText( sal_uInt16 nPara );
void ImplCheckNumBulletItem( sal_uInt16 nPara );
void ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool
bCreateUndo, sal_Bool bUndoAction = sal_False );
@@ -733,7 +733,7 @@ public:
Paragraph* GetParagraph( sal_uLong nAbsPos ) const;
sal_Bool HasParent( Paragraph* pParagraph ) const;
- sal_Bool HasChilds( Paragraph* pParagraph ) const;
+ sal_Bool HasChildren( Paragraph* pParagraph ) const;
sal_uLong GetChildCount( Paragraph* pParent ) const;
sal_Bool IsExpanded( Paragraph* pPara ) const;
Paragraph* GetParent( Paragraph* pParagraph ) const;
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 5e87884..e1fd562 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -805,7 +805,7 @@ namespace accessibility
SolarMutexGuard aGuard;
if( !HaveChildren() )
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No
childs available")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No
children available")),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) )
); // static_cast: disambiguate hierarchy
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 84dd117..d6ae16f 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -136,7 +136,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleImageBullet, NULL );
(void)i;
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No
childs available")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No
children available")),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); //
static_cast: disambiguate hierarchy
}
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 692a293..ab073f6 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -279,7 +279,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz )
sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
{
DBG_CHKTHIS(Outliner,0);
- return pParaList->HasVisibleChilds( pPara );
+ return pParaList->HasVisibleChildren( pPara );
}
Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 781cb70..77e6e85 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -795,7 +795,7 @@ sal_Bool Outliner::Expand( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
- if ( pParaList->HasHiddenChilds( pPara ) )
+ if ( pParaList->HasHiddenChildren( pPara ) )
{
OLUndoExpand* pUndo = 0;
sal_Bool bUndo = IsUndoEnabled() && !IsInUndo();
@@ -825,7 +825,7 @@ sal_Bool Outliner::Expand( Paragraph* pPara )
sal_Bool Outliner::Collapse( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
- if ( pParaList->HasVisibleChilds( pPara ) ) // expanded
+ if ( pParaList->HasVisibleChildren( pPara ) ) // expanded
{
OLUndoExpand* pUndo = 0;
sal_Bool bUndo = sal_False;
@@ -1070,7 +1070,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
}
// In case of collapsed subparagraphs paint a line before the text.
- if( pParaList->HasChilds(pPara) && !pParaList->HasVisibleChilds(pPara) &&
+ if( pParaList->HasChildren(pPara) && !pParaList->HasVisibleChildren(pPara) &&
!bStrippingPortions && !nOrientation )
{
long nWidth = pOutDev->PixelToLogic( Size( 10, 0 ) ).Width();
@@ -1439,10 +1439,10 @@ Paragraph* Outliner::GetParagraph( sal_uLong nAbsPos ) const
return pParaList->GetParagraph( nAbsPos );
}
-sal_Bool Outliner::HasChilds( Paragraph* pParagraph ) const
+sal_Bool Outliner::HasChildren( Paragraph* pParagraph ) const
{
DBG_CHKTHIS(Outliner,0);
- return pParaList->HasChilds( pParagraph );
+ return pParaList->HasChildren( pParagraph );
}
sal_Bool Outliner::ImplHasBullet( sal_uInt16 nPara ) const
@@ -1929,7 +1929,7 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const
SvxNumberFormat*
return nNumber;
}
-void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds
)
+void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool
bRecalcChildren )
{
DBG_CHKTHIS(Outliner,0);
@@ -1966,7 +1966,7 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel,
sal_
sal_Int16 nDepth = pPara->GetDepth();
pPara = pParaList->GetParagraph( ++nPara );
- if ( !bRecalcChilds )
+ if ( !bRecalcChildren )
{
while ( pPara && ( pPara->GetDepth() > nDepth ) )
pPara = pParaList->GetParagraph( ++nPara );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index cfc9ebe..e1edd39 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -228,12 +228,12 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin
)
if( !bSelection &&
aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) )
{
- sal_uLong nChilds = pOwner->pParaList->GetChildCount(pPara);
- if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara))
+ sal_uLong nChildren = pOwner->pParaList->GetChildCount(pPara);
+ if( nChildren && !pOwner->pParaList->HasVisibleChildren(pPara))
{
pOwner->UndoActionStart( OLUNDO_INSERT );
sal_uLong nTemp = aSel.nEndPara;
- nTemp += nChilds;
+ nTemp += nChildren;
nTemp++; // insert above next Non-Child
pOwner->Insert( String(),nTemp,pPara->GetDepth());
// Position the cursor
@@ -351,17 +351,17 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
if ( eTarget == MouseBullet )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- sal_Bool bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
+ sal_Bool bHasChildren = (pPara && pOwner->pParaList->HasChildren(pPara));
if( rMEvt.GetClicks() == 1 )
{
sal_uLong nEndPara = nPara;
- if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) )
+ if ( bHasChildren && pOwner->pParaList->HasVisibleChildren(pPara) )
nEndPara += pOwner->pParaList->GetChildCount( pPara );
// The selection is inverted, so that EditEngine does not scroll
ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 );
pEditView->SetSelection( aSel );
}
- else if( rMEvt.GetClicks() == 2 && bHasChilds )
+ else if( rMEvt.GetClicks() == 2 && bHasChildren )
ImpToggleExpand( pPara );
aDDStartPosPix = rMEvt.GetPosPixel();
@@ -375,7 +375,7 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
ESelection aSel( pEditView->GetSelection() );
nPara = aSel.nStartPara;
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- if( (pPara && pOwner->pParaList->HasChilds(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
+ if( (pPara && pOwner->pParaList->HasChildren(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
{
ImpToggleExpand( pPara );
}
@@ -406,12 +406,12 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
sal_uInt16 nPara = (sal_uInt16) pOwner->pParaList->GetAbsPos( pPara );
pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
- ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChilds( pPara ) );
+ ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChildren( pPara ) );
pEditView->ShowCursor();
}
sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
- sal_Bool bWithChilds )
+ sal_Bool bWithChildren )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -421,7 +421,7 @@ sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
nEnd = 0xffff;
sal_uLong nChildCount = 0;
- if ( bWithChilds )
+ if ( bWithChildren )
nChildCount = pOwner->pParaList->GetChildCount( pParagraph );
ESelection aSel( (sal_uInt16)nPara, 0,(sal_uInt16)(nPara+nChildCount), nEnd );
@@ -460,7 +460,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
pEditView->SetEditEngineUpdateMode( bUpdate );
}
-ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds )
+ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren )
{
DBG_CHKTHIS( OutlinerView, 0 );
@@ -469,10 +469,10 @@ ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool
bIncludeHiddenChilds
aParas.Adjust();
// Record the invisible Children of the last Parents in the selection
- if ( bIncludeHiddenChilds )
+ if ( bIncludeHiddenChildren )
{
Paragraph* pLast = pOwner->pParaList->GetParagraph( aParas.nEndPara );
- if ( pOwner->pParaList->HasHiddenChilds( pLast ) )
+ if ( pOwner->pParaList->HasHiddenChildren( pLast ) )
aParas.nEndPara =
sal::static_int_cast< sal_uInt16 >(
aParas.nEndPara +
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 7c4e38a..c1d928e 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -178,21 +178,21 @@ void ParagraphList::MoveParagraphs( sal_uLong nStart, sal_uLong nDest,
sal_uLong
}
}
-sal_Bool ParagraphList::HasChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False;
}
-sal_Bool ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasHiddenChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ?
sal_True : sal_False;
}
-sal_Bool ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasVisibleChildren( Paragraph* pParagraph ) const
{
sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index f4b0ae4..c038e60 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -58,9 +58,9 @@ public:
void MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong nCount );
Paragraph* GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const;
- sal_Bool HasChilds( Paragraph* pParagraph ) const;
- sal_Bool HasHiddenChilds( Paragraph* pParagraph ) const;
- sal_Bool HasVisibleChilds( Paragraph* pParagraph ) const;
+ sal_Bool HasChildren( Paragraph* pParagraph ) const;
+ sal_Bool HasHiddenChildren( Paragraph* pParagraph ) const;
+ sal_Bool HasVisibleChildren( Paragraph* pParagraph ) const;
sal_uLong GetChildCount( Paragraph* pParagraph ) const;
void Expand( Paragraph* pParent );
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx
b/extensions/source/propctrlr/selectlabeldialog.cxx
index f381ccb..655fd3f 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -216,7 +216,7 @@ namespace pcr
++nChildren;
}
else
- { // oops, no valid childs -> remove the entry
+ { // oops, no valid children -> remove the entry
m_aControlTree.ModelIsRemoving(pCont);
m_aControlTree.GetModel()->Remove(pCont);
m_aControlTree.ModelHasRemoved(pCont);
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index ae22dbe..ebaae92 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -267,7 +267,7 @@ protected:
/** validates the given index
@throws ::com::sun::star::lang::IndexOutOfBoundsException
- if the given index does not denote a valid position in our childs array
+ if the given index does not denote a valid position in our children array
*/
void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( (
::com::sun::star::lang::IndexOutOfBoundsException ) );
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 679a1e0..af89420 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -751,7 +751,7 @@ void Binding::valueModified()
maValidityListeners.end(),
::std::bind2nd( ::std::ptr_fun( lcl_validate ), xSource ) );
- // now distribute MIPs to childs
+ // now distribute MIPs to children
if( xNode.is() )
distributeMIP( xNode->getFirstChild() );
}
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index ba53844..8ce67e4 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -371,7 +371,7 @@ private:
/// 'clear' this binding - remove all listeners, etc.
void clear();
- /// distribute MIPs from current node recursively to childs
+ /// distribute MIPs from current node recursively to children
void distributeMIP( const XNode_t &rxNode );
/// implement get*Namespaces()
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index f96a037..f24e27d 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -78,8 +78,8 @@ typedef TFrameContainer::iterator TFrameIterat
typedef TFrameContainer::const_iterator TConstFrameIterator ;
/*-************************************************************************************************************//**
- @short implement a container to hold childs of frame, task or desktop
- @descr Every object of frame, task or desktop hold reference to his childs. These
container is used as helper
+ @short implement a container to hold children of frame, task or desktop
+ @descr Every object of frame, task or desktop hold reference to his children. These
container is used as helper
to do this. Some helper-classe like OFrames or OTasksAccess use it to. They
hold a pointer to an instance
of this class, which is a member of a frame, task or desktop! You can append
and remove frames.
It's possible to set one of these frames as active or deactive. You could have
full index-access to
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 1c46f74..1de47d1 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -346,7 +346,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory
; /// reference to global servicemanager
css::uno::WeakReference< css::frame::XFrame > m_xOwner
; /// reference to owner of this instance (Hold no hard reference!)
- FrameContainer* m_pFrameContainer
; /// with owner shared list to hold all direct childs of an XFramesSupplier
+ FrameContainer* m_pFrameContainer
; /// with owner shared list to hold all direct children of an XFramesSupplier
sal_Bool m_bRecursiveSearchProtection
; /// flag to protect against recursive searches of frames at parents
}; // class OFrames
diff --git a/framework/inc/helper/statusindicatorfactory.hxx
b/framework/inc/helper/statusindicatorfactory.hxx
index a01bf95..51ea0eb 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -179,7 +179,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider
// member
private:
- /** stack with all current indicator childs. */
+ /** stack with all current indicator children. */
IndicatorStack m_aStack;
/** uno service manager to create own needed uno resources. */
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 8dcc872..ac51f25 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -452,7 +452,7 @@ class Desktop : // interfaces
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory
; /// reference to factory, which has create this instance
- FrameContainer m_aChildTaskContainer
; /// array of child tasks (childs of desktop are tasks; and tasks are also frames - But pure
frames are not accepted!)
+ FrameContainer m_aChildTaskContainer
; /// array of child tasks (children of desktop are tasks; and tasks are also frames - But pure
frames are not accepted!)
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer
; /// container for ALL Listener
css::uno::Reference< css::frame::XFrames > m_xFramesHelper
; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper
; /// helper to dispatch something for new tasks, created by "_blank"!
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 171612d..8f51842 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -178,7 +178,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
if( m_bRecursiveSearchProtection == sal_False )
{
// This class is a helper for services, which must implement XFrames.
- // His parent and childs are MY parent and childs to.
+ // His parent and children are MY parent and children to.
// All searchflags are supported by this implementation!
// If some flags should not be supported - don't call me with this flags!!!
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 46b1764..fa2a67a 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -296,13 +296,13 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
try
{
css::uno::Reference< css::frame::XFramesSupplier > xHelpRoot (xHelp ,
css::uno::UNO_QUERY_THROW);
- css::uno::Reference< css::container::XIndexAccess > xHelpChilds(xHelpRoot->getFrames(),
css::uno::UNO_QUERY_THROW);
+ css::uno::Reference< css::container::XIndexAccess > xHelpChildren(xHelpRoot->getFrames(),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XFrame > xHelpChild ;
css::uno::Reference< css::frame::XController > xHelpView ;
css::uno::Reference< css::frame::XModel > xHelpContent;
- xHelpChilds->getByIndex(0) >>= xHelpChild;
+ xHelpChildren->getByIndex(0) >>= xHelpChild;
if (xHelpChild.is())
xHelpView = xHelpChild->getController();
if (xHelpView.is())
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 5cdf44d..a65eb09 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -659,8 +659,8 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short get access to create enumerations of ouer taskchilds
- @descr Direct childs of desktop are tasks everytime.
+ @short get access to create enumerations of ouer taskchildren
+ @descr Direct children of desktop are tasks everytime.
Call these method to could create enumerations of it.
But; Don't forget - you will be the owner of returned object and must release it!
@@ -686,11 +686,11 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL
Desktop::getT
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short return current active task of ouer direct childs
- @descr Desktop childs are tasks only ! If we have an active path from desktop
+ @short return current active task of ouer direct children
+ @descr Desktop children are tasks only ! If we have an active path from desktop
as top to any frame on bottom, we must have an active direct child. His reference
is returned here.
- @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of
ouer direct childs.
+ @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of
ouer direct children.
It can be every frame in subtree and must have the focus (Is the last one of
an active path!).
b) We don't need any lock here. Our container is threadsafe himself and live, if
we live!
@@ -796,9 +796,9 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
/*-************************************************************************************************************//**
@interface XFramesSupplier
- @short return access to append or remove childs on desktop
+ @short return access to append or remove children on desktop
@descr We don't implement these interface directly. We use a helper class to do this.
- If you wish to add or delete childs to/from the container, call these method to get
+ If you wish to add or delete children to/from the container, call these method to
get
a reference to the helper.
@attention Helper is threadsafe himself. So we don't need any lock here.
@@ -823,7 +823,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
/*-************************************************************************************************************//**
@interface XFramesSupplier
@short set/get the current active child frame
- @descr It must be a task. Direct childs of desktop are tasks only! No frames are accepted.
+ @descr It must be a task. Direct children of desktop are tasks only! No frames are
accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 90d47d4..7a057bf 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -359,9 +359,9 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
}
/*-****************************************************************************************************//**
- @short return access to append or remove childs on desktop
+ @short return access to append or remove children on desktop
@descr We don't implement these interface directly. We use a helper class to do this.
- If you wish to add or delete childs to/from the container, call these method to get
+ If you wish to add or delete children to/from the container, call these method to
get
a reference to the helper.
@seealso class OFrames
@@ -395,7 +395,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
/*-****************************************************************************************************//**
@short get the current active child frame
- @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop
is accepted.
+ @descr It must be a frameto. Direct children of a frame are frames only! No task or
desktop is accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
@@ -424,7 +424,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
/*-****************************************************************************************************//**
@short set the new active direct child frame
- @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop
is accepted.
+ @descr It must be a frame to. Direct children of frame are frames only! No task or
desktop is accepted.
We don't save this information directly in this class. We use ouer container-helper
to do that.
@@ -1213,7 +1213,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
if( eState != E_INACTIVE )
{
//_____________________________________________________________________________________________________
- // 1) Deactivate all active childs.
+ // 1) Deactivate all active children.
if (
( xActiveChild.is() == sal_True ) &&
( xActiveChild->isActive() == sal_True )
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 3e99066..c333d1e 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -174,7 +174,7 @@ public:
virtual int GetPosition( ByteString id );
int RemoveChild( XMLElement *pRefElement );
- void RemoveAndDeleteAllChilds();
+ void RemoveAndDeleteAllChildren();
/// returns a child element which matches the given one
XMLElement *GetChildElement(
diff --git a/l10ntools/source/filter/utils/FileHelper.java
b/l10ntools/source/filter/utils/FileHelper.java
index 239711c..e7e5766 100644
--- a/l10ntools/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.java
@@ -307,22 +307,22 @@ public class FileHelper
if (!aDirectory.isDirectory())
throw new java.io.FileNotFoundException("\""+aDirectory.toString()+"\" is not a
directory.");
- java.io.File[] lChilds = aDirectory.listFiles();
- for (int f=0; f<lChilds.length; ++f)
+ java.io.File[] lChildren = aDirectory.listFiles();
+ for (int f=0; f<lChildren.length; ++f)
{
- if (lChilds[f].isDirectory())
+ if (lChildren[f].isDirectory())
{
- FileHelper.makeDirectoryEmpty(lChilds[f], bFilesOnly);
+ FileHelper.makeDirectoryEmpty(lChildren[f], bFilesOnly);
if (!bFilesOnly)
{
- if (!lChilds[f].delete())
- throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be
deleted.");
+ if (!lChildren[f].delete())
+ throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not
be deleted.");
}
}
else
{
- if (!lChilds[f].delete())
- throw new java.io.IOException("\""+lChilds[f].toString()+"\" could not be
deleted.");
+ if (!lChildren[f].delete())
+ throw new java.io.IOException("\""+lChildren[f].toString()+"\" could not be
deleted.");
}
}
}
diff --git a/l10ntools/source/filter/utils/XMLHelper.java
b/l10ntools/source/filter/utils/XMLHelper.java
index 175d04e..8ba480d 100644
--- a/l10ntools/source/filter/utils/XMLHelper.java
+++ b/l10ntools/source/filter/utils/XMLHelper.java
@@ -674,7 +674,7 @@ public class XMLHelper
//___________________________________________
- /** returns a list of childs, which are ELEMENT_NODES and have the right tag name.
+ /** returns a list of children, which are ELEMENT_NODES and have the right tag name.
*
* It analyze the list of all possible child nodes. Only ELEMENT_NODES are candidates.
* All other ones will be ignored. Further these element nodes are compared by it's tag
@@ -695,26 +695,26 @@ public class XMLHelper
{
// extract first all ELEMENT_NODES of he given parent
// Such nodes only provide tag names.
- java.util.Vector lChilds =
XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
- java.util.Vector lExtractedChilds = new java.util.Vector(lChilds.size());
+ java.util.Vector lChildren =
XMLHelper.extractChildNodesByType(aNode,org.w3c.dom.Node.ELEMENT_NODE);
+ java.util.Vector lExtractedChildren = new java.util.Vector(lChildren.size());
// step over the list and search for the right tags using the specified name
- java.util.Enumeration en = lChilds.elements();
+ java.util.Enumeration en = lChildren.elements();
while (en.hasMoreElements())
{
org.w3c.dom.Node aChild = (org.w3c.dom.Node)en.nextElement();
if (aChild.getNodeName().equals(sTag))
- lExtractedChilds.add(aChild);
+ lExtractedChildren.add(aChild);
}
// pack(!) and return the list
- lExtractedChilds.trimToSize();
- return lExtractedChilds;
+ lExtractedChildren.trimToSize();
+ return lExtractedChildren;
}
//___________________________________________
- /** returns a list of childs, which supports the right node type.
+ /** returns a list of children, which supports the right node type.
*
* It analyze the list of all possible child nodes. If a node represent the right node type
* it is added to the return list. Otherwhise it will be ignored.
@@ -731,23 +731,23 @@ public class XMLHelper
public static java.util.Vector extractChildNodesByType(org.w3c.dom.Node aNode,
short nType)
{
- // get list of all possibe childs and reserve enough space for our return list
- // Attention: A null pointer is not allowed for return! (means lExtractedChilds)
- org.w3c.dom.NodeList lChilds = aNode.getChildNodes();
- int c = lChilds.getLength();
- java.util.Vector lExtractedChilds = new java.util.Vector(c);
+ // get list of all possibe children and reserve enough space for our return list
+ // Attention: A null pointer is not allowed for return! (means lExtractedChildren)
+ org.w3c.dom.NodeList lChildren = aNode.getChildNodes();
+ int c = lChildren.getLength();
+ java.util.Vector lExtractedChildren = new java.util.Vector(c);
- // step of these childs and select only needed ones
+ // step of these children and select only needed ones
for (int i=0; i<c; ++i)
{
- org.w3c.dom.Node aChild = lChilds.item(i);
+ org.w3c.dom.Node aChild = lChildren.item(i);
if (aChild.getNodeType() == nType)
- lExtractedChilds.add(aChild);
+ lExtractedChildren.add(aChild);
}
// pack(!) and return the list
- lExtractedChilds.trimToSize();
- return lExtractedChilds;
+ lExtractedChildren.trimToSize();
+ return lExtractedChildren;
}
//___________________________________________
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 9fae808..9e7e369 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -574,7 +574,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
if( pXMLElement != NULL )
{
data = new XMLData( sNewdata , NULL , true ); // Add new one
- pXMLElement->RemoveAndDeleteAllChilds();
+ pXMLElement->RemoveAndDeleteAllChildren();
pXMLElement->AddChild( data );
aLangHM->erase( sCur );
}
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 382ab42..6f7138b 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -79,7 +79,7 @@ XMLParentNode::~XMLParentNode()
/*****************************************************************************/
{
if( pChildList ){
- RemoveAndDeleteAllChilds();
+ RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -117,7 +117,7 @@ XMLParentNode& XMLParentNode::operator=(const XMLParentNode& obj){
if(this!=&obj){
XMLChildNode::operator=(obj);
if( pChildList ){
- RemoveAndDeleteAllChilds();
+ RemoveAndDeleteAllChildren();
delete pChildList;
pChildList = NULL;
}
@@ -227,7 +227,7 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
}
/*****************************************************************************/
-void XMLParentNode::RemoveAndDeleteAllChilds(){
+void XMLParentNode::RemoveAndDeleteAllChildren(){
/*****************************************************************************/
if ( pChildList ) {
for ( size_t i = 0; i < pChildList->size(); i++ )
diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index eb602e6..6931c89 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -4601,35 +4601,35 @@
+ */
+ //update OUTLOOK_EMAIL_LIST1
+ ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) |
PT_MV_BINARY;
-+ SBinaryArray oldChilds;
++ SBinaryArray oldChildren;
+ LPSBinary bins=NULL;
-+ SBinaryArray newChilds;
++ SBinaryArray newChildren;
+ LPSPropValue oldChildValue = NULL ;
+ ULONG valueCount = 0 ;
+
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
-+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
-+ oldChilds = oldChildValue->Value.MVbin;
-+ newChilds.cValues=oldChilds.cValues + 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
-+ for (ULONG i=0;i<oldChilds.cValues;i++)
++ oldChildren = oldChildValue->Value.MVbin;
++ newChildren.cValues=oldChildren.cValues + 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
++ for (ULONG i=0;i<oldChildren.cValues;i++)
+ {
-+ newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
-+ newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
++ newChildren.lpbin[i].lpb = oldChildren.lpbin[i].lpb;
++ newChildren.lpbin[i].cb = oldChildren.lpbin[i].cb;
+ }
+ }
+ else
+ {
-+ newChilds.cValues = 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
++ newChildren.cValues = 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
+ }
+
+ nsMapiEntry orgEntryID;
@@ -4639,17 +4639,17 @@
+ {
+ return FALSE;
+ }
-+ newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *,
orgEntryID.mEntryId);
-+ newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
++ newChildren.lpbin[newChildren.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *,
orgEntryID.mEntryId);
++ newChildren.lpbin[newChildren.cValues-1].cb = orgEntryID.mByteCount;
+
-+ SPropValue childs;
-+ childs.ulPropTag = listTag;
-+ childs.Value.MVbin = newChilds;
++ SPropValue children;
++ children.ulPropTag = listTag;
++ children.Value.MVbin = newChildren;
+
+ LPSPropProblemArray problems = NULL ;
-+ mLastError = container->SetProps(1, &childs, &problems) ;
++ mLastError = container->SetProps(1, &children, &problems) ;
+ if (HR_FAILED(mLastError)) {
-+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4657,27 +4657,27 @@
+ listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
-+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
-+ oldChilds = oldChildValue->Value.MVbin;
-+ newChilds.cValues=oldChilds.cValues + 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
-+ for (ULONG i=0;i<oldChilds.cValues;i++)
++ oldChildren = oldChildValue->Value.MVbin;
++ newChildren.cValues=oldChildren.cValues + 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
++ for (ULONG i=0;i<oldChildren.cValues;i++)
+ {
-+ newChilds.lpbin[i].lpb = oldChilds.lpbin[i].lpb;
-+ newChilds.lpbin[i].cb = oldChilds.lpbin[i].cb;
++ newChildren.lpbin[i].lpb = oldChildren.lpbin[i].lpb;
++ newChildren.lpbin[i].cb = oldChildren.lpbin[i].cb;
+ }
+ }
+ else
+ {
-+ newChilds.cValues = 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
++ newChildren.cValues = 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
+ }
+
+ /*
@@ -4688,16 +4688,16 @@
+ Currently we can only add first kind of address to a outlook distlist.
+ */
+
-+ newChilds.lpbin[newChilds.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *,
orgEntryID.mEntryId);
-+ newChilds.lpbin[newChilds.cValues-1].cb = orgEntryID.mByteCount;
++ newChildren.lpbin[newChildren.cValues-1].lpb = NS_REINTERPRET_CAST(unsigned char *,
orgEntryID.mEntryId);
++ newChildren.lpbin[newChildren.cValues-1].cb = orgEntryID.mByteCount;
+
-+ childs.ulPropTag = listTag;
-+ childs.Value.MVbin = newChilds;
++ children.ulPropTag = listTag;
++ children.Value.MVbin = newChildren;
+
-+ mLastError = container->SetProps(1, &childs, &problems) ;
++ mLastError = container->SetProps(1, &children, &problems) ;
+ if (HR_FAILED(mLastError))
+ {
-+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4737,42 +4737,42 @@
+ //update OUTLOOK_EMAIL_LIST1
+ ULONG listTag=GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST1) |
PT_MV_BINARY;
+
-+ SBinaryArray oldChilds;
++ SBinaryArray oldChildren;
+ LPSBinary bins=NULL;
-+ SBinaryArray newChilds;
++ SBinaryArray newChildren;
+ LPSPropValue oldChildValue = NULL ;
+ ULONG valueCount = 0 ;
+
-+ newChilds.lpbin=NULL;
++ newChildren.lpbin=NULL;
+
+ ULONG lDeleteEntry=0;
+ ULONG newIndex=0;
+ ULONG oldIndex=0;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
-+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
-+ oldChilds = oldChildValue->Value.MVbin;
-+ newChilds.cValues=oldChilds.cValues - 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
-+ for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
++ oldChildren = oldChildValue->Value.MVbin;
++ newChildren.cValues=oldChildren.cValues - 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
++ for (oldIndex=0;oldIndex<oldChildren.cValues;oldIndex++)
+ {
-+ if ( oldChilds.lpbin[oldIndex].cb == aNewEntry.mByteCount &&
-+ !memcmp((void*)(oldChilds.lpbin[oldIndex].lpb+4),
++ if ( oldChildren.lpbin[oldIndex].cb == aNewEntry.mByteCount &&
++ !memcmp((void*)(oldChildren.lpbin[oldIndex].lpb+4),
+ (void*)(aNewEntry.mEntryId->ab),
-+ oldChilds.lpbin[oldIndex].cb-4))
++ oldChildren.lpbin[oldIndex].cb-4))
+ {
+ lDeleteEntry=oldIndex;
+ }
+ else
+ {
-+ newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
-+ newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
++ newChildren.lpbin[newIndex].lpb = oldChildren.lpbin[oldIndex].lpb;
++ newChildren.lpbin[newIndex].cb = oldChildren.lpbin[oldIndex].cb;
+ newIndex++;
+ }
+ }
@@ -4781,10 +4781,10 @@
+ return FALSE;
+
+
-+ SPropValue childs;
++ SPropValue children;
+ LPSPropProblemArray problems = NULL ;
+
-+ if (newChilds.cValues == 0)
++ if (newChildren.cValues == 0)
+ {
+ SPropTagArray delTags;
+ delTags.cValues = 1;
@@ -4794,13 +4794,13 @@
+ }
+ else
+ {
-+ childs.ulPropTag = listTag;
-+ childs.Value.MVbin = newChilds;
-+ mLastError = container->SetProps(1, &childs, &problems) ;
++ children.ulPropTag = listTag;
++ children.Value.MVbin = newChildren;
++ mLastError = container->SetProps(1, &children, &problems) ;
+ }
+
+ if (HR_FAILED(mLastError)) {
-+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
@@ -4808,37 +4808,37 @@
+ listTag = GetEmailPropertyTag(*(LPMAPIPROP*)&container,OUTLOOK_EMAIL_LIST2) | PT_MV_BINARY;
+ if (!GetMAPIProperties(aDistlist, &listTag, 1, oldChildValue, valueCount))
+ {
-+ PRINTF(("Cannot get old childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot get old children %08x.\n", mLastError)) ;
+ return FALSE;
+ }
+
+ newIndex=0;
+ if (! (oldChildValue->Value.l == MAPI_E_NOT_FOUND))
+ {
-+ oldChilds = oldChildValue->Value.MVbin;
-+ newChilds.cValues=oldChilds.cValues - 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
-+ for (oldIndex=0;oldIndex<oldChilds.cValues;oldIndex++)
++ oldChildren = oldChildValue->Value.MVbin;
++ newChildren.cValues=oldChildren.cValues - 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
++ for (oldIndex=0;oldIndex<oldChildren.cValues;oldIndex++)
+ {
+ if (oldIndex != lDeleteEntry)
+ {
-+ newChilds.lpbin[newIndex].lpb = oldChilds.lpbin[oldIndex].lpb;
-+ newChilds.lpbin[newIndex].cb = oldChilds.lpbin[oldIndex].cb;
++ newChildren.lpbin[newIndex].lpb = oldChildren.lpbin[oldIndex].lpb;
++ newChildren.lpbin[newIndex].cb = oldChildren.lpbin[oldIndex].cb;
+ newIndex++;
+ }
+ }
+ }
+ else
+ {
-+ newChilds.cValues = 1;
-+ mMAPIAllocateBuffer(sizeof(SBinary) * newChilds.cValues,(void**)& bins);
-+ newChilds.lpbin = bins;
++ newChildren.cValues = 1;
++ mMAPIAllocateBuffer(sizeof(SBinary) * newChildren.cValues,(void**)& bins);
++ newChildren.lpbin = bins;
+ }
+
-+ if (newChilds.cValues == 0)
++ if (newChildren.cValues == 0)
+ {
+ SPropTagArray delTags;
+ delTags.cValues = 1;
@@ -4848,12 +4848,12 @@
+ }
+ else
+ {
-+ childs.ulPropTag = listTag;
-+ childs.Value.MVbin = newChilds;
-+ mLastError = container->SetProps(1, &childs, &problems) ;
++ children.ulPropTag = listTag;
++ children.Value.MVbin = newChildren;
++ mLastError = container->SetProps(1, &children, &problems) ;
+ }
+ if (HR_FAILED(mLastError)) {
-+ PRINTF(("Cannot set childs %08x.\n", mLastError)) ;
++ PRINTF(("Cannot set children %08x.\n", mLastError)) ;
+ return FALSE ;
+ }
+
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index cbe58f0..7ba64a5 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1718,7 +1718,7 @@ void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
// the copy will be created internally
// usual copying is not applicable here, only last flushed version of the
- // child stream should be used for copiing. Probably the childs m_xPackageStream
+ // child stream should be used for copiing. Probably the children m_xPackageStream
// can be used as a base of a new stream, that would be copied to result
// storage. The only problem is that some package streams can be accessed from outside
// at the same time ( now solwed by wrappers that remember own position ).
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
index e575e33..ff93a9e 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
@@ -138,16 +138,16 @@ public class _XAccessibleSelection extends MultiMethodTest {
log.println("ChildCount: " + childCount);
- int usedChilds = childCount;
+ int usedChildren = childCount;
if (childCount > 500) {
log.println("Restricting to 500");
- usedChilds = 500;
+ usedChildren = 500;
}
- if (usedChilds > 0) {
+ if (usedChildren > 0) {
try {
- for (int i = 0; i < usedChilds; i++) {
+ for (int i = 0; i < usedChildren; i++) {
log.print("Trying to select child with index " + i + ": ");
if (isSelectable(tEnv.getTestObject(), i)) {
@@ -334,16 +334,16 @@ public class _XAccessibleSelection extends MultiMethodTest {
if (multiSelection) {
oObj.selectAllAccessibleChildren();
} else {
- int usedChilds = childCount;
+ int usedChildren = childCount;
if (childCount > 500) {
log.println("Restricting to 500");
- usedChilds = 500;
+ usedChildren = 500;
}
- if (usedChilds > 0) {
+ if (usedChildren > 0) {
try {
- for (int i = 0; i < usedChilds; i++) {
+ for (int i = 0; i < usedChildren; i++) {
if (isSelectable(tEnv.getTestObject(), i)) {
log.print("Trying to select child with index "+i+": ");
@@ -366,7 +366,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
}
int sCount = chkSelectable(tEnv.getTestObject());
- log.println("Found " + sCount + " selectable Childs");
+ log.println("Found " + sCount + " selectable Children");
int selectedCount = oObj.getSelectedAccessibleChildCount();
log.println("After selecting all accessible " + selectedCount +
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
index fa851bb..b69b841 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
@@ -383,7 +383,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* If the interface <code>XAccessibleSelection</code> is supported by
- * the component than selects all accessible childs.
+ * the component than selects all accessible children.
* Calls the method and checks a returned sequence.
* Has OK status if a returned sequince is in ascending order.
* The following method tests are to be executed before:
@@ -432,7 +432,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* If the interface <code>XAccessibleSelection</code> is supported by
- * the component than selects all accessible childs.
+ * the component than selects all accessible children.
* Calls the method and checks a returned sequence.
* Has OK status if a returned sequince is in ascending order.
* The following method tests are to be executed before:
@@ -483,7 +483,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* Calls the method with invalid indexes.
* If the interface <code>XAccessibleSelection</code> is supported by
- * the component than selects all accessible childs.
+ * the component than selects all accessible children.
* Calls the method for every row and checks returned values.
* The following method tests are to be executed before:
* <ul>
@@ -545,7 +545,7 @@ public class _XAccessibleTable extends MultiMethodTest {
/**
* Calls the method with invalid indexes.
* If the interface <code>XAccessibleSelection</code> is supported by
- * the component than selects all accessible childs.
+ * the component than selects all accessible children.
* Calls the method for every column and checks returned values.
* The following method tests are to be executed before:
* <ul>
diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 4101e3a..5d3c72d 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -137,10 +137,10 @@ public class SmEditAccessible extends TestCase {
new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
public void fireEvent() {
try {
- System.out.println("Childs "+con.getAccessibleChildCount());
+ System.out.println("Children "+con.getAccessibleChildCount());
xPS.setPropertyValue("Formula", "sum hat x \n int a \n sum b");
shortWait();
- System.out.println("Childs "+con.getAccessibleChildCount());
+ System.out.println("Children "+con.getAccessibleChildCount());
xPS.setPropertyValue("Formula", expFormula);
shortWait();
} catch(com.sun.star.lang.WrappedTargetException e) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
index 73d3a3b..d26bf92 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
@@ -127,7 +127,7 @@ public class AccessibleIconChoiceCtrl extends TestCase {
* <ul>
* <li> <code>'EventProducer'</code> for
* {@link ifc.accessibility._XAccessibleEventBroadcaster}:
- * method <code>fireEvent()</code> selects accessible childs
+ * method <code>fireEvent()</code> selects accessible children
* </li>
* </ul>
*
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index e575831..faf23ad 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -47,7 +47,7 @@ import org.jfree.report.structure.Section;
import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
/**
- * Before writing the table cell, we have to evaluate the childs of the cell. The cell itself can
either be empty or it
+ * Before writing the table cell, we have to evaluate the children of the cell. The cell itself
can either be empty or it
* has a one ore more paragraphs inside. The paragraph contains a single report element, but may
contain additional
* other content.
*
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
index 0af1062..22c3b77 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
@@ -108,14 +108,14 @@ public class OfficeStyles extends Element
private final Map pageStyles;
private final Map dataStyles;
private final Map styles;
- private final List otherChilds;
+ private final List otherChildren;
public OfficeStyles()
{
this.styles = new HashMap();
this.dataStyles = new HashMap();
this.pageStyles = new HashMap();
- this.otherChilds = new ArrayList();
+ this.otherChildren = new ArrayList();
}
public OfficeStyle getStyle(final String family, final String name)
@@ -163,7 +163,7 @@ public class OfficeStyles extends Element
public void addOtherNode(final Element node)
{
- otherChilds.add(node);
+ otherChildren.add(node);
}
public DataStyle[] getAllDataStyles()
@@ -183,7 +183,7 @@ public class OfficeStyles extends Element
public Element[] getOtherStyles()
{
- return (Element[]) otherChilds.toArray(new Element[otherChilds.size()]);
+ return (Element[]) otherChildren.toArray(new Element[otherChildren.size()]);
}
public boolean containsStyle(final String family, final String name)
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index 54b7d0d..d80058d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -151,7 +151,7 @@ public class StylesWriter
writeSection(masterPage);
}
- writeSectionChilds(officeStyles.getOtherNodes().getNodeArray());
+ writeSectionChildren(officeStyles.getOtherNodes().getNodeArray());
}
xmlWriter.writeCloseTag();
@@ -238,7 +238,7 @@ public class StylesWriter
writeSection(style);
}
- writeSectionChilds(styles.getOtherStyles());
+ writeSectionChildren(styles.getOtherStyles());
}
private void writeElement(final Element element)
@@ -263,12 +263,12 @@ public class StylesWriter
}
xmlWriter.writeTag(namespace, type, attrList, XmlWriterSupport.OPEN);
- writeSectionChilds(section.getNodeArray());
+ writeSectionChildren(section.getNodeArray());
xmlWriter.writeCloseTag();
}
- private void writeSectionChilds(final Node[] nodes)
+ private void writeSectionChildren(final Node[] nodes)
throws IOException
{
for (int i = 0; i < nodes.length; i++)
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
index 2433a7d..5c91c93 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -48,12 +48,12 @@ public class OfficeStyleReadHandler extends ElementReadHandler
{
private final OfficeStyle officeStyle;
- private final List childs;
+ private final List children;
public OfficeStyleReadHandler()
{
this.officeStyle = new OfficeStyle();
- this.childs = new ArrayList();
+ this.children = new ArrayList();
}
/**
@@ -75,7 +75,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler
// }
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
- childs.add(readHandler);
+ children.add(readHandler);
return readHandler;
}
@@ -86,9 +86,9 @@ public class OfficeStyleReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
- for (int i = 0; i < childs.size(); i++)
+ for (int i = 0; i < children.size(); i++)
{
- final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
+ final ElementReadHandler handler = (ElementReadHandler) children.get(i);
officeStyle.addNode(handler.getElement());
}
}
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
index d679c1c..b453bd1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -45,19 +45,19 @@ import org.xml.sax.SAXException;
public class OfficeStylesReadHandler extends ElementReadHandler
{
- private final List textStyleChilds;
- private final List dataStyleChilds;
- private final List otherStyleChilds;
- private final List pageLayoutChilds;
+ private final List textStyleChildren;
+ private final List dataStyleChildren;
+ private final List otherStyleChildren;
+ private final List pageLayoutChildren;
private final OfficeStyles officeStyles;
public OfficeStylesReadHandler(final OfficeStyles officeStyles)
{
this.officeStyles = officeStyles;
- this.pageLayoutChilds = new ArrayList();
- this.dataStyleChilds = new ArrayList();
- this.textStyleChilds = new ArrayList();
- this.otherStyleChilds = new ArrayList();
+ this.pageLayoutChildren = new ArrayList();
+ this.dataStyleChildren = new ArrayList();
+ this.textStyleChildren = new ArrayList();
+ this.otherStyleChildren = new ArrayList();
}
/**
@@ -78,25 +78,25 @@ public class OfficeStylesReadHandler extends ElementReadHandler
if ("style".equals(tagName))
{
final OfficeStyleReadHandler xrh = new OfficeStyleReadHandler();
- textStyleChilds.add(xrh);
+ textStyleChildren.add(xrh);
return xrh;
}
else if ("page-layout".equals(tagName))
{
final PageLayoutReadHandler prh = new PageLayoutReadHandler();
- pageLayoutChilds.add(prh);
+ pageLayoutChildren.add(prh);
return prh;
}
}
else if (OfficeNamespaces.DATASTYLE_NS.equals(uri))
{
final DataStyleReadHandler xrh = new DataStyleReadHandler(false);
- dataStyleChilds.add(xrh);
+ dataStyleChildren.add(xrh);
return xrh;
}
final SectionReadHandler genericReadHander = new SectionReadHandler();
- otherStyleChilds.add(genericReadHander);
+ otherStyleChildren.add(genericReadHander);
return genericReadHander;
}
@@ -107,31 +107,31 @@ public class OfficeStylesReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
- for (int i = 0; i < textStyleChilds.size(); i++)
+ for (int i = 0; i < textStyleChildren.size(); i++)
{
final OfficeStyleReadHandler handler =
- (OfficeStyleReadHandler) textStyleChilds.get(i);
+ (OfficeStyleReadHandler) textStyleChildren.get(i);
officeStyles.addStyle(handler.getOfficeStyle());
}
- for (int i = 0; i < pageLayoutChilds.size(); i++)
+ for (int i = 0; i < pageLayoutChildren.size(); i++)
{
final PageLayoutReadHandler handler =
- (PageLayoutReadHandler) pageLayoutChilds.get(i);
+ (PageLayoutReadHandler) pageLayoutChildren.get(i);
officeStyles.addPageStyle(handler.getPageLayout());
}
- for (int i = 0; i < dataStyleChilds.size(); i++)
+ for (int i = 0; i < dataStyleChildren.size(); i++)
{
final DataStyleReadHandler handler =
- (DataStyleReadHandler) dataStyleChilds.get(i);
+ (DataStyleReadHandler) dataStyleChildren.get(i);
officeStyles.addDataStyle(handler.getDataStyle());
}
- for (int i = 0; i < otherStyleChilds.size(); i++)
+ for (int i = 0; i < otherStyleChildren.size(); i++)
{
final SectionReadHandler handler =
- (SectionReadHandler) otherStyleChilds.get(i);
+ (SectionReadHandler) otherStyleChildren.get(i);
officeStyles.addOtherNode((Element) handler.getNode());
}
}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
index d781a05..a973236 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -50,12 +50,12 @@ public class PageLayoutReadHandler extends ElementReadHandler
{
private final PageLayout pageLayout;
- private final List childs;
+ private final List children;
public PageLayoutReadHandler()
{
this.pageLayout = new PageLayout();
- this.childs = new ArrayList();
+ this.children = new ArrayList();
}
/**
@@ -74,7 +74,7 @@ public class PageLayoutReadHandler extends ElementReadHandler
{
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
- childs.add(readHandler);
+ children.add(readHandler);
return readHandler;
}
@@ -85,9 +85,9 @@ public class PageLayoutReadHandler extends ElementReadHandler
*/
protected void doneParsing() throws SAXException
{
- for (int i = 0; i < childs.size(); i++)
+ for (int i = 0; i < children.size(); i++)
{
- final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
+ final ElementReadHandler handler = (ElementReadHandler) children.get(i);
pageLayout.addNode(handler.getElement());
}
}
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index 5dcd52d..0c94e6c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -41,7 +41,7 @@ import org.xml.sax.SAXException;
/**
- * Reads all childs of a style-definition. This simply copies everything that
+ * Reads all children of a style-definition. This simply copies everything that
* is contained in the source-file into a generic structure that can be
* written out later.
*/
@@ -49,12 +49,12 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
{
private final Section rawSection;
- private final List childs;
+ private final List children;
public StyleDefinitionReadHandler()
{
this.rawSection = new Section();
- this.childs = new ArrayList();
+ this.children = new ArrayList();
}
/**
@@ -73,7 +73,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
{
final StyleDefinitionReadHandler readHandler =
new StyleDefinitionReadHandler();
- childs.add(readHandler);
+ children.add(readHandler);
return readHandler;
}
@@ -85,9 +85,9 @@ public class StyleDefinitionReadHandler extends ElementReadHandler
protected void doneParsing()
throws SAXException
{
- for (int i = 0; i < childs.size(); i++)
+ for (int i = 0; i < children.size(); i++)
{
- final ElementReadHandler handler = (ElementReadHandler) childs.get(i);
+ final ElementReadHandler handler = (ElementReadHandler) children.get(i);
rawSection.addNode(handler.getElement());
}
}
diff --git a/rsc/doku/feinkonz.43/rsc.sdw b/rsc/doku/feinkonz.43/rsc.sdw
index 5727feb5b6f0a1a7a7984380d5ec6cac8dc7ca2e..fb9214668c506fbcf6fa1cc20480a45e159dc54e 100644
GIT binary patch
delta 44
wcmdnKlXdS-)(ut}%tfhro2@hAn8A!$*|pv5KoL$BCfmsyr;Bbj{N9!d0FJd0m;e9(
delta 30
jcmdnHlXd$})(ut}jK!O6Gvb(m)V%E4ZXhN1eSRtc#m)@q
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index d0b8489..fc08ca8 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -87,14 +87,14 @@ struct ScAccNote
ScAccNote() : mpTextHelper(NULL), mnParaCount(0) {}
};
-class ScNotesChilds
+class ScNotesChildren
{
public:
- ScNotesChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
- ~ScNotesChilds();
+ ScNotesChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
+ ~ScNotesChildren();
void Init(const Rectangle& rVisRect, sal_Int32 nOffset);
- sal_Int32 GetChildsCount() const;
+ sal_Int32 GetChildrenCount() const;
uno::Reference<XAccessible> GetChild(sal_Int32 nIndex) const;
uno::Reference<XAccessible> GetAt(const awt::Point& rPoint) const;
@@ -113,7 +113,7 @@ private:
sal_Int32 AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, sal_Bool
bMark, ScAccNotes& rNotes);
sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2);
- void CollectChilds(const ScAccNote& rNote, ScXAccList& rList);
+ void CollectChildren(const ScAccNote& rNote, ScXAccList& rList);
sal_Int32 CheckChanges(const ScPreviewLocationData& rData, const Rectangle& rVisRect,
sal_Bool bMark, ScAccNotes& rOldNotes, ScAccNotes& rNewNotes,
ScXAccList& rOldParas, ScXAccList& rNewParas);
@@ -121,7 +121,7 @@ private:
inline ScDocument* GetDocument() const;
};
-ScNotesChilds::ScNotesChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
+ScNotesChildren::ScNotesChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview*
pAccDoc)
: mpViewShell(pViewShell),
mpAccDoc(pAccDoc),
mnParagraphs(0),
@@ -138,13 +138,13 @@ struct DeleteAccNote
}
};
-ScNotesChilds::~ScNotesChilds()
+ScNotesChildren::~ScNotesChildren()
{
std::for_each(maNotes.begin(), maNotes.end(), DeleteAccNote());
std::for_each(maMarks.begin(), maMarks.end(), DeleteAccNote());
}
-::accessibility::AccessibleTextHelper* ScNotesChilds::CreateTextHelper(const String& rString,
const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset)
const
+::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const String& rString,
const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset)
const
{
::accessibility::AccessibleTextHelper* pTextHelper = NULL;
@@ -166,7 +166,7 @@ ScNotesChilds::~ScNotesChilds()
return pTextHelper;
}
-sal_Int32 ScNotesChilds::AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect,
sal_Bool bMark, ScAccNotes& rNotes)
+sal_Int32 ScNotesChildren::AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect,
sal_Bool bMark, ScAccNotes& rNotes)
{
sal_Int32 nCount = rData.GetNoteCountInRange(rVisRect, bMark);
@@ -205,7 +205,7 @@ sal_Int32 ScNotesChilds::AddNotes(const ScPreviewLocationData& rData, const Rect
return nParagraphs;
}
-void ScNotesChilds::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
+void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
{
if (mpViewShell && !mnParagraphs)
{
@@ -217,7 +217,7 @@ void ScNotesChilds::Init(const Rectangle& rVisRect, sal_Int32 nOffset)
}
}
-sal_Int32 ScNotesChilds::GetChildsCount() const
+sal_Int32 ScNotesChildren::GetChildrenCount() const
{
return mnParagraphs;
}
@@ -237,7 +237,7 @@ struct ScParaFound
}
};
-uno::Reference<XAccessible> ScNotesChilds::GetChild(sal_Int32 nIndex) const
+uno::Reference<XAccessible> ScNotesChildren::GetChild(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
@@ -294,7 +294,7 @@ struct ScPointFound
}
};
-uno::Reference<XAccessible> ScNotesChilds::GetAt(const awt::Point& rPoint) const
+uno::Reference<XAccessible> ScNotesChildren::GetAt(const awt::Point& rPoint) const
{
uno::Reference<XAccessible> xAccessible;
@@ -317,7 +317,7 @@ uno::Reference<XAccessible> ScNotesChilds::GetAt(const awt::Point& rPoint) const
return xAccessible;
}
-sal_Int8 ScNotesChilds::CompareCell(const ScAddress& aCell1, const ScAddress& aCell2)
+sal_Int8 ScNotesChildren::CompareCell(const ScAddress& aCell1, const ScAddress& aCell2)
{
OSL_ENSURE(aCell1.Tab() == aCell2.Tab(), "the notes should be on the same table");
sal_Int8 nResult(0);
@@ -331,14 +331,14 @@ sal_Int8 ScNotesChilds::CompareCell(const ScAddress& aCell1, const ScAddress&
aC
return nResult;
}
-void ScNotesChilds::CollectChilds(const ScAccNote& rNote, ScXAccList& rList)
+void ScNotesChildren::CollectChildren(const ScAccNote& rNote, ScXAccList& rList)
{
if (rNote.mpTextHelper)
for (sal_Int32 i = 0; i < rNote.mnParaCount; ++i)
rList.push_back(rNote.mpTextHelper->GetChild(i + rNote.mpTextHelper->GetStartIndex()));
}
-sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
+sal_Int32 ScNotesChildren::CheckChanges(const ScPreviewLocationData& rData,
const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rOldNotes,
ScAccNotes& rNewNotes, ScXAccList& rOldParas, ScXAccList& rNewParas)
{
@@ -394,10 +394,10 @@ sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
if (aNote.mpTextHelper)
aNote.mnParaCount = aNote.mpTextHelper->GetChildCount();
// collect removed children
- CollectChilds(*aItr, rOldParas);
+ CollectChildren(*aItr, rOldParas);
DELETEZ(aItr->mpTextHelper);
// collect new children
- CollectChilds(aNote, rNewParas);
+ CollectChildren(aNote, rNewParas);
}
bAddNote = sal_True;
// not necessary, because this branch should not be reached if it is the end
@@ -410,13 +410,13 @@ sal_Int32 ScNotesChilds::CheckChanges(const ScPreviewLocationData& rData,
if (aNote.mpTextHelper)
aNote.mnParaCount = aNote.mpTextHelper->GetChildCount();
// collect new children
- CollectChilds(aNote, rNewParas);
+ CollectChildren(aNote, rNewParas);
bAddNote = sal_True;
}
else
{
// collect removed children
- CollectChilds(*aItr, rOldParas);
+ CollectChildren(*aItr, rOldParas);
DELETEZ(aItr->mpTextHelper);
// no note to add
@@ -472,7 +472,7 @@ struct ScChildNew
}
};
-void ScNotesChilds::DataChanged(const Rectangle& rVisRect)
+void ScNotesChildren::DataChanged(const Rectangle& rVisRect)
{
if (mpViewShell && mpAccDoc)
{
@@ -501,7 +501,7 @@ struct ScChangeOffset
}
};
-inline ScDocument* ScNotesChilds::GetDocument() const
+inline ScDocument* ScNotesChildren::GetDocument() const
{
ScDocument* pDoc = NULL;
if (mpViewShell)
@@ -678,12 +678,12 @@ struct ScShapeRange
typedef std::vector<ScShapeRange> ScShapeRangeVec;
-class ScShapeChilds : public SfxListener,
+class ScShapeChildren : public SfxListener,
public ::accessibility::IAccessibleParent
{
public:
- ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
- ~ScShapeChilds();
+ ScShapeChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc);
+ ~ScShapeChildren();
///===== SfxListener =====================================================
@@ -731,7 +731,7 @@ private:
SdrPage* GetDrawPage() const;
};
-ScShapeChilds::ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview* pAccDoc)
+ScShapeChildren::ScShapeChildren(ScPreviewShell* pViewShell, ScAccessibleDocumentPagePreview*
pAccDoc)
:
mpAccDoc(pAccDoc),
mpViewShell(pViewShell),
@@ -745,7 +745,7 @@ ScShapeChilds::ScShapeChilds(ScPreviewShell* pViewShell, ScAccessibleDocumentPag
}
}
-ScShapeChilds::~ScShapeChilds()
+ScShapeChildren::~ScShapeChildren()
{
if (mpViewShell)
{
@@ -755,7 +755,7 @@ ScShapeChilds::~ScShapeChilds()
}
}
-void ScShapeChilds::SetDrawBroadcaster()
+void ScShapeChildren::SetDrawBroadcaster()
{
if (mpViewShell)
{
@@ -765,7 +765,7 @@ void ScShapeChilds::SetDrawBroadcaster()
}
}
-void ScShapeChilds::Notify(SfxBroadcaster&, const SfxHint& rHint)
+void ScShapeChildren::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
if ( rHint.ISA( SdrHint ) )
{
@@ -792,7 +792,7 @@ void ScShapeChilds::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
}
-void ScShapeChilds::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew) const
+void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew) const
{
ScShapeChildVec::iterator aOldItr = rOld.begin();
ScShapeChildVec::iterator aOldEnd = rOld.end();
@@ -849,14 +849,14 @@ void ScShapeChilds::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew)
co
}
}
-void ScShapeChilds::FindChanged(ScShapeRange& rOld, ScShapeRange& rNew) const
+void ScShapeChildren::FindChanged(ScShapeRange& rOld, ScShapeRange& rNew) const
{
FindChanged(rOld.maBackShapes, rNew.maBackShapes);
FindChanged(rOld.maForeShapes, rNew.maForeShapes);
FindChanged(rOld.maControls, rNew.maControls);
}
-void ScShapeChilds::DataChanged()
+void ScShapeChildren::DataChanged()
{
ScShapeRangeVec aOldShapeRanges(maShapeRanges);
maShapeRanges.clear();
@@ -881,7 +881,7 @@ struct ScVisAreaChanged
}
};
-void ScShapeChilds::VisAreaChanged() const
+void ScShapeChildren::VisAreaChanged() const
{
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
ScShapeRangeVec::const_iterator aItr = maShapeRanges.begin();
@@ -897,7 +897,7 @@ void ScShapeChilds::VisAreaChanged() const
///===== IAccessibleParent ==============================================
-sal_Bool ScShapeChilds::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
+sal_Bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& /* _rxShape */,
const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /*
_rShapeTreeInfo */)
throw (uno::RuntimeException)
@@ -908,7 +908,7 @@ sal_Bool ScShapeChilds::ReplaceChild (::accessibility::AccessibleShape* /* pCurr
///===== Internal ========================================================
-void ScShapeChilds::Init()
+void ScShapeChildren::Init()
{
if(mpViewShell)
{
@@ -925,7 +925,7 @@ void ScShapeChilds::Init()
}
}
-sal_Int32 ScShapeChilds::GetBackShapeCount() const
+sal_Int32 ScShapeChildren::GetBackShapeCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -934,7 +934,7 @@ sal_Int32 ScShapeChilds::GetBackShapeCount() const
return nCount;
}
-uno::Reference<XAccessible> ScShapeChilds::GetBackShape(sal_Int32 nIndex) const
+uno::Reference<XAccessible> ScShapeChildren::GetBackShape(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -955,7 +955,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackShape(sal_Int32 nIndex) const
return xAccessible;
}
-sal_Int32 ScShapeChilds::GetForeShapeCount() const
+sal_Int32 ScShapeChildren::GetForeShapeCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -964,7 +964,7 @@ sal_Int32 ScShapeChilds::GetForeShapeCount() const
return nCount;
}
-uno::Reference<XAccessible> ScShapeChilds::GetForeShape(sal_Int32 nIndex) const
+uno::Reference<XAccessible> ScShapeChildren::GetForeShape(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -985,7 +985,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetForeShape(sal_Int32 nIndex) const
return xAccessible;
}
-sal_Int32 ScShapeChilds::GetControlCount() const
+sal_Int32 ScShapeChildren::GetControlCount() const
{
sal_Int32 nCount(0);
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -994,7 +994,7 @@ sal_Int32 ScShapeChilds::GetControlCount() const
return nCount;
}
-uno::Reference<XAccessible> ScShapeChilds::GetControl(sal_Int32 nIndex) const
+uno::Reference<XAccessible> ScShapeChildren::GetControl(sal_Int32 nIndex) const
{
uno::Reference<XAccessible> xAccessible;
ScShapeRangeVec::const_iterator aEndItr = maShapeRanges.end();
@@ -1028,7 +1028,7 @@ struct ScShapePointFound
}
};
-uno::Reference<XAccessible> ScShapeChilds::GetForegroundShapeAt(const awt::Point& rPoint) const
//inclusive Controls
+uno::Reference<XAccessible> ScShapeChildren::GetForegroundShapeAt(const awt::Point& rPoint) const
//inclusive Controls
{
uno::Reference<XAccessible> xAcc;
@@ -1052,7 +1052,7 @@ uno::Reference<XAccessible> ScShapeChilds::GetForegroundShapeAt(const
awt::Point
return xAcc;
}
-uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const awt::Point& rPoint) const
+uno::Reference<XAccessible> ScShapeChildren::GetBackgroundShapeAt(const awt::Point& rPoint) const
{
uno::Reference<XAccessible> xAcc;
@@ -1070,12 +1070,12 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const
awt::Point
return xAcc;
}
-::accessibility::AccessibleShape* ScShapeChilds::GetAccShape(const ScShapeChild& rShape) const
+::accessibility::AccessibleShape* ScShapeChildren::GetAccShape(const ScShapeChild& rShape) const
{
if (!rShape.mpAccShape)
{
::accessibility::ShapeTypeHandler& rShapeHandler =
::accessibility::ShapeTypeHandler::Instance();
- ::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc,
const_cast<ScShapeChilds*>(this));
+ ::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc,
const_cast<ScShapeChildren*>(this));
if (mpViewShell)
{
@@ -1095,12 +1095,12 @@ uno::Reference<XAccessible> ScShapeChilds::GetBackgroundShapeAt(const
awt::Point
return rShape.mpAccShape;
}
-::accessibility::AccessibleShape* ScShapeChilds::GetAccShape(const ScShapeChildVec& rShapes,
sal_Int32 nIndex) const
+::accessibility::AccessibleShape* ScShapeChildren::GetAccShape(const ScShapeChildVec& rShapes,
sal_Int32 nIndex) const
{
return (GetAccShape(rShapes[nIndex]));
}
-void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode,
sal_uInt8 nRangeId)
+void ScShapeChildren::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode,
sal_uInt8 nRangeId)
{
OSL_ENSURE(nRangeId < maShapeRanges.size(), "this is not a valid range for draw objects");
SdrPage* pPage = GetDrawPage();
@@ -1175,7 +1175,7 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const
MapMode&
}
}
-SdrPage* ScShapeChilds::GetDrawPage() const
+SdrPage* ScShapeChildren::GetDrawPage() const
{
SCTAB nTab( mpViewShell->GetLocationData().GetPrintTab() );
SdrPage* pDrawPage = NULL;
@@ -1206,7 +1206,7 @@ struct ScPagePreviewCountData
long nControls;
ScPagePreviewCountData( const ScPreviewLocationData& rData, Window* pSizeWindow,
- ScNotesChilds* pNotesChilds, ScShapeChilds* pShapeChilds );
+ ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren );
long GetTotal() const
{
@@ -1215,8 +1215,8 @@ struct ScPagePreviewCountData
};
ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rData,
- Window* pSizeWindow, ScNotesChilds* pNotesChilds,
- ScShapeChilds* pShapeChilds) :
+ Window* pSizeWindow, ScNotesChildren* pNotesChildren,
+ ScShapeChildren* pShapeChildren) :
nBackShapes( 0 ),
nHeaders( 0 ),
nTables( 0 ),
@@ -1243,13 +1243,13 @@ ScPagePreviewCountData::ScPagePreviewCountData( const
ScPreviewLocationData& rDa
nTables = 1;
//! shapes...
- nBackShapes = pShapeChilds->GetBackShapeCount();
- nForeShapes = pShapeChilds->GetForeShapeCount();
- nControls = pShapeChilds->GetControlCount();
+ nBackShapes = pShapeChildren->GetBackShapeCount();
+ nForeShapes = pShapeChildren->GetForeShapeCount();
+ nControls = pShapeChildren->GetControlCount();
// there are only notes if there is no table
if (nTables == 0)
- nNoteParagraphs = pNotesChilds->GetChildsCount();
+ nNoteParagraphs = pNotesChildren->GetChildrenCount();
}
//===== internal ========================================================
@@ -1258,8 +1258,8 @@ ScAccessibleDocumentPagePreview::ScAccessibleDocumentPagePreview(
const uno::Reference<XAccessible>& rxParent, ScPreviewShell* pViewShell ) :
ScAccessibleDocumentBase(rxParent),
mpViewShell(pViewShell),
- mpNotesChilds(NULL),
- mpShapeChilds(NULL),
+ mpNotesChildren(NULL),
+ mpShapeChildren(NULL),
mpTable(NULL),
mpHeader(NULL),
mpFooter(NULL)
@@ -1306,12 +1306,12 @@ void SAL_CALL ScAccessibleDocumentPagePreview::disposing()
}
// no need to Dispose the AccessibleTextHelper,
- // as long as mpNotesChilds are destructed here
- if (mpNotesChilds)
- DELETEZ(mpNotesChilds);
+ // as long as mpNotesChildren are destructed here
+ if (mpNotesChildren)
+ DELETEZ(mpNotesChildren);
- if (mpShapeChilds)
- DELETEZ(mpShapeChilds);
+ if (mpShapeChildren)
+ DELETEZ(mpShapeChildren);
ScAccessibleDocumentBase::disposing();
}
@@ -1348,12 +1348,12 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const
SfxHint
aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint;
Rectangle aVisRect( aPoint, aOutputSize );
- GetNotesChilds()->DataChanged(aVisRect);
+ GetNotesChildren()->DataChanged(aVisRect);
- GetShapeChilds()->DataChanged();
+ GetShapeChildren()->DataChanged();
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(),
GetShapeChilds() );
+ ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(),
GetShapeChildren() );
if (aCount.nTables > 0)
{
@@ -1376,7 +1376,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const
SfxHint
}
else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER)
{
- GetShapeChilds()->SetDrawBroadcaster();
+ GetShapeChildren()->SetDrawBroadcaster();
}
else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
{
@@ -1386,9 +1386,9 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const
SfxHint
aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint;
Rectangle aVisRect( aPoint, aOutputSize );
- GetNotesChilds()->DataChanged(aVisRect);
+ GetNotesChildren()->DataChanged(aVisRect);
- GetShapeChilds()->VisAreaChanged();
+ GetShapeChildren()->VisAreaChanged();
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED;
@@ -1420,11 +1420,11 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocumentPagePreview::getAcces
if ( mpViewShell )
{
- xAccessible = GetShapeChilds()->GetForegroundShapeAt(rPoint);
+ xAccessible = GetShapeChildren()->GetForegroundShapeAt(rPoint);
if (!xAccessible.is())
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(),
GetShapeChilds() );
+ ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(),
GetNotesChildren(), GetShapeChildren() );
if ( !mpTable && (aCount.nTables > 0) )
{
@@ -1439,13 +1439,13 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocumentPagePreview::getAcces
xAccessible = mpTable;
}
if (!xAccessible.is())
- xAccessible = GetNotesChilds()->GetAt(rPoint);
+ xAccessible = GetNotesChildren()->GetAt(rPoint);
if (!xAccessible.is())
{
if (!mpHeader || !mpFooter)
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(),
GetNotesChilds(), GetShapeChilds() );
+ ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(),
GetNotesChildren(), GetShapeChildren() );
if (!mpHeader)
{
@@ -1467,7 +1467,7 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocumentPagePreview::getAcces
xAccessible = mpFooter;
}
if (!xAccessible.is())
- xAccessible = GetShapeChilds()->GetBackgroundShapeAt(rPoint);
+ xAccessible = GetShapeChildren()->GetBackgroundShapeAt(rPoint);
}
}
@@ -1499,7 +1499,7 @@ sal_Int32 SAL_CALL
ScAccessibleDocumentPagePreview::getAccessibleChildCount(void
long nRet = 0;
if ( mpViewShell )
{
- ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(),
GetNotesChilds(), GetShapeChilds() );
+ ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(),
GetNotesChildren(), GetShapeChildren() );
nRet = aCount.GetTotal();
}
@@ -1516,11 +1516,11 @@ uno::Reference<XAccessible> SAL_CALL
ScAccessibleDocumentPagePreview::getAccessi
if ( mpViewShell )
{
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(),
GetShapeChilds() );
+ ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(),
GetShapeChildren() );
if ( nIndex < aCount.nBackShapes )
{
- xAccessible = GetShapeChilds()->GetBackShape(nIndex);
+ xAccessible = GetShapeChildren()->GetBackShape(nIndex);
}
else if ( nIndex < aCount.nBackShapes + aCount.nHeaders )
{
@@ -1544,7 +1544,7 @@ uno::Reference<XAccessible> SAL_CALL
ScAccessibleDocumentPagePreview::getAccessi
}
else if ( nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nNoteParagraphs )
{
- xAccessible = GetNotesChilds()->GetChild(nIndex - aCount.nBackShapes -
aCount.nHeaders);
+ xAccessible = GetNotesChildren()->GetChild(nIndex - aCount.nBackShapes -
aCount.nHeaders);
}
else if ( (nIndex < aCount.nBackShapes + aCount.nHeaders + aCount.nTables +
aCount.nNoteParagraphs + aCount.nFooters) )
{
@@ -1559,9 +1559,9 @@ uno::Reference<XAccessible> SAL_CALL
ScAccessibleDocumentPagePreview::getAccessi
{
sal_Int32 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables +
aCount.nNoteParagraphs + aCount.nFooters));
if (nIdx < aCount.nForeShapes)
- xAccessible = GetShapeChilds()->GetForeShape(nIdx);
+ xAccessible = GetShapeChildren()->GetForeShape(nIdx);
else
- xAccessible = GetShapeChilds()->GetControl(nIdx - aCount.nForeShapes);
+ xAccessible = GetShapeChildren()->GetControl(nIdx - aCount.nForeShapes);
}
}
@@ -1680,30 +1680,30 @@ sal_Bool ScAccessibleDocumentPagePreview::IsDefunc(
(rxParentStates.is() && rxParentStates->contains(AccessibleStateType::DEFUNC));
}
-ScNotesChilds* ScAccessibleDocumentPagePreview::GetNotesChilds()
+ScNotesChildren* ScAccessibleDocumentPagePreview::GetNotesChildren()
{
- if (!mpNotesChilds && mpViewShell)
+ if (!mpNotesChildren && mpViewShell)
{
- mpNotesChilds = new ScNotesChilds(mpViewShell, this);
+ mpNotesChildren = new ScNotesChildren(mpViewShell, this);
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
- ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(),
GetShapeChilds() );
+ ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChildren(),
GetShapeChildren() );
//! order is background shapes, header, table or notes, footer, foreground shapes, controls
- mpNotesChilds->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders);
+ mpNotesChildren->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders);
}
- return mpNotesChilds;
+ return mpNotesChildren;
}
-ScShapeChilds* ScAccessibleDocumentPagePreview::GetShapeChilds()
+ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren()
{
- if (!mpShapeChilds && mpViewShell)
+ if (!mpShapeChildren && mpViewShell)
{
- mpShapeChilds = new ScShapeChilds(mpViewShell, this);
- mpShapeChilds->Init();
+ mpShapeChildren = new ScShapeChildren(mpViewShell, this);
+ mpShapeChildren->Init();
}
- return mpShapeChilds;
+ return mpShapeChildren;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index b524c6f..0e7cec2 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -33,8 +33,8 @@
#include "AccessibleDocumentBase.hxx"
class ScPreviewShell;
-class ScNotesChilds;
-class ScShapeChilds;
+class ScNotesChildren;
+class ScShapeChildren;
class ScAccessiblePreviewTable;
class ScAccessiblePageHeader;
@@ -125,7 +125,7 @@ protected:
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
-public: // needed in ScShapeChilds
+public: // needed in ScShapeChildren
/// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
@@ -137,8 +137,8 @@ protected:
private:
ScPreviewShell* mpViewShell;
- ScNotesChilds* mpNotesChilds;
- ScShapeChilds* mpShapeChilds;
+ ScNotesChildren* mpNotesChildren;
+ ScShapeChildren* mpShapeChildren;
ScAccessiblePreviewTable* mpTable;
ScAccessiblePageHeader* mpHeader;
ScAccessiblePageHeader* mpFooter;
@@ -147,8 +147,8 @@ private:
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- ScNotesChilds* GetNotesChilds();
- ScShapeChilds* GetShapeChilds();
+ ScNotesChildren* GetNotesChildren();
+ ScShapeChildren* GetShapeChildren();
};
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index c86211e..2f9c066 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -215,14 +215,14 @@ protected:
ScChangeActionTable& aActionTable,
SvLBoxEntry* pEntry);
- bool InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+ bool InsertContentChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
bool InsertAcceptedORejected(SvLBoxEntry* pParent);
- bool InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable*
pActionTable,
+ bool InsertDeletedChildren(const ScChangeAction *pChangeAction,
ScChangeActionTable* pActionTable,
SvLBoxEntry* pParent);
- bool InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+ bool InsertChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
void AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong
nEndAction,
sal_uLong nPos=LIST_APPEND);
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 8bca700..3dd531b 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -97,7 +97,7 @@ public:
inline void SetWindow(Window* _pWindow) { m_pWindow = _pWindow; }
sal_Bool DoClose( sal_uInt16 nId );
void SetDispatcherLock( sal_Bool bLock );
- void EnableSpreadsheets( sal_Bool bFlag = sal_True, sal_Bool bChilds = sal_True
);
+ void EnableSpreadsheets( sal_Bool bFlag = sal_True, sal_Bool bChildren =
sal_True );
void ViewShellChanged( ScTabViewShell* pScViewShell );
static void enableInput(sal_Bool _bInput);
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 31944f3..b3deaea 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -850,7 +850,7 @@ void ScAcceptChgDlg::UpdateView()
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
- pParent->EnableChildsOnDemand(true);
+ pParent->EnableChildrenOnDemand(true);
else
{
bool bTestFlag = bHasFilterEntry;
@@ -876,14 +876,14 @@ void ScAcceptChgDlg::UpdateView()
pParent=pTheView->InsertEntry(
aStrAllAccepted, static_cast< RedlinData * >(NULL),
static_cast< SvLBoxEntry * >(NULL));
- pParent->EnableChildsOnDemand(true);
+ pParent->EnableChildrenOnDemand(true);
}
if(nRejectCount>0)
{
pParent=pTheView->InsertEntry(
aStrAllRejected, static_cast< RedlinData * >(NULL),
static_cast< SvLBoxEntry * >(NULL));
- pParent->EnableChildsOnDemand(true);
+ pParent->EnableChildrenOnDemand(true);
}
pTheView->SetUpdateMode(true);
SetPointer(Pointer(POINTER_ARROW));
@@ -1191,7 +1191,7 @@ void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction,
aActionTable,pScChangeAction->IsMasterDelete());
}
-bool ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
+bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
bool bTheTestFlag = true;
ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData());
@@ -1293,7 +1293,7 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
return bTheTestFlag;
}
-bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
+bool ScAcceptChgDlg::InsertChildren(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
bool bTheTestFlag = true;
@@ -1320,7 +1320,7 @@ bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable*
pActionTable,SvLBoxEntry*
return bTheTestFlag;
}
-bool ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
+bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction,
ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
{
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -1370,7 +1370,7 @@ bool ScAcceptChgDlg::Expand(
{
case SC_CAT_CONTENT:
{
- InsertContentChilds(&aActionTable,pEntry);
+ InsertContentChildren(&aActionTable,pEntry);
bTheTestFlag=!bHasFilterEntry;
break;
}
@@ -1378,14 +1378,14 @@ bool ScAcceptChgDlg::Expand(
case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS:
{
- InsertDeletedChilds(pScChangeAction,&aActionTable,pEntry);
+ InsertDeletedChildren(pScChangeAction,&aActionTable,pEntry);
bTheTestFlag=!bHasFilterEntry;
break;
}
default:
{
if(!bFilter)
- bTheTestFlag=InsertChilds(&aActionTable,pEntry);
+ bTheTestFlag=InsertChildren(&aActionTable,pEntry);
break;
}
}
@@ -1409,10 +1409,10 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
if(pEntryData!=NULL)
pScChangeAction=(ScChangeAction*) pEntryData->pData;
- if(pEntry->HasChildsOnDemand())
+ if(pEntry->HasChildrenOnDemand())
{
bool bTheTestFlag = true;
- pEntry->EnableChildsOnDemand(false);
+ pEntry->EnableChildrenOnDemand(false);
pTheView->RemoveEntry(pTheView->FirstChild(pEntry));
if(pEntryData!=NULL)
@@ -1425,19 +1425,19 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
{
case SC_CAT_CONTENT:
{
- bTheTestFlag=InsertContentChilds(&aActionTable,pEntry);
+ bTheTestFlag=InsertContentChildren(&aActionTable,pEntry);
break;
}
case SC_CAT_DELETE_COLS:
case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS:
{
- bTheTestFlag=InsertDeletedChilds(pScChangeAction,&aActionTable,pEntry);
+
bTheTestFlag=InsertDeletedChildren(pScChangeAction,&aActionTable,pEntry);
break;
}
default:
{
- bTheTestFlag=InsertChilds(&aActionTable,pEntry);
+ bTheTestFlag=InsertChildren(&aActionTable,pEntry);
break;
}
}
@@ -1515,7 +1515,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong
nStartActio
if(pParent!=NULL && pScChangeAction->IsDialogParent())
{
if(!bFilterFlag)
- pParent->EnableChildsOnDemand(true);
+ pParent->EnableChildrenOnDemand(true);
else
{
bool bTestFlag = bHasFilterEntry;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 25e2f12..7b02de3 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -114,7 +114,7 @@ void ScFormulaReferenceHelper::enableInput( sal_Bool bEnable )
if(pParent)
{
pParent->EnableInput(bEnable,sal_True /* sal_False */);
- if(sal_True /*bChilds*/)
+ if(sal_True /*bChildren*/)
pViewSh->EnableRefInput(bEnable);
}
}
@@ -578,7 +578,7 @@ void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell
EnableSpreadsheets();
}
-void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChilds)
+void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChildren)
{
TypeId aType(TYPE(ScDocShell));
ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -601,7 +601,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChil
if(pParent)
{
pParent->EnableInput(bFlag,false);
- if(bChilds)
+ if(bChildren)
pViewSh->EnableRefInput(bFlag);
}
}
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 999b885..6273ddf 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -499,7 +499,7 @@ namespace basprov
const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
aChildNodes.realloc( nLibCount );
Reference< browse::XBrowseNode >* pChildNodes = aChildNodes.getArray();
- sal_Int32 childsFound = 0;
+ sal_Int32 childrenFound = 0;
for ( sal_Int32 i = 0 ; i < nLibCount ; ++i )
{
@@ -516,13 +516,13 @@ namespace basprov
}
if ( bCreate )
{
- pChildNodes[childsFound++] = static_cast< browse::XBrowseNode* >( new
BasicLibraryNodeImpl(
+ pChildNodes[childrenFound++] = static_cast< browse::XBrowseNode* >( new
BasicLibraryNodeImpl(
m_xContext, m_sScriptingContext, pBasicManager, xLibContainer,
pLibNames[i], m_bIsAppScriptCtx ) );
}
}
- if ( childsFound != nLibCount )
- aChildNodes.realloc( childsFound );
+ if ( childrenFound != nLibCount )
+ aChildNodes.realloc( childrenFound );
}
return aChildNodes;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index cfe7c6d..abd7b7a 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -104,12 +104,12 @@ public:
for ( sal_Int32 i = 0; i < m_Nodes.getLength(); i++ )
{
- Sequence< Reference < browse::XBrowseNode > > childs;
+ Sequence< Reference < browse::XBrowseNode > > children;
try
{
- childs = m_Nodes[ i ]->getChildNodes();
- seqs.push_back( childs );
- numChildren += childs.getLength();
+ children = m_Nodes[ i ]->getChildNodes();
+ seqs.push_back( children );
+ numChildren += children.getLength();
}
catch ( Exception& )
{
@@ -124,10 +124,10 @@ public:
Sequence< Reference < browse::XBrowseNode > > result( numChildren );
for ( sal_Int32 index = 0; it != it_end && index < numChildren ; ++it )
{
- Sequence< Reference < browse::XBrowseNode > > childs = *it;
- for ( sal_Int32 j = 0; j < childs.getLength(); j++ )
+ Sequence< Reference < browse::XBrowseNode > > children = *it;
+ for ( sal_Int32 j = 0; j < children.getLength(); j++ )
{
- result[ index++ ] = childs[ j ];
+ result[ index++ ] = children[ j ];
}
}
return result;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 02ec55c..fb619f0 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -419,7 +419,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer
importTimeContainer( pAtom, xNode );
dump( "</par>\n" );
- // for iteration containers, map target from childs to iteration
+ // for iteration containers, map target from children to iteration
Reference< XIterateContainer > xIter( xNode, UNO_QUERY );
if( xIter.is() )
{
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index bb5bf26..a2a2691 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -979,7 +979,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
DBG_ASSERT( pStateItem, "SfxStringItem erwartet");
String aPageName = pStateItem->GetValue();
- if( !pNavigatorWin->maTlbObjects.HasSelectedChilds( aPageName ) )
+ if( !pNavigatorWin->maTlbObjects.HasSelectedChildren( aPageName ) )
{
if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION )
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1300d1e..4c16804 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -328,14 +328,14 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
/*************************************************************************
|*
-|* Gibt zurueck, ob Childs des uebergebenen Strings selektiert sind
+|* Gibt zurueck, ob Children des uebergebenen Strings selektiert sind
|*
\************************************************************************/
-sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
+sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
{
sal_Bool bFound = sal_False;
- sal_Bool bChilds = sal_False;
+ sal_Bool bChildren = sal_False;
if( rName.Len() )
{
@@ -351,11 +351,11 @@ sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
sal_Bool bExpanded = IsExpanded( pEntry );
long nCount = GetChildSelectionCount( pEntry );
if( bExpanded && nCount > 0 )
- bChilds = sal_True;
+ bChildren = sal_True;
}
}
}
- return( bChilds );
+ return( bChildren );
}
@@ -423,7 +423,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
/*************************************************************************
|*
-|* Es wird nur der erste Eintrag eingefuegt. Childs werden OnDemand erzeugt
+|* Es wird nur der erste Eintrag eingefuegt. Children werden OnDemand erzeugt
|*
\************************************************************************/
@@ -541,7 +541,7 @@ void SdPageObjsTLB::AddShapeList (
}
}
- if( pEntry->HasChilds() )
+ if( pEntry->HasChildren() )
{
SetExpandedEntryBmp(
pEntry,
@@ -699,9 +699,9 @@ List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth )
|*
\************************************************************************/
-void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
+void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry )
{
- if( !pFileEntry->HasChilds() )
+ if( !pFileEntry->HasChildren() )
{
if( GetBookmarkDoc() )
{
@@ -754,7 +754,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
}
- if( pPageEntry->HasChilds() )
+ if( pPageEntry->HasChildren() )
{
SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
SetCollapsedEntryBmp( pPageEntry, aImgPageObjs );
@@ -765,7 +765,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
else
- SvTreeListBox::RequestingChilds( pFileEntry );
+ SvTreeListBox::RequestingChildren( pFileEntry );
}
/*************************************************************************
@@ -892,7 +892,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
{
// Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx
SvLBoxEntry* pCursor = GetCurEntry();
- if( pCursor->HasChilds() || pCursor->HasChildsOnDemand() )
+ if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
{
if( IsExpanded( pCursor ) )
Collapse( pCursor );
diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx
index 5cff556..2b3d2b0 100644
--- a/sd/source/ui/func/unmovss.cxx
+++ b/sd/source/ui/func/unmovss.cxx
@@ -68,7 +68,7 @@ void SdMoveStyleSheetsUndoAction::Undo()
pPool->Insert((*iter).get());
}
- // now assign the childs again
+ // now assign the children again
std::vector< SdStyleSheetVector >::iterator childlistiter( maListOfChildLists.begin() );
for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); ++iter,
++childlistiter )
{
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 2feaec4..1c9d5b5 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -150,7 +150,7 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
void DoDrag();
void OnDragFinished( sal_uInt8 nDropAction );
@@ -203,7 +203,7 @@ public:
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes (void) const;
sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
- sal_Bool HasSelectedChilds( const String& rName );
+ sal_Bool HasSelectedChildren( const String& rName );
sal_Bool SelectEntry( const String& rName );
String GetSelectEntry();
List* GetSelectEntryList( sal_uInt16 nDepth );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 32d8e71..1da357b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2579,7 +2579,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide,
cons
typedef sal_uInt16 (*FncGetChildWindowId)();
-FncGetChildWindowId aShowChilds[] =
+FncGetChildWindowId aShowChildren[] =
{
&AnimationChildWindow::GetChildWindowId,
&Svx3DChildWindow::GetChildWindowId,
@@ -2608,9 +2608,9 @@ void SlideshowImpl::hideChildWindows()
if( pViewFrame->GetChildWindow( SID_NAVIGATOR ) != NULL )
mnChildMask |= NAVIGATOR_CHILD_MASK;
- for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId );
i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId
); i < nCount; i++ )
{
- const sal_uInt16 nId = ( *aShowChilds[ i ] )();
+ const sal_uInt16 nId = ( *aShowChildren[ i ] )();
if( pViewFrame->GetChildWindow( nId ) )
{
@@ -2633,10 +2633,10 @@ void SlideshowImpl::showChildWindows()
{
pViewFrame->SetChildWindow( SID_NAVIGATOR, ( mnChildMask & NAVIGATOR_CHILD_MASK ) != 0
);
- for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId );
i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId
); i < nCount; i++ )
{
if( mnChildMask & ( 1 << i ) )
- pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), sal_True );
+ pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), sal_True );
}
}
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 8781d60..f7425f7 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -886,7 +886,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ))
bUnique = sal_False;
- if (pOutl->HasChilds(pPara))
+ if (pOutl->HasChildren(pPara))
{
if (!pOutl->IsExpanded(pPara))
bDisableExpand = sal_False;
@@ -934,10 +934,10 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
Paragraph* pPara = pOutl->GetParagraph( nParaPos );
while (pPara && (bDisableCollapseAll || bDisableExpandAll))
{
- if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
+ if (!pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableExpandAll = sal_False;
- if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
+ if (pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableCollapseAll = sal_False;
pPara = pOutl->GetParagraph( ++nParaPos );
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index c800d44..f518c29 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -73,7 +73,7 @@ protected:
virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent, sal_uIntPtr &);
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long ExpandingHdl();
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
@@ -125,7 +125,7 @@ private:
sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
- SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False,
+ SvLBoxEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False,
sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
};
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index eecb8be..228bc97 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -507,7 +507,7 @@ public:
virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
- virtual sal_Bool CanHaveChilds(
+ virtual sal_Bool CanHaveChildren(
sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE
);
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 50c7d59..e435e12 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -358,11 +358,11 @@ void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent )
// -----------------------------------------------------------------------
-void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
+void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent )
{
try
{
- if ( !pParent->HasChilds() )
+ if ( !pParent->HasChildren() )
{
if ( pParent->GetUserData() )
{
@@ -401,7 +401,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
}
catch( Exception& )
{
- OSL_FAIL( "ContentListBox_Impl::RequestingChilds(): unexpected exception" );
+ OSL_FAIL( "ContentListBox_Impl::RequestingChildren(): unexpected exception" );
}
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 3f05a14..492cb13 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -94,7 +94,7 @@ public:
~ContentListBox_Impl();
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long Notify( NotifyEvent& rNEvt );
inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 08af2d2..3eb2ebe 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -301,14 +301,14 @@ throw (css::uno::RuntimeException)
if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_True );
- m_pWrkWin->ShowChilds_Impl();
- m_pWrkWin->ArrangeChilds_Impl( sal_True );
+ m_pWrkWin->ShowChildren_Impl();
+ m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_False );
- m_pWrkWin->HideChilds_Impl();
- m_pWrkWin->ArrangeChilds_Impl( sal_True );
+ m_pWrkWin->HideChildren_Impl();
+ m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
{
@@ -515,14 +515,14 @@ sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
void SfxWorkWindow::Sort_Impl()
{
aSortedList.clear();
- for (sal_uInt16 i=0; i<pChilds->Count(); i++)
+ for (sal_uInt16 i=0; i<pChildren->Count(); i++)
{
- SfxChild_Impl *pCli = (*pChilds)[i];
+ SfxChild_Impl *pCli = (*pChildren)[i];
if (pCli)
{
sal_uInt16 k;
for (k=0; k<aSortedList.size(); k++)
- if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
+ if (ChildAlignValue((*pChildren)[aSortedList[k]]->eAlign) >
ChildAlignValue(pCli->eAlign))
break;
aSortedList.insert( aSortedList.begin() + k, i );
@@ -580,12 +580,12 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow*
pPar
pWorkWin (pWin),
pConfigShell( 0 ),
pActiveChild( 0 ),
- nChilds( 0 ),
+ nChildren( 0 ),
nOrigMode( 0 ),
bSorted( sal_True ),
bDockingAllowed(sal_True),
bInternalDockingAllowed(sal_True),
- bAllChildsVisible(sal_True),
+ bAllChildrenVisible(sal_True),
bIsFullScreen( sal_False ),
bShowStatusBar( sal_True ),
m_nLock( 0 ),
@@ -600,13 +600,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow*
pPar
pBindings->SetWorkWindow_Impl( this );
pChildWins = new SfxChildWindows_Impl;
- pChilds = new SfxChildList_Impl;
+ pChildren = new SfxChildList_Impl;
// For the ObjectBars a integral place in the Childlist is reserved,
// so that they always come in a defined order.
SfxChild_Impl* pChild=0;
for (sal_uInt16 n=0; n < SFX_OBJECTBAR_MAX; ++n)
- pChilds->Insert(0,pChild);
+ pChildren->Insert(0,pChild);
// create and initialize layout manager listener
Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface();
@@ -634,8 +634,8 @@ SfxWorkWindow::~SfxWorkWindow()
}
// Delete help structure for Child-Windows
- DBG_ASSERT( pChilds->Count() == 0, "dangling childs" );
- delete pChilds;
+ DBG_ASSERT( pChildren->Count() == 0, "dangling children" );
+ delete pChildren;
delete pChildWins;
if ( m_xLayoutManagerListener.is() )
@@ -655,7 +655,7 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
}
if ( !m_nLock )
- ArrangeChilds_Impl();
+ ArrangeChildren_Impl();
}
//--------------------------------------------------------------------
@@ -704,7 +704,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ATTENTION: The array itself is cleared after this loop!!
// Therefore we have to set every array entry to zero as it could be
// accessed by calling pChild->Destroy().
- // Window::NotifyAllChilds() calls SfxWorkWindow::DataChanged_Impl for
+ // Window::NotifyAllChildren() calls SfxWorkWindow::DataChanged_Impl for
// 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!!
}
@@ -730,7 +730,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// Delete StatusBar
ResetStatusBar_Impl();
- // Delete ObjectBars (this is done last, so that pChilds does not
+ // Delete ObjectBars (this is done last, so that pChildren does not
// receive dead Pointers)
for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
{
@@ -743,21 +743,21 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ObjectBars are all released at once, since they occupy a
// fixed contiguous area in the array pChild
- pChilds->Remove(0, SFX_OBJECTBAR_MAX);
+ pChildren->Remove(0, SFX_OBJECTBAR_MAX);
bSorted = sal_False;
- nChilds = 0;
+ nChildren = 0;
}
//====================================================================
// Virtual method for placing the child window.
-void SfxWorkWindow::ArrangeChilds_Impl( sal_Bool /*bForce*/)
+void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/)
{
Arrange_Impl();
}
-void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
+void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce )
{
if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
return;
@@ -775,7 +775,7 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
return;
SvBorder aBorder;
- if ( nChilds )
+ if ( nChildren )
{
if ( IsVisible_Impl() )
aBorder = Arrange_Impl();
@@ -783,12 +783,12 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
// If the current application document contains a IPClient, then the
// object through SetTopToolFramePixel has to be assigned the available
// space. The object will then point to its UITools and sets the app border
- // (-> SfxInPlaceEnv_Impl:: ArrangeChilds_Impl ()). Otherwise the
+ // (-> SfxInPlaceEnv_Impl:: ArrangeChildren_Impl ()). Otherwise the
// app border is set here directly to possibly overwrite the Border that
// was set by an object from another document. The object does not set
// the SetAppBorder when it removes its UI tools so that no-dithering
// ObjectBar arises.
- // (->SfxInPlaceEnv_Impl::ArrangeChilds_Impl())
+ // (->SfxInPlaceEnv_Impl::ArrangeChildren_Impl())
pMasterFrame->SetToolSpaceBorderPixel_Impl( aBorder );
@@ -813,7 +813,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
aUpperClientArea = aClientArea;
SvBorder aBorder;
- if ( !nChilds )
+ if ( !nChildren )
return aBorder;
if (!bSorted)
@@ -825,7 +825,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( !pCli->pWin )
continue;
@@ -967,7 +967,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
- DBG_ASSERT( pChilds->Count() < 255, "too many children" );
+ DBG_ASSERT( pChildren->Count() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
DBG_ASSERT( !FindChild_Impl(rWindow), "child registered more than once" );
@@ -979,10 +979,10 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
eAlign, rWindow.IsVisible());
pChild->bCanGetFocus = bCanGetFocus;
- pChilds->Insert(pChilds->Count(), pChild);
+ pChildren->Insert(pChildren->Count(), pChild);
bSorted = sal_False;
- nChilds++;
- return (*pChilds)[pChilds->Count()-1];
+ nChildren++;
+ return (*pChildren)[pChildren->Count()-1];
}
//--------------------------------------------------------------------
@@ -993,19 +993,19 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
SfxChild_Impl *pChild = 0;
sal_uInt16 nPos;
- for ( nPos = 0; nPos < pChilds->Count(); ++nPos )
+ for ( nPos = 0; nPos < pChildren->Count(); ++nPos )
{
- pChild = (*pChilds)[nPos];
+ pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
break;
}
- if ( nPos < pChilds->Count() )
+ if ( nPos < pChildren->Count() )
{
bSorted = sal_False;
- nChilds--;
- pChilds->Remove(nPos);
+ nChildren--;
+ pChildren->Remove(nPos);
delete pChild;
}
else {
@@ -1020,10 +1020,10 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
DBG_CHKTHIS(SfxWorkWindow, 0);
SfxChild_Impl *pChild = 0;
- sal_uInt16 nCount = pChilds->Count();
+ sal_uInt16 nCount = pChildren->Count();
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
{
- pChild = (*pChilds)[nPos];
+ pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
return pChild;
@@ -1034,17 +1034,17 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
//--------------------------------------------------------------------
-void SfxWorkWindow::ShowChilds_Impl()
+void SfxWorkWindow::ShowChildren_Impl()
{
DBG_CHKTHIS(SfxWorkWindow, 0);
bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() &&
!pWorkWin->IsReallyShown() ));
SfxChild_Impl *pCli = 0;
- for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
+ for ( sal_uInt16 nPos = 0; nPos < pChildren->Count(); ++nPos )
{
SfxChildWin_Impl* pCW = 0;
- pCli = (*pChilds)[nPos];
+ pCli = (*pChildren)[nPos];
if ( pCli && pCli->pWin )
{
@@ -1107,12 +1107,12 @@ void SfxWorkWindow::ShowChilds_Impl()
//--------------------------------------------------------------------
-void SfxWorkWindow::HideChilds_Impl()
+void SfxWorkWindow::HideChildren_Impl()
{
SfxChild_Impl *pChild = 0;
- for ( sal_uInt16 nPos = pChilds->Count(); nPos > 0; --nPos )
+ for ( sal_uInt16 nPos = pChildren->Count(); nPos > 0; --nPos )
{
- pChild = (*pChilds)[nPos-1];
+ pChild = (*pChildren)[nPos-1];
if (pChild && pChild->pWin)
{
switch ( pChild->pWin->GetType() )
@@ -1240,23 +1240,23 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
pWork = pParent;
while ( pWork )
{
- pWork->ArrangeChilds_Impl();
+ pWork->ArrangeChildren_Impl();
pWork = pWork->GetParent_Impl();
}
- ArrangeChilds_Impl( sal_False );
+ ArrangeChildren_Impl( sal_False );
pWork = pParent;
while ( pWork )
{
- pWork->ShowChilds_Impl();
+ pWork->ShowChildren_Impl();
pWork = pWork->GetParent_Impl();
}
- ShowChilds_Impl();
+ ShowChildren_Impl();
}
- ShowChilds_Impl();
+ ShowChildren_Impl();
}
Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator()
@@ -1469,7 +1469,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( bCreate )
CreateChildWin_Impl( pCW, sal_False );
- if ( !bAllChildsVisible )
+ if ( !bAllChildrenVisible )
{
if ( pCW->pCli )
pCW->pCli->nVisible &= ~CHILD_ACTIVE;
@@ -1478,7 +1478,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
else if ( pChildWin )
{
// Window already exists, it should also be visible?
- if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) &&
bAllChildsVisible )
+ if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) &&
bAllChildrenVisible )
{
// Update Mode is compatible; definitely enable it
bCreate = AllowChildWindowCreation_Impl( *pCW );
@@ -1487,7 +1487,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( pCW->pCli )
{
// The window is a direct Child
- if ( bAllChildsVisible && ( (IsDockingAllowed() &&
bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
+ if ( bAllChildrenVisible && ( (IsDockingAllowed() &&
bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
}
else
@@ -1548,10 +1548,10 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool
bSetFoc
if (nPos != CHILDWIN_NOPOS)
{
DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
- if ((*pChilds)[TbxMatch(nPos)])// &&
+ if ((*pChildren)[TbxMatch(nPos)])// &&
{
// ChildWindow replaces ObjectBar
- (*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
+ (*pChildren)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
}
}
@@ -1786,7 +1786,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
sal_uInt16 n;
for ( n=0; n<aSortedList.size(); ++n )
{
- pChild = (*pChilds)[aSortedList[n]];
+ pChild = (*pChildren)[aSortedList[n]];
if ( pChild )
if ( pChild->pWin == pWin )
break;
@@ -1813,7 +1813,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
for ( sal_uInt16 m=0; m<aSortedList.size(); ++m )
{
sal_uInt16 i=aSortedList[m];
- SfxChild_Impl* pCli = (*pChilds)[i];
+ SfxChild_Impl* pCli = (*pChildren)[i];
if ( pCli && pCli->nVisible == CHILD_VISIBLE && pCli->pWin )
{
@@ -1924,7 +1924,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
return;
SfxChildAlignment eAlign = SFX_ALIGN_NOALIGNMENT;
- SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChilds)[nPos] : 0;
+ SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChildren)[nPos] : 0;
if ( pCli && pDockWin )
{
eAlign = pDockWin->GetAlignment();
@@ -1944,8 +1944,8 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
pCli->eAlign = eAlign;
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
}
if ( pCW && pCW->pWin )
@@ -2096,8 +2096,8 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
}
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
if ( pCW->bCreate && bCreationAllowed )
{
@@ -2335,8 +2335,8 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible,
sal_
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
}
else if ( bVisible )
{
@@ -2530,19 +2530,19 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment
eAlign )
}
}
-void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
+void SfxWorkWindow::MakeChildrenVisible_Impl( sal_Bool bVis )
{
if ( pParent )
- pParent->MakeChildsVisible_Impl( bVis );
+ pParent->MakeChildrenVisible_Impl( bVis );
- bAllChildsVisible = bVis;
+ bAllChildrenVisible = bVis;
if ( bVis )
{
if ( !bSorted )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( (pCli->eAlign == SFX_ALIGN_NOALIGNMENT) || (IsDockingAllowed() &&
bInternalDockingAllowed) )
pCli->nVisible |= CHILD_ACTIVE;
}
@@ -2553,7 +2553,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
pCli->nVisible &= ~CHILD_ACTIVE;
}
}
@@ -2760,14 +2760,14 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
{
// Sort all children under list
std::vector<sal_uInt16> aList;
- for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
+ for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChildren->Count(); i++)
{
- SfxChild_Impl *pCli = (*pChilds)[i];
+ SfxChild_Impl *pCli = (*pChildren)[i];
if ( pCli && pCli->bCanGetFocus && pCli->pWin )
{
sal_uInt16 k;
for (k=0; k<aList.size(); k++)
- if ( ChildTravelValue((*pChilds)[aList[k]]->eAlign) >
ChildTravelValue(pCli->eAlign) )
+ if ( ChildTravelValue((*pChildren)[aList[k]]->eAlign) >
ChildTravelValue(pCli->eAlign) )
break;
aList.insert( aList.begin() + k, i );
}
@@ -2779,7 +2779,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
sal_uInt16 nTopValue = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
for ( sal_uInt16 i=0; i<aList.size(); i++ )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[i]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[i]];
if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
break;
}
@@ -2791,7 +2791,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
// Look for the active window
for ( n=0; n<aList.size(); n++ )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli && pCli->pWin && ( pCli->pWin == pActiveChild || !pActiveChild ) )
{
pAct = pCli;
@@ -2831,7 +2831,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
for( ;; )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli->pWin )
{
SfxChild_Impl* pNext = pCli;
@@ -2881,7 +2881,7 @@ void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
pCW->pWin->GetWindow()->UpdateSettings( Application::GetSettings() );
}
- ArrangeChilds_Impl();
+ ArrangeChildren_Impl();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 6b9c903..91e6b22 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -378,8 +378,8 @@ void SfxSplitWindow::SplitResize()
{
if ( bPinned )
{
- pWorkWin->ArrangeChilds_Impl();
- pWorkWin->ShowChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
+ pWorkWin->ShowChildren_Impl();
}
else
pWorkWin->ArrangeAutoHideWindows( this );
@@ -723,7 +723,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible =
CHILD_VISIBLE;
- pWorkWin->ArrangeChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
if ( bFadeIn )
FadeIn();
}
@@ -743,12 +743,12 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
}
#endif
pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible =
CHILD_VISIBLE;
- pWorkWin->ArrangeChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
if ( bFadeIn )
FadeIn();
}
- pWorkWin->ShowChilds_Impl();
+ pWorkWin->ShowChildren_Impl();
}
if ( bUpdateMode )
@@ -1137,8 +1137,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
pEmptyWin->Hide();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
- pWorkWin->ArrangeChilds_Impl();
- pWorkWin->ShowChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
+ pWorkWin->ShowChildren_Impl();
}
}
else
@@ -1154,8 +1154,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
pEmptyWin->Actualize();
OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
- pWorkWin->ArrangeChilds_Impl();
- pWorkWin->ShowChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
+ pWorkWin->ShowChildren_Impl();
pWorkWin->ArrangeAutoHideWindows( this );
}
else
@@ -1174,17 +1174,17 @@ void SfxSplitWindow::AutoHide()
{
// It "floats", thus dock it again
SetPinned_Impl( sal_True );
- pWorkWin->ArrangeChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
}
else
{
// In "limbo"
SetPinned_Impl( sal_False );
- pWorkWin->ArrangeChilds_Impl();
+ pWorkWin->ArrangeChildren_Impl();
pWorkWin->ArrangeAutoHideWindows( this );
}
- pWorkWin->ShowChilds_Impl();
+ pWorkWin->ShowChildren_Impl();
SaveConfig_Impl();
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0a2833b..675b153 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -638,12 +638,12 @@ struct StyleTree_Impl
{
String aName;
String aParent;
- StyleTreeArr_Impl *pChilds;
+ StyleTreeArr_Impl *pChildren;
sal_Bool bIsExpanded;
sal_Bool HasParent() const { return aParent.Len() != 0; }
StyleTree_Impl(const String &rName, const String &rParent):
- aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {}
+ aName(rName), aParent(rParent), pChildren(0), bIsExpanded(0) {}
~StyleTree_Impl();
void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
sal_uIntPtr Count();
@@ -656,26 +656,26 @@ SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr)
sal_uIntPtr StyleTree_Impl::Count()
{
- return pChilds ? pChilds->Count() : 0L;
+ return pChildren ? pChildren->Count() : 0L;
}
//-------------------------------------------------------------------------
StyleTree_Impl::~StyleTree_Impl()
{
- delete pChilds;
+ delete pChildren;
}
//-------------------------------------------------------------------------
void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
{
- if ( !pChilds )
- pChilds = new StyleTreeArr_Impl;
+ if ( !pChildren )
+ pChildren = new StyleTreeArr_Impl;
if ( ULONG_MAX == lPos )
- lPos = pChilds->Count();
- pChilds->Insert( pIns, (sal_uInt16)lPos );
+ lPos = pChildren->Count();
+ pChildren->Insert( pIns, (sal_uInt16)lPos );
}
//-------------------------------------------------------------------------
@@ -703,7 +703,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
// Paste initial filter
sal_uInt16 nPos;
for( nPos = 0 ; nPos < pCmp->Count() &&
- aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ;
nPos++)
+ aSorter.compare((*pCmp->pChildren)[nPos]->aName, pEntry->aName) < 0 ;
nPos++)
{};
pCmp->Put(pEntry,nPos);
break;
@@ -743,9 +743,9 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox,
SvLBoxEntry* pParent = 0)
{
SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent);
- const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
+ const sal_uInt16 nCount = pEntry->pChildren? pEntry->pChildren->Count(): 0;
for(sal_uInt16 i = 0; i < nCount; ++i)
- FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry);
+ FillBox_Impl(pBox, (*pEntry->pChildren)[i], rEntries, pNewEntry);
return pNewEntry;
}
@@ -2069,7 +2069,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
if ( pTreeBox )
{
- pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() );
+ pTreeBox->RemoveParentKeepChildren( pTreeBox->FirstSelected() );
bDontUpdate = sal_False;
}
}
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index b67d273..fb03e55 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -706,9 +706,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// the general reference point
while(GetModel()->GetDepth(pParentIter) != nTLevel)
pParentIter = GetParent(pParentIter);
- if(pParentIter->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pParentIter))
- RequestingChilds(pParentIter);
+ if(pParentIter->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pParentIter))
+ RequestingChildren(pParentIter);
SvLBoxEntry *pChildIter = 0;
sal_uInt16 i = 0;
@@ -721,16 +721,16 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// If possible, fill in Items onDemand
++i;
if(i < 2 && p[i+1] != INDEX_IGNORE &&
- pChildIter->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pChildIter))
- RequestingChilds(pChildIter);
+ pChildIter->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pChildIter))
+ RequestingChildren(pChildIter);
pParentIter = pChildIter;
}
rIdx = p[i];
pNewParent = pParentIter;
if(!IsExpanded(pNewParent) &&
- pNewParent->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pNewParent))
+ pNewParent->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pNewParent))
{
bOk = sal_False;
if(!bCopy)
@@ -1132,20 +1132,20 @@ SfxObjectShellRef SfxOrganizeListBox_Impl::GetObjectShell(const Path &rPath)
//-------------------------------------------------------------------------
-void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
+void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry )
/* [Description]
- Sent to the Childs of an entry that is going to be inserted.
+ Sent to the Children of an entry that is going to be inserted.
(SV-Handler)
[Parameter]
- SvLBoxEntry* pEntry the entry whose Childs is requested
+ SvLBoxEntry* pEntry the entry whose Children is requested
*/
{
- if ( !GetModel()->HasChilds( pEntry ) )
+ if ( !GetModel()->HasChildren( pEntry ) )
{
WaitObject aWaitCursor( this );
@@ -1175,8 +1175,8 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
const sal_uInt16 nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
String aText;
Bitmap aClosedBmp, aOpenedBmp;
- const bool bCanHaveChilds =
- aRef->CanHaveChilds(aPath[nDocLevel+1],
+ const bool bCanHaveChildren =
+ aRef->CanHaveChildren(aPath[nDocLevel+1],
aPath[nDocLevel+2]);
for(sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -1191,7 +1191,7 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
SvLBoxEntry *pNew = SvTreeListBox::InsertEntry(
aText, aOpenedImage, aClosedImage,
- pEntry, bCanHaveChilds);
+ pEntry, bCanHaveChildren);
pNew->SetUserData(bDeletable ? &bDeletable : 0);
}
}
@@ -1285,7 +1285,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
const XubString& rText,
BMPTYPE eBmpType,
SvLBoxEntry* pParent,
- sal_Bool bChildsOnDemand,
+ sal_Bool bChildrenOnDemand,
sal_uIntPtr nPos,
void* pUserData
)
@@ -1310,7 +1310,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
OSL_FAIL( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" );
}
- pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildsOnDemand, nPos,
pUserData );
+ pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildrenOnDemand, nPos,
pUserData );
return pEntry;
}
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 9e3a137..570a13a 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -351,7 +351,7 @@ void SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
}
}
-sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
+sal_Bool SfxObjectShell::CanHaveChildren(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
switch(nIdx1)
{
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a84206d..4b678ae 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1075,7 +1075,7 @@ sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
return sal_False;
- // Its Childs are locked?
+ // Its Children are locked?
for ( sal_uInt16 n = GetChildFrameCount(); n--; )
if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
return sal_False;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 347147d..f4dd3c5 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -239,19 +239,19 @@ protected:
Rectangle aUpperClientArea;
SfxWorkWindow* pParent;
SfxSplitWindow* pSplit[SFX_SPLITWINDOWS_MAX];
- SfxChildList_Impl* pChilds;
+ SfxChildList_Impl* pChildren;
SfxChildWindows_Impl* pChildWins;
SfxBindings* pBindings;
Window* pWorkWin;
SfxShell* pConfigShell;
Window* pActiveChild;
sal_uInt16 nUpdateMode;
- sal_uInt16 nChilds;
+ sal_uInt16 nChildren;
sal_uInt16 nOrigMode;
sal_Bool bSorted : 1;
sal_Bool bDockingAllowed : 1;
sal_Bool bInternalDockingAllowed : 1;
- sal_Bool bAllChildsVisible : 1;
+ sal_Bool bAllChildrenVisible : 1;
sal_Bool bIsFullScreen : 1;
sal_Bool bShowStatusBar : 1;
sal_Int32 m_nLock;
@@ -295,15 +295,15 @@ public:
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
void ReleaseChild_Impl( Window& rWindow );
SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign,
sal_Bool bCanGetFocus=sal_False );
- void ShowChilds_Impl();
- void HideChilds_Impl();
+ void ShowChildren_Impl();
+ void HideChildren_Impl();
sal_Bool PrepareClose_Impl();
- virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
+ virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
void DeleteControllers_Impl();
void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16
nId=0);
void ConfigChild_Impl(SfxChildIdentifier,
SfxDockingConfig, sal_uInt16);
- void MakeChildsVisible_Impl( sal_Bool bVis );
+ void MakeChildrenVisible_Impl( sal_Bool bVis );
void ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit );
void EndAutoShow_Impl( Point aPos );
@@ -355,7 +355,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
SfxFrame* pFrame;
public:
SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
- virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
+ virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
virtual void UpdateObjectBars_Impl();
virtual Rectangle GetTopRect_Impl();
};
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index f4bf5fd..d270559 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -917,8 +917,8 @@ void SfxFrame::Resize()
if ( pWork )
{
- pWork->ArrangeChilds_Impl();
- pWork->ShowChilds_Impl();
+ pWork->ArrangeChildren_Impl();
+ pWork->ShowChildren_Impl();
}
// problem in presence of UIActive object: when the window is resized, but the
toolspace border
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 35b4435..e18398f 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -219,7 +219,7 @@ void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange )
DoResize();
SfxViewFrame* pView = pFrame->GetCurrentViewFrame();
if ( pView )
- pView->GetBindings().GetWorkWindow_Impl()->ShowChilds_Impl();
+ pView->GetBindings().GetWorkWindow_Impl()->ShowChildren_Impl();
}
Window::StateChanged( nStateChange );
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 092d165..23641cb 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -274,7 +274,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
if ( bShow )
{
// First, make the floats viewable
- pWorkWin->MakeChildsVisible_Impl( bShow );
+ pWorkWin->MakeChildrenVisible_Impl( bShow );
GetDispatcher()->Update_Impl( sal_True );
// Then view it
@@ -291,7 +291,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
}
pWorkWin->HidePopups_Impl( !bShow, sal_True, nId );
- pWorkWin->MakeChildsVisible_Impl( bShow );
+ pWorkWin->MakeChildrenVisible_Impl( bShow );
}
Invalidate( rReq.GetSlot() );
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 414ff77..65cbe3e 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -175,7 +175,7 @@ public:
#define SV_ENTRYFLAG_CHILDREN_ON_DEMAND 0x0001
#define SV_ENTRYFLAG_DISABLE_DROP 0x0002
#define SV_ENTRYFLAG_IN_USE 0x0004
-// wird gesetzt, wenn RequestingChilds keine Childs gestzt hat
+// wird gesetzt, wenn RequestingChildren keine Children gestzt hat
#define SV_ENTRYFLAG_NO_NODEBMP 0x0008
// Eintrag hatte oder hat Kinder
#define SV_ENTRYFLAG_HAD_CHILDREN 0x0010
@@ -208,8 +208,8 @@ public:
void* GetUserData() const { return pUserData; }
void SetUserData( void* pPtr ) { pUserData = pPtr; }
virtual void Clone( SvListEntry* pSource );
- void EnableChildsOnDemand( sal_Bool bEnable=sal_True );
- sal_Bool HasChildsOnDemand() const { return (sal_Bool)((nEntryFlags &
SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); }
+ void EnableChildrenOnDemand( sal_Bool bEnable=sal_True );
+ sal_Bool HasChildrenOnDemand() const { return (sal_Bool)((nEntryFlags &
SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); }
sal_Bool HasInUseEmphasis() const { return (sal_Bool)((nEntryFlags &
SV_ENTRYFLAG_IN_USE)!=0); }
sal_uInt16 GetFlags() const { return nEntryFlags; }
@@ -307,7 +307,7 @@ protected:
sal_Bool CheckDragAndDropMode( SvLBox* pSource, sal_Int8 );
void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow);
void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True,
- sal_Bool bWithChilds = sal_True );
+ sal_Bool bWithChildren = sal_True );
// standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die
// D&D unterstuetzen, ueberladen werden
using Window::GetDropTarget;
@@ -481,7 +481,7 @@ public:
virtual sal_Bool Expand( SvLBoxEntry* pParent );
virtual sal_Bool Collapse( SvLBoxEntry* pParent );
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect );
+ virtual sal_uLong SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True );
virtual void SetCurEntry( SvLBoxEntry* _pEntry ) = 0;
@@ -509,7 +509,7 @@ public:
// wird aufgerufen, wenn ein Eintrag mit gesetztem
// ENTRYFLAG_CHILDREN_ON_DEMAND expandiert wird.
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
// Drag & Drop
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index aa32ebe..749df91 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -88,7 +88,7 @@ public:
long GetLogicTab( sal_uInt16 nTab );
virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
+ sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind =
SvLBoxButtonKind_enabledCheckbox );
@@ -96,7 +96,7 @@ public:
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
+ sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind =
SvLBoxButtonKind_enabledCheckbox );
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index b46ebe7..eab00e7 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -202,7 +202,7 @@ public:
}
virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
+ sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind =
SvLBoxButtonKind_enabledCheckbox );
@@ -210,7 +210,7 @@ public:
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
SvLBoxEntry* pParent = 0,
- sal_Bool bChildsOnDemand = sal_False,
+ sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind =
SvLBoxButtonKind_enabledCheckbox );
@@ -256,7 +256,7 @@ public:
void EndEditing( sal_Bool bCancel = sal_False ) { SvLBox::EndEditing( bCancel ); }
sal_Bool EditingCanceled() const { return SvLBox::EditingCanceled(); }
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void Paint( const Rectangle& rRect );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -326,7 +326,7 @@ public:
virtual sal_Bool Expand( SvLBoxEntry* pParent );
virtual sal_Bool Collapse( SvLBoxEntry* pParent );
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect );
+ virtual sal_uLong SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True );
virtual void SetCurEntry( SvLBoxEntry* _pEntry );
virtual SvLBoxEntry*
@@ -340,8 +340,8 @@ public:
virtual Region GetDragRegion() const;
- // Childs des Parents werden Childs des naechstoberen Parents
- void RemoveParentKeepChilds( SvLBoxEntry* pParent );
+ // Children des Parents werden Children des naechstoberen Parents
+ void RemoveParentKeepChildren( SvLBoxEntry* pParent );
DECL_LINK( DefaultCompare, SvSortData* );
virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index bddb362..a9eff0a 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -152,7 +152,7 @@ friend class SvListView;
private:
SvListEntry* pParent;
- SvTreeEntryList* pChilds;
+ SvTreeEntryList* pChildren;
sal_uLong nAbsPos;
sal_uLong nListPos;
@@ -166,7 +166,7 @@ public:
SvListEntry();
SvListEntry( const SvListEntry& );
virtual ~SvListEntry();
- sal_Bool HasChilds() { return (sal_Bool)(pChilds!=0); }
+ sal_Bool HasChildren() { return (sal_Bool)(pChildren!=0); }
sal_Bool HasChildListPos() const
{
if( pParent && !(pParent->nListPos & 0x80000000) )
@@ -296,8 +296,8 @@ class SVT_DLLPUBLIC SvTreeList
void Collapse( SvListView*,SvListEntry* pParent );
SVT_DLLPRIVATE void SetAbsolutePositions();
- SVT_DLLPRIVATE SvTreeEntryList*CloneChilds(
- SvTreeEntryList* pChilds,
+ SVT_DLLPRIVATE SvTreeEntryList*CloneChildren(
+ SvTreeEntryList* pChildren,
SvListEntry* pNewParent,
sal_uLong& nCloneCount
) const;
@@ -311,7 +311,7 @@ class SVT_DLLPUBLIC SvTreeList
sal_uLong& rPos
);
- SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent );
+ SVT_DLLPRIVATE void ResortChildren( SvListEntry* pParent );
protected:
SvListEntry* pRootItem;
@@ -367,7 +367,7 @@ public:
sal_Bool Remove( SvListEntry* pEntry );
void Clear();
- sal_Bool HasChilds( SvListEntry* pEntry ) const;
+ sal_Bool HasChildren( SvListEntry* pEntry ) const;
sal_Bool HasParent( SvListEntry* pEntry ) const
{ return (sal_Bool)(pEntry->pParent!=pRootItem); }
@@ -594,19 +594,19 @@ inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const
#endif
}
-inline sal_Bool SvTreeList::HasChilds( SvListEntry* pEntry ) const
+inline sal_Bool SvTreeList::HasChildren( SvListEntry* pEntry ) const
{
if ( !pEntry )
pEntry = pRootItem;
- return (sal_Bool)(pEntry->pChilds != 0);
+ return (sal_Bool)(pEntry->pChildren != 0);
}
inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const
{ if ( !pParent )
pParent = pRootItem;
SvListEntry* pRet = 0;
- if ( pParent->pChilds )
- pRet = (*pParent->pChilds)[ nPos ];
+ if ( pParent->pChildren )
+ pRet = (*pParent->pChildren)[ nPos ];
return pRet;
}
@@ -614,7 +614,7 @@ inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const
{
SvListEntry* pRet = 0;
if ( nEntryCount )
- pRet = (*pRootItem->pChilds)[ nRootPos ];
+ pRet = (*pRootItem->pChildren)[ nRootPos ];
return pRet;
}
@@ -622,7 +622,7 @@ inline SvTreeEntryList* SvTreeList::GetChildList( SvListEntry* pParent ) const
{
if ( !pParent )
pParent = pRootItem;
- return pParent->pChilds;
+ return pParent->pChildren;
}
inline SvListEntry* SvTreeList::GetParent( SvListEntry* pEntry ) const
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 603730f..7f6665b 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -197,7 +197,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry )
short nMax = Max(nExpWidth, nColWidth);
UpdateContextBmpWidthVector( pEntry, nMax );
- if( pEntry->HasChilds() ) // recursive call, whether expanded or not
+ if( pEntry->HasChildren() ) // recursive call, whether expanded or not
{
SvLBoxEntry* pChild = pView->FirstChild( pEntry );
DBG_ASSERT( pChild, "The first child is invalid!" );
@@ -996,7 +996,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop )
}
pParent = pView->GetParent( pParent );
}
- // Passen Childs der Parents in View oder muessen wir scrollen ?
+ // Passen Children der Parents in View oder muessen wir scrollen ?
if( IsEntryInView( pEntry ) && !bMoveToTop )
return; // Scrollen nicht noetig -> tschuess
}
@@ -1041,8 +1041,8 @@ void SvImpLBox::ScrollToAbsPos( long nPos )
void SvImpLBox::DrawNet()
{
- if( pView->GetVisibleCount() < 2 && !pStartEntry->HasChildsOnDemand() &&
- !pStartEntry->HasChilds() )
+ if( pView->GetVisibleCount() < 2 && !pStartEntry->HasChildrenOnDemand() &&
+ !pStartEntry->HasChildren() )
return;
//for platforms who don't have nets, DrawNativeControl does nothing and return true
@@ -1713,7 +1713,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
}
if( pEntry == pMostRightEntry || (
- pEntry->HasChilds() && pView->IsExpanded(pEntry) &&
+ pEntry->HasChildren() && pView->IsExpanded(pEntry) &&
pTree->IsChild(pEntry, pMostRightEntry)))
{
nFlags |= F_REMOVED_RECALC_MOST_RIGHT;
@@ -1741,7 +1741,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
if( bSimpleTravel )
pView->Select( pCursor, sal_False );
ShowCursor( sal_False ); // Focus-Rect weg
- // NextSibling, weil auch Childs des Cursors geloescht werden
+ // NextSibling, weil auch Children des Cursors geloescht werden
pTemp = pView->NextSibling( pCursor );
if( !pTemp )
pTemp = (SvLBoxEntry*)(pView->PrevVisible( pCursor ));
@@ -1832,7 +1832,7 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
if( pEntry == pStartEntry )
{
SvLBoxEntry* pNew = 0;
- if( !pEntry->HasChilds() )
+ if( !pEntry->HasChildren() )
{
pNew = (SvLBoxEntry*)(pView->NextVisible( pStartEntry ));
if( !pNew )
@@ -2051,7 +2051,7 @@ sal_Bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt )
// sal_False == kein Expand/Collapse-Button getroffen
sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const
{
- if( !pEntry->HasChilds() && !pEntry->HasChildsOnDemand() )
+ if( !pEntry->HasChildren() && !pEntry->HasChildrenOnDemand() )
return sal_False;
SvLBoxTab* pFirstDynamicTab = pView->GetFirstDynamicTab();
@@ -2160,7 +2160,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
return;
}
- if( pEntry->HasChilds() || pEntry->HasChildsOnDemand() )
+ if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() )
{
if( pView->IsExpanded(pEntry) )
pView->Collapse( pEntry );
@@ -2513,7 +2513,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
SvLBoxEntry* pCur = pTree->Next( pCursor );
while( pCur && pTree->GetDepth(pCur) > nRefDepth )
{
- if( pCur->HasChilds() && !pView->IsExpanded(pCur))
+ if( pCur->HasChildren() && !pView->IsExpanded(pCur))
pView->Expand( pCur );
pCur = pTree->Next( pCur );
}
@@ -2563,7 +2563,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
SvLBoxEntry* pCur = pTree->Next( pParentToCollapse );
while( pCur && pTree->GetDepth(pCur) > nRefDepth )
{
- if( pCur->HasChilds() && pView->IsExpanded(pCur) )
+ if( pCur->HasChildren() && pView->IsExpanded(pCur) )
pView->Collapse( pCur );
pCur = pTree->Next( pCur );
}
@@ -3439,7 +3439,7 @@ void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry*
pEntryToI
if( pChild != pEntryToIgnore )
{
SetMostRight( pChild );
- if( pChild->HasChilds() && pView->IsExpanded( pChild ))
+ if( pChild->HasChildren() && pView->IsExpanded( pChild ))
FindMostRight_Impl( pChild, pEntryToIgnore );
}
}
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index f5cd0d2..7eea319 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -617,7 +617,7 @@ void SvLBoxEntry::Clone( SvListEntry* pSource )
nEntryFlags = ((SvLBoxEntry*)pSource)->nEntryFlags;
}
-void SvLBoxEntry::EnableChildsOnDemand( sal_Bool bEnable )
+void SvLBoxEntry::EnableChildrenOnDemand( sal_Bool bEnable )
{
DBG_CHKTHIS(SvLBoxEntry,0);
if ( bEnable )
@@ -907,7 +907,7 @@ void SvLBox::NotifyRemoving( SvLBoxEntry* )
Standard-Verhalten:
- 1. Target hat keine Childs
+ 1. Target hat keine Children
- Entry wird Sibling des Targets. Entry steht hinter dem
Target (->Fenster: Unter dem Target)
2. Target ist ein aufgeklappter Parent
@@ -939,7 +939,7 @@ sal_Bool SvLBox::NotifyMoving(
rNewChildPos = 0;
return sal_True;
}
- if ( !pTarget->HasChilds() && !pTarget->HasChildsOnDemand() )
+ if ( !pTarget->HasChildren() && !pTarget->HasChildrenOnDemand() )
{
// Fall 1
rpNewParent = GetParent( pTarget );
@@ -976,7 +976,7 @@ sal_Bool SvLBox::NotifyCopying(
rNewChildPos = 0;
return sal_True;
}
- if ( !pTarget->HasChilds() && !pTarget->HasChildsOnDemand() )
+ if ( !pTarget->HasChildren() && !pTarget->HasChildrenOnDemand() )
{
// Fall 1
rpNewParent = GetParent( pTarget );
@@ -1021,8 +1021,8 @@ sal_Bool SvLBox::CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget )
SvLBoxEntry* pSourceEntry = pSource->FirstSelected();
while ( pSourceEntry )
{
- // Childs werden automatisch mitkopiert
- pSource->SelectChilds( pSourceEntry, sal_False );
+ // Children werden automatisch mitkopiert
+ pSource->SelectChildren( pSourceEntry, sal_False );
aList.push_back( pSourceEntry );
pSourceEntry = pSource->NextSelected( pSourceEntry );
}
@@ -1082,8 +1082,8 @@ sal_Bool SvLBox::MoveSelectionCopyFallbackPossible( SvLBox* pSource,
SvLBoxEntry
SvLBoxEntry* pSourceEntry = pSource->FirstSelected();
while ( pSourceEntry )
{
- // Childs werden automatisch mitbewegt
- pSource->SelectChilds( pSourceEntry, sal_False );
+ // Children werden automatisch mitbewegt
+ pSource->SelectChildren( pSourceEntry, sal_False );
aList.push_back( pSourceEntry );
pSourceEntry = pSource->NextSelected( pSourceEntry );
}
@@ -1143,9 +1143,9 @@ void SvLBox::RemoveSelection()
while ( pEntry )
{
aList.push_back( pEntry );
- if ( pEntry->HasChilds() )
- // Remove loescht Childs automatisch
- SelectChilds( pEntry, sal_False );
+ if ( pEntry->HasChildren() )
+ // Remove loescht Children automatisch
+ SelectChildren( pEntry, sal_False );
pEntry = NextSelected( pEntry );
}
pEntry = (SvLBoxEntry*)aList.First();
@@ -1161,7 +1161,7 @@ SvLBox* SvLBox::GetSourceView() const
return pDDSource;
}
-void SvLBox::RequestingChilds( SvLBoxEntry* )
+void SvLBox::RequestingChildren( SvLBoxEntry* )
{
DBG_CHKTHIS(SvLBox,0);
OSL_FAIL("Child-Request-Hdl not implemented!");
@@ -1236,7 +1236,7 @@ sal_Bool SvLBox::Select( SvLBoxEntry*, sal_Bool )
return sal_False;
}
-sal_uLong SvLBox::SelectChilds( SvLBoxEntry* , sal_Bool )
+sal_uLong SvLBox::SelectChildren( SvLBoxEntry* , sal_Bool )
{
DBG_CHKTHIS(SvLBox,0);
return 0;
@@ -1365,7 +1365,7 @@ void SvLBox::InitViewData( SvViewData* pData, SvListEntry* pEntry )
-void SvLBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWithChilds )
+void SvLBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWithChildren )
{
DBG_CHKTHIS(SvLBox,0);
sal_uInt16 nRefDepth;
@@ -1377,7 +1377,7 @@ void SvLBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool
bWithChilds
if ( !bEnable )
{
pSelEntry->nEntryFlags |= SV_ENTRYFLAG_DISABLE_DROP;
- if ( bWithChilds )
+ if ( bWithChildren )
{
nRefDepth = pModel->GetDepth( pSelEntry );
pTemp = Next( pSelEntry );
@@ -1391,7 +1391,7 @@ void SvLBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool
bWithChilds
else
{
pSelEntry->nEntryFlags &= (~SV_ENTRYFLAG_DISABLE_DROP);
- if ( bWithChilds )
+ if ( bWithChildren )
{
nRefDepth = pModel->GetDepth( pSelEntry );
pTemp = Next( pSelEntry );
@@ -1555,7 +1555,7 @@ const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry,
String& _
SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >(
_pCurrentSearchEntry ) );
if ( ( ( GetChildCount( pEntry ) > 0 )
- || ( pEntry->HasChildsOnDemand() )
+ || ( pEntry->HasChildrenOnDemand() )
)
&& !IsExpanded( pEntry )
)
@@ -1824,12 +1824,12 @@ void SvLBox::StartDrag( sal_Int8, const Point& rPosPixel )
Update();
Control::SetUpdateMode( bOldUpdateMode );
- // Selektion & deren Childs im Model als DropTargets sperren
+ // Selektion & deren Children im Model als DropTargets sperren
// Wichtig: Wenn im DropHandler die Selektion der
// SourceListBox veraendert wird, muessen vorher die Eintraege
// als DropTargets wieder freigeschaltet werden:
// (GetSourceListBox()->EnableSelectionAsDropTarget( sal_True, sal_True );)
- EnableSelectionAsDropTarget( sal_False, sal_True /* with Childs */ );
+ EnableSelectionAsDropTarget( sal_False, sal_True /* with Children */ );
pContainer->StartDrag( this, nDragOptions, GetDragFinishedHdl() );
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 0ee54fe..d9d9309 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -182,7 +182,7 @@ void SvTabListBox::SetTab( sal_uInt16 nTab,long nValue,MapUnit eMapUnit )
}
SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
- sal_Bool /*bChildsOnDemand*/,
+ sal_Bool /*bChildrenOnDemand*/,
sal_uLong nPos, void* pUserData,
SvLBoxButtonKind )
{
@@ -193,7 +193,7 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText,
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
SvLBoxEntry* pParent,
- sal_Bool /*bChildsOnDemand*/,
+ sal_Bool /*bChildrenOnDemand*/,
sal_uLong nPos, void* pUserData,
SvLBoxButtonKind )
{
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 7820d49..5fa9bde 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -381,7 +381,7 @@ IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData
SvLBoxEntry* SvTreeListBox::InsertEntry(
const XubString& aText,
SvLBoxEntry* pParent,
- sal_Bool bChildsOnDemand, sal_uLong nPos,
+ sal_Bool bChildrenOnDemand, sal_uLong nPos,
void* pUser,
SvLBoxButtonKind eButtonKind
)
@@ -398,7 +398,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry(
SvLBoxEntry* pEntry = CreateEntry();
pEntry->SetUserData( pUser );
InitEntry( pEntry, aText, rDefColBmp, rDefExpBmp, eButtonKind );
- pEntry->EnableChildsOnDemand( bChildsOnDemand );
+ pEntry->EnableChildrenOnDemand( bChildrenOnDemand );
if( !pParent )
SvLBox::Insert( pEntry, nPos );
@@ -415,7 +415,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry(
SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
const Image& aExpEntryBmp, const Image& aCollEntryBmp,
- SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos, void* pUser,
+ SvLBoxEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser,
SvLBoxButtonKind eButtonKind )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -428,7 +428,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
pEntry->SetUserData( pUser );
InitEntry( pEntry, aText, aCollEntryBmp, aExpEntryBmp, eButtonKind );
- pEntry->EnableChildsOnDemand( bChildsOnDemand );
+ pEntry->EnableChildrenOnDemand( bChildrenOnDemand );
if( !pParent )
SvLBox::Insert( pEntry, nPos );
@@ -605,7 +605,7 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
SvLBoxEntry* pClone = CreateEntry();
InitEntry( pClone, aStr, aCollEntryBmp, aExpEntryBmp, eButtonKind );
pClone->SvListEntry::Clone( pSource );
- pClone->EnableChildsOnDemand( pSource->HasChildsOnDemand() );
+ pClone->EnableChildrenOnDemand( pSource->HasChildrenOnDemand() );
pClone->SetUserData( pSource->GetUserData() );
return pClone;
@@ -743,10 +743,10 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
nImpFlags &= ~SVLBOX_IS_TRAVELSELECT;
}
-void SvTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
+void SvTreeListBox::RequestingChildren( SvLBoxEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
- if( !pParent->HasChilds() )
+ if( !pParent->HasChildren() )
InsertEntry( String::CreateFromAscii("<dummy>"), pParent, sal_False, LIST_APPEND );
}
@@ -938,9 +938,9 @@ sal_Bool SvTreeListBox::Expand( SvLBoxEntry* pParent )
sal_Bool bExpanded = sal_False;
sal_uInt16 nFlags;
- if( pParent->HasChildsOnDemand() )
- RequestingChilds( pParent );
- if( pParent->HasChilds() )
+ if( pParent->HasChildrenOnDemand() )
+ RequestingChildren( pParent );
+ if( pParent->HasChildren() )
{
nImpFlags |= SVLBOX_IS_EXPANDING;
if( ExpandingHdl() )
@@ -1020,12 +1020,12 @@ sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
return bRetVal;
}
-sal_uLong SvTreeListBox::SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect )
+sal_uLong SvTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->DestroyAnchor();
sal_uLong nRet = 0;
- if( !pParent->HasChilds() )
+ if( !pParent->HasChildren() )
return 0;
sal_uInt16 nRefDepth = pModel->GetDepth( pParent );
SvLBoxEntry* pChild = FirstChild( pParent );
@@ -1687,7 +1687,7 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16
nTabFl
if( (!(pEntry->GetFlags() & SV_ENTRYFLAG_NO_NODEBMP)) &&
(nWindowStyle & WB_HASBUTTONS) && pFirstDynamicTab &&
- ( pEntry->HasChilds() || pEntry->HasChildsOnDemand() ) )
+ ( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() ) )
{
// ersten festen Tab suchen, und pruefen ob die Node-Bitmap
// in ihn hineinragt
@@ -1712,7 +1712,7 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16
nTabFl
pImg = &pImp->GetExpandedNodeBmp( );
else
{
- if( (!pEntry->HasChilds()) && pEntry->HasChildsOnDemand() &&
+ if( (!pEntry->HasChildren()) && pEntry->HasChildrenOnDemand() &&
(!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) &&
pImp->GetDontKnowNodeBmp().GetSizePixel().Width() )
pImg = &pImp->GetDontKnowNodeBmp( );
@@ -1739,8 +1739,8 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16
nTabFl
aControlValue.setTristateVal( BUTTONVALUE_ON );//expanded node
else
{
- if( (!pEntry->HasChilds() ) &&
- pEntry->HasChildsOnDemand() &&
+ if( (!pEntry->HasChildren() ) &&
+ pEntry->HasChildrenOnDemand() &&
(!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) &&
pImp->GetDontKnowNodeBmp().GetSizePixel().Width()
)
@@ -2125,12 +2125,12 @@ void SvTreeListBox::Command( const CommandEvent& rCEvt )
}
-void SvTreeListBox::RemoveParentKeepChilds( SvLBoxEntry* pParent )
+void SvTreeListBox::RemoveParentKeepChildren( SvLBoxEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
- DBG_ASSERT(pParent,"RemoveParentKeepChilds:No Parent");
+ DBG_ASSERT(pParent,"RemoveParentKeepChildren:No Parent");
SvLBoxEntry* pNewParent = GetParent( pParent );
- if( pParent->HasChilds())
+ if( pParent->HasChildren())
{
SvLBoxEntry* pChild = FirstChild( pParent );
while( pChild )
@@ -2444,7 +2444,7 @@ void SvTreeListBox::FillAccessibleEntryStateSet( SvLBoxEntry* pEntry,
::utl::Acc
{
DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid entry" );
- if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
+ if ( pEntry->HasChildrenOnDemand() || pEntry->HasChildren() )
{
rStateSet.AddState( AccessibleStateType::EXPANDABLE );
if ( IsExpanded( pEntry ) )
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 4d02022..293a987 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -34,7 +34,7 @@ DBG_NAME(SvListEntry);
SvListEntry::SvListEntry()
{
DBG_CTOR(SvListEntry,0);
- pChilds = 0;
+ pChildren = 0;
pParent = 0;
nListPos = 0;
nAbsPos = 0;
@@ -43,7 +43,7 @@ SvListEntry::SvListEntry()
SvListEntry::SvListEntry( const SvListEntry& rEntry )
{
DBG_CTOR(SvListEntry,0);
- pChilds = 0;
+ pChildren = 0;
pParent = 0;
nListPos &= 0x80000000;
nListPos |= ( rEntry.nListPos & 0x7fffffff);
@@ -53,13 +53,13 @@ SvListEntry::SvListEntry( const SvListEntry& rEntry )
SvListEntry::~SvListEntry()
{
DBG_DTOR(SvListEntry,0);
- if ( pChilds )
+ if ( pChildren )
{
- pChilds->DestroyAll();
- delete pChilds;
+ pChildren->DestroyAll();
+ delete pChildren;
}
#ifdef DBG_UTIL
- pChilds = 0;
+ pChildren = 0;
pParent = 0;
#endif
}
@@ -74,16 +74,16 @@ void SvListEntry::Clone( SvListEntry* pSource)
void SvListEntry::SetListPositions()
{
- if( pChilds )
+ if( pChildren )
{
- SvListEntry *pEntry = (SvListEntry*)pChilds->First();
+ SvListEntry *pEntry = (SvListEntry*)pChildren->First();
sal_uLong nCur = 0;
while ( pEntry )
{
pEntry->nListPos &= 0x80000000;
pEntry->nListPos |= nCur;
nCur++;
- pEntry = (SvListEntry*)pChilds->Next();
+ pEntry = (SvListEntry*)pChildren->Next();
}
}
nListPos &= (~0x80000000);
@@ -252,7 +252,7 @@ sal_uInt16 SvTreeList::GetDepth( SvListEntry* pEntry ) const
void SvTreeList::Clear()
{
Broadcast( LISTACTION_CLEARING );
- SvTreeEntryList* pRootList = pRootItem->pChilds;
+ SvTreeEntryList* pRootList = pRootItem->pChildren;
if ( pRootList )
{
SvListEntry* pEntry = (SvListEntry*)(pRootList->First());
@@ -261,8 +261,8 @@ void SvTreeList::Clear()
delete pEntry;
pEntry = (SvListEntry*)(pRootList->Next());
}
- delete pRootItem->pChilds;
- pRootItem->pChilds = 0;
+ delete pRootItem->pChildren;
+ pRootItem->pChildren = 0;
}
nEntryCount = 0;
Broadcast( LISTACTION_CLEARED );
@@ -281,7 +281,7 @@ sal_Bool SvTreeList::IsChild( SvListEntry* pParent, SvListEntry* pChild ) const
pParent = pRootItem;
sal_Bool bIsChild = sal_False;
- SvTreeEntryList* pList = pParent->pChilds;
+ SvTreeEntryList* pList = pParent->pChildren;
if ( !pList )
return sal_False;
SvListEntry* pActualChild = (SvListEntry*)(pList->First());
@@ -291,7 +291,7 @@ sal_Bool SvTreeList::IsChild( SvListEntry* pParent, SvListEntry* pChild ) const
bIsChild = sal_True;
else
{
- if ( pActualChild->pChilds )
+ if ( pActualChild->pChildren )
bIsChild = IsChild( pActualChild, pChild );
pActualChild = (SvListEntry*)(pList->Next());
}
@@ -309,15 +309,15 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry*
pTargetParent,sal
Broadcast( LISTACTION_MOVING, pSrcEntry, pTargetParent, nListPos );
- if ( !pTargetParent->pChilds )
- pTargetParent->pChilds = new SvTreeEntryList;
+ if ( !pTargetParent->pChildren )
+ pTargetParent->pChildren = new SvTreeEntryList;
if ( pSrcEntry == pTargetParent )
return pSrcEntry->GetChildListPos();
bAbsPositionsValid = sal_False;
- SvTreeEntryList* pDstList = pTargetParent->pChilds;
- SvTreeEntryList* pSrcList = pSrcEntry->pParent->pChilds;
+ SvTreeEntryList* pDstList = pTargetParent->pChildren;
+ SvTreeEntryList* pSrcList = pSrcEntry->pParent->pChildren;
// Dummy-Ptr einfuegen, weil nListPos durch das
// folgende Remove ungueltig werden koennte
@@ -326,12 +326,12 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry*
pTargetParent,sal
// loeschen
pSrcList->remove( pSrcEntry );
- // Hat Parent noch Childs ?
+ // Hat Parent noch Children ?
if ( pSrcList->empty() )
{
- // Keine Childs, deshalb Child-List loeschen
+ // Keine Children, deshalb Child-List loeschen
SvListEntry* pParent = pSrcEntry->pParent;
- pParent->pChilds = 0;
+ pParent->pChildren = 0;
delete pSrcList;
pSrcList = 0;
}
@@ -363,8 +363,8 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
DBG_ASSERT(pSrcEntry,"Entry?");
if ( !pTargetParent )
pTargetParent = pRootItem;
- if ( !pTargetParent->pChilds )
- pTargetParent->pChilds = new SvTreeEntryList;
+ if ( !pTargetParent->pChildren )
+ pTargetParent->pChildren = new SvTreeEntryList;
bAbsPositionsValid = sal_False;
@@ -372,7 +372,7 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
SvListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount );
nEntryCount += nCloneCount;
- SvTreeEntryList* pDstList = pTargetParent->pChilds;
+ SvTreeEntryList* pDstList = pTargetParent->pChildren;
pClonedEntry->pParent = pTargetParent; // Parent umsetzen
pDstList->insert( pClonedEntry, nListPos ); // Einfuegen
SetListPositions( pDstList ); // Listenpositionen in Zielliste korrigieren
@@ -421,8 +421,8 @@ void SvTreeList::InsertTree(SvListEntry* pSrcEntry,
if ( !pTargetParent )
pTargetParent = pRootItem;
- if ( !pTargetParent->pChilds )
- pTargetParent->pChilds = new SvTreeEntryList;
+ if ( !pTargetParent->pChildren )
+ pTargetParent->pChildren = new SvTreeEntryList;
// Sortierung beruecksichtigen
GetInsertionPos( pSrcEntry, pTargetParent, nListPos );
@@ -430,7 +430,7 @@ void SvTreeList::InsertTree(SvListEntry* pSrcEntry,
bAbsPositionsValid = sal_False;
pSrcEntry->pParent = pTargetParent; // Parent umsetzen
- SvTreeEntryList* pDstList = pTargetParent->pChilds;
+ SvTreeEntryList* pDstList = pTargetParent->pChildren;
pDstList->insert( pSrcEntry, nListPos ); // einfuegen
SetListPositions(pDstList); // Listenpositionen in Zielliste korrigieren
nEntryCount += GetChildCount( pSrcEntry );
@@ -466,9 +466,9 @@ SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) co
{
SvListEntry* pClonedEntry = CloneEntry( pEntry );
nCloneCount = 1;
- SvTreeEntryList* pChilds = pEntry->pChilds;
- if ( pChilds )
- pClonedEntry->pChilds=CloneChilds(pChilds,pClonedEntry,nCloneCount);
+ SvTreeEntryList* pChildren = pEntry->pChildren;
+ if ( pChildren )
+ pClonedEntry->pChildren=CloneChildren(pChildren,pClonedEntry,nCloneCount);
return pClonedEntry;
}
@@ -478,29 +478,29 @@ SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount )
co
|*
*************************************************************************/
-SvTreeEntryList* SvTreeList::CloneChilds( SvTreeEntryList* pChilds,
+SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren,
SvListEntry* pNewParent,
sal_uLong& nCloneCount ) const
{
- DBG_ASSERT(!pChilds->empty(),"Childs?");
- SvTreeEntryList* pClonedChilds = new SvTreeEntryList;
- SvListEntry* pChild = (SvListEntry*)pChilds->First();
+ DBG_ASSERT(!pChildren->empty(),"Children?");
+ SvTreeEntryList* pClonedChildren = new SvTreeEntryList;
+ SvListEntry* pChild = (SvListEntry*)pChildren->First();
while ( pChild )
{
SvListEntry* pNewChild = CloneEntry( pChild );
nCloneCount++;
pNewChild->pParent = pNewParent;
- SvTreeEntryList* pSubChilds = pChild->pChilds;
- if ( pSubChilds )
+ SvTreeEntryList* pSubChildren = pChild->pChildren;
+ if ( pSubChildren )
{
- pSubChilds = CloneChilds( pSubChilds, pNewChild, nCloneCount );
- pNewChild->pChilds = pSubChilds;
+ pSubChildren = CloneChildren( pSubChildren, pNewChild, nCloneCount );
+ pNewChild->pChildren = pSubChildren;
}
- pClonedChilds->push_back( pNewChild );
- pChild = (SvListEntry*)pChilds->Next();
+ pClonedChildren->push_back( pNewChild );
+ pChild = (SvListEntry*)pChildren->Next();
}
- return pClonedChilds;
+ return pClonedChildren;
}
@@ -515,7 +515,7 @@ sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const
if ( !pParent )
return GetEntryCount();
- if ( !pParent || !pParent->pChilds)
+ if ( !pParent || !pParent->pChildren)
return 0;
sal_uLong nCount = 0;
sal_uInt16 nRefDepth = GetDepth( pParent );
@@ -540,7 +540,7 @@ sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry*
DBG_ASSERT(pView,"GetVisChildCount:No View");
if ( !pParent )
pParent = pRootItem;
- if ( !pParent || !pView->IsExpanded(pParent) || !pParent->pChilds )
+ if ( !pParent || !pView->IsExpanded(pParent) || !pParent->pChildren )
return 0;
sal_uLong nCount = 0;
sal_uInt16 nRefDepth = GetDepth( pParent );
@@ -559,7 +559,7 @@ sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry
DBG_ASSERT(pView,"GetChildSelCount:No View");
if ( !pParent )
pParent = pRootItem;
- if ( !pParent || !pParent->pChilds)
+ if ( !pParent || !pParent->pChildren)
return 0;
sal_uLong nCount = 0;
sal_uInt16 nRefDepth = GetDepth( pParent );
@@ -584,7 +584,7 @@ sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry
SvListEntry* SvTreeList::First() const
{
if ( nEntryCount )
- return (SvListEntry*)(*pRootItem->pChilds)[ 0 ];
+ return (SvListEntry*)(*pRootItem->pChildren)[ 0 ];
else
return 0;
}
@@ -608,13 +608,13 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth )
cons
bWithDepth = sal_True;
}
- SvTreeEntryList* pActualList = pActEntry->pParent->pChilds;
+ SvTreeEntryList* pActualList = pActEntry->pParent->pChildren;
sal_uLong nActualPos = pActEntry->GetChildListPos();
- if ( pActEntry->pChilds /* && pActEntry->pChilds->Count() */ )
+ if ( pActEntry->pChildren /* && pActEntry->pChildren->Count() */ )
{
nDepth++;
- pActEntry = (SvListEntry*)(*pActEntry->pChilds)[ 0 ];
+ pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ];
if ( bWithDepth )
*pDepth = nDepth;
return pActEntry;
@@ -633,7 +633,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
while( pParent != pRootItem && pParent != 0 )
{
DBG_ASSERT(pParent!=0,"TreeData corrupt!");
- pActualList = pParent->pParent->pChilds;
+ pActualList = pParent->pParent->pChildren;
DBG_ASSERT(pActualList,"TreeData corrupt!");
nActualPos = pParent->GetChildListPos();
if ( pActualList->size() > ( nActualPos + 1 ) )
@@ -666,15 +666,15 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth )
cons
bWithDepth = sal_True;
}
- SvTreeEntryList* pActualList = pActEntry->pParent->pChilds;
+ SvTreeEntryList* pActualList = pActEntry->pParent->pChildren;
sal_uLong nActualPos = pActEntry->GetChildListPos();
if ( nActualPos > 0 )
{
pActEntry = (SvListEntry*)(*pActualList)[ nActualPos - 1 ];
- while( pActEntry->pChilds )
+ while( pActEntry->pChildren )
{
- pActualList = pActEntry->pChilds;
+ pActualList = pActEntry->pChildren;
nDepth++;
pActEntry = (SvListEntry*)(pActualList->last());
}
@@ -705,14 +705,14 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth )
cons
SvListEntry* SvTreeList::Last() const
{
- SvTreeEntryList* pActList = pRootItem->pChilds;
+ SvTreeEntryList* pActList = pRootItem->pChildren;
// if ( pActList->Count() == 0 )
// return 0;
SvListEntry* pEntry = 0;
while( pActList )
{
pEntry = (SvListEntry*)(pActList->last());
- pActList = pEntry->pChilds;
+ pActList = pEntry->pChildren;
// if ( pActList->Count() == 0 )
// pActList = 0;
}
@@ -797,14 +797,14 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry*
pActEn
bWithDepth = sal_True;
}
- SvTreeEntryList* pActualList = pActEntry->pParent->pChilds;
+ SvTreeEntryList* pActualList = pActEntry->pParent->pChildren;
sal_uLong nActualPos = pActEntry->GetChildListPos();
if ( pView->IsExpanded(pActEntry) )
{
- DBG_ASSERT(pActEntry->pChilds,"Childs?");
+ DBG_ASSERT(pActEntry->pChildren,"Children?");
nDepth++;
- pActEntry = (SvListEntry*)(*pActEntry->pChilds)[ 0 ];
+ pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ];
if ( bWithDepth )
*pActDepth = nDepth;
return pActEntry;
@@ -823,7 +823,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn
nDepth--;
while( pParent != pRootItem )
{
- pActualList = pParent->pParent->pChilds;
+ pActualList = pParent->pParent->pChildren;
nActualPos = pParent->GetChildListPos();
nActualPos++;
if ( pActualList->size() > nActualPos )
@@ -861,7 +861,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE
bWithDepth = sal_True;
}
- SvTreeEntryList* pActualList = pActEntry->pParent->pChilds;
+ SvTreeEntryList* pActualList = pActEntry->pParent->pChildren;
sal_uLong nActualPos = pActEntry->GetChildListPos();
if ( nActualPos > 0 )
@@ -869,7 +869,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE
pActEntry = (SvListEntry*)(*pActualList)[ nActualPos - 1 ];
while( pView->IsExpanded(pActEntry) )
{
- pActualList = pActEntry->pChilds;
+ pActualList = pActEntry->pChildren;
nDepth++;
pActEntry = (SvListEntry*)(pActualList->last());
}
@@ -987,8 +987,8 @@ SvListEntry* SvTreeList::FirstChild( SvListEntry* pParent ) const
if ( !pParent )
pParent = pRootItem;
SvListEntry* pResult;
- if ( pParent->pChilds )
- pResult = (SvListEntry*)(*pParent->pChilds)[ 0 ];
+ if ( pParent->pChildren )
+ pResult = (SvListEntry*)(*pParent->pChildren)[ 0 ];
else
pResult = 0;
return pResult;
@@ -999,7 +999,7 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const
DBG_ASSERT(pEntry,"Entry?");
if( !pEntry )
return 0;
- SvTreeEntryList* pList = pEntry->pParent->pChilds;
+ SvTreeEntryList* pList = pEntry->pParent->pChildren;
sal_uLong nPos = pEntry->GetChildListPos();
nPos++;
pEntry = (SvListEntry*)(*pList)[ nPos ];
@@ -1012,7 +1012,7 @@ SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const
if( !pEntry )
return 0;
- SvTreeEntryList* pList = pEntry->pParent->pChilds;
+ SvTreeEntryList* pList = pEntry->pParent->pChildren;
sal_uLong nPos = pEntry->GetChildListPos();
if ( nPos == 0 )
return 0;
@@ -1028,7 +1028,7 @@ SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const
if( !pEntry )
return 0;
SvListEntry* pSib = 0;
- SvTreeEntryList* pSibs = pEntry->pParent->pChilds;
+ SvTreeEntryList* pSibs = pEntry->pParent->pChildren;
if ( pSibs )
pSib = (SvListEntry*)(pSibs->last());
return pSib;
@@ -1094,12 +1094,12 @@ sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry*
pParent,sal_uLong
pParent = pRootItem;
- SvTreeEntryList* pList = pParent->pChilds;
+ SvTreeEntryList* pList = pParent->pChildren;
if ( !pList )
{
// Parent bekommt zum erstenmal ein Kind
pList = new SvTreeEntryList;
- pParent->pChilds = pList;
+ pParent->pChildren = pList;
}
// Sortierung beruecksichtigen
@@ -1170,7 +1170,7 @@ void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry )
if ( pView->IsExpanded(pEntry) )
return;
- DBG_ASSERT(pEntry->pChilds,"Expand:No Childs!");
+ DBG_ASSERT(pEntry->pChildren,"Expand:No Children!");
SvViewData* pViewData = pView->GetViewData(pEntry);
pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED;
@@ -1198,7 +1198,7 @@ void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry )
if ( !pView->IsExpanded(pEntry) )
return;
- DBG_ASSERT(pEntry->pChilds,"Collapse:No Childs!");
+ DBG_ASSERT(pEntry->pChildren,"Collapse:No Children!");
SvViewData* pViewData = pView->GetViewData( pEntry );
pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED);
@@ -1275,7 +1275,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
bAbsPositionsValid = sal_False;
SvListEntry* pParent = pEntry->pParent;
- SvTreeEntryList* pList = pParent->pChilds;
+ SvTreeEntryList* pList = pParent->pChildren;
DBG_ASSERT(pList,"Remove:No Childlist");
sal_Bool bLastEntry = sal_False;
@@ -1292,11 +1292,11 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
// moved to end of method because it is used later with Broadcast
- // delete pEntry; // loescht auch alle Childs
+ // delete pEntry; // loescht auch alle Children
if ( pList->empty() )
{
- pParent->pChilds = 0;
+ pParent->pChildren = 0;
delete pList;
}
else
@@ -1311,7 +1311,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
#endif
Broadcast( LISTACTION_REMOVED, pEntry );
- delete pEntry; // loescht auch alle Childs
+ delete pEntry; // loescht auch alle Children
return sal_True;
}
@@ -1389,8 +1389,8 @@ sal_Bool SvTreeList::IsInChildList( SvListEntry* pParent, SvListEntry*
pChild) c
if ( !pParent )
pParent = pRootItem;
sal_Bool bIsChild = sal_False;
- if ( pParent->pChilds )
- bIsChild = (sal_Bool)(pParent->pChilds->GetPos(pChild) != ULONG_MAX);
+ if ( pParent->pChildren )
+ bIsChild = (sal_Bool)(pParent->pChildren->GetPos(pChild) != ULONG_MAX);
return bIsChild;
}
@@ -1600,7 +1600,7 @@ void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong)
DBG_CHKTHIS(SvListView,0);
SvListEntry* pParent = pEntry->pParent;
DBG_ASSERT(pParent,"Model not consistent");
- if( pParent != pModel->pRootItem && pParent->pChilds->size() == 1 )
+ if( pParent != pModel->pRootItem && pParent->pChildren->size() == 1 )
{
SvViewData* pViewData = (SvViewData*)aDataTable.Get( (sal_uLong)pParent );
pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
@@ -1645,7 +1645,7 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry )
nVisibleCount = 0;
bVisPositionsValid = sal_False;
}
- // ueber Entry und seine Childs iterieren
+ // ueber Entry und seine Children iterieren
SvListEntry* pCurEntry = pEntry;
sal_uInt16 nRefDepth = pModel->GetDepth( pCurEntry );
while( pCurEntry )
@@ -1663,18 +1663,18 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry )
void SvListView::RemoveViewData( SvListEntry* pParent )
{
- SvTreeEntryList* pChilds = pParent->pChilds;
- if( pChilds )
+ SvTreeEntryList* pChildren = pParent->pChildren;
+ if( pChildren )
{
- SvListEntry* pCur = (SvListEntry*)pChilds->First();
+ SvListEntry* pCur = (SvListEntry*)pChildren->First();
while( pCur )
{
SvViewData* pViewData = (SvViewData*)aDataTable.Get((sal_uLong)pCur);
delete pViewData;
aDataTable.Remove( (sal_uLong)pCur );
- if( pCur->HasChilds())
+ if( pCur->HasChildren())
RemoveViewData( pCur );
- pCur = (SvListEntry*)pChilds->Next();
+ pCur = (SvListEntry*)pChildren->Next();
}
}
}
@@ -1713,7 +1713,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry )
SvListEntry* pCurEntry = pEntry->pParent;
if ( pCurEntry && pCurEntry != pModel->pRootItem &&
- pCurEntry->pChilds->size() == 1 )
+ pCurEntry->pChildren->size() == 1 )
{
pViewData = (SvViewData*)aDataTable.Get((sal_uLong)pCurEntry);
pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
@@ -1801,14 +1801,14 @@ void SvTreeList::Resort()
{
Broadcast( LISTACTION_RESORTING );
bAbsPositionsValid = sal_False;
- ResortChilds( pRootItem );
+ ResortChildren( pRootItem );
Broadcast( LISTACTION_RESORTED );
}
-void SvTreeList::ResortChilds( SvListEntry* pParent )
+void SvTreeList::ResortChildren( SvListEntry* pParent )
{
DBG_ASSERT(pParent,"Parent not set");
- SvTreeEntryList* pChildList = pParent->pChilds;
+ SvTreeEntryList* pChildList = pParent->pChildren;
if( !pChildList )
return;
SvTreeEntryList aList( *pChildList );
@@ -1821,8 +1821,8 @@ void SvTreeList::ResortChilds( SvListEntry* pParent )
sal_uLong nListPos = ULONG_MAX;
GetInsertionPos( pCurEntry, pParent, nListPos );
pChildList->insert( pCurEntry, nListPos );
- if( pCurEntry->pChilds )
- ResortChilds( pCurEntry );
+ if( pCurEntry->pChildren )
+ ResortChildren( pCurEntry );
}
SetListPositions( (SvTreeEntryList*)pChildList );
}
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 6da461b..80ae25b 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -258,7 +258,7 @@ void ImpPathDialog::InitControls()
if (pNewDirBtn)
pNewDirBtn->SetClickHdl( LINK( this, ImpPathDialog, ClickHdl) );
- nOwnChilds = pDlg->GetChildCount();
+ nOwnChildren = pDlg->GetChildCount();
}
@@ -560,9 +560,9 @@ void ImpPathDialog::PreExecute()
long nMaxWidth = 0;
// Maximale Breite ermitteln
- sal_uInt16 nChilds = GetPathDialog()->GetChildCount();
+ sal_uInt16 nChildren = GetPathDialog()->GetChildCount();
sal_uInt16 n;
- for ( n = nOwnChilds; n < nChilds; n++ )
+ for ( n = nOwnChildren; n < nChildren; n++ )
{
Window* pChild = GetPathDialog()->GetChild( n );
pChild = pChild->GetWindow( WINDOW_CLIENT );
@@ -593,7 +593,7 @@ void ImpPathDialog::PreExecute()
else
nMaxWidth = aSize.Width();
- for ( n = nOwnChilds; n < nChilds; n++ )
+ for ( n = nOwnChildren; n < nChildren; n++ )
{
Window* pChild = GetPathDialog()->GetChild( n );
pChild = pChild->GetWindow( WINDOW_CLIENT );
@@ -783,7 +783,7 @@ void ImpFileDialog::InitControls()
GetFileDialog()->SetOutputSizePixel( Size(nButtonStartX+STD_BTN_WIDTH+10, 298-nH) );
- nOwnChilds = GetPathDialog()->GetChildCount();
+ nOwnChildren = GetPathDialog()->GetChildCount();
// Handler setzen
if (pDriveList)
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index a7bba20..7492c4b 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -91,7 +91,7 @@ private:
PushButton* pHomeBtn;
PushButton* pNewDirBtn;
- sal_uInt16 nOwnChilds;
+ sal_uInt16 nOwnChildren;
DirEntry aPath; // aktuell angewaehlter Pfad
sal_uInt16 nDirCount; // Anzahl der Verzeichnis-
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index c52cec5..2c3e9d3 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -240,7 +240,7 @@ private:
void NotifyTabsChanged();
inline sal_Bool IsExpandable() const // if element at cursor can be expanded in
general
- { return pCursor->HasChilds() || pCursor->HasChildsOnDemand(); }
+ { return pCursor->HasChildren() || pCursor->HasChildrenOnDemand(); }
inline sal_Bool IsNowExpandable() const // if element at cursor can be expanded at
this moment
{ return IsExpandable() && !pView->IsExpanded( pCursor ); }
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index eaa08f2..4ab0cbf 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -99,7 +99,7 @@ public:
sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos=LIST_APPEND );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& );
virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
@@ -317,9 +317,9 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
}
}
- if( (pEntry->mxNode->hasChildrenOnDemand() == sal_True) != (pEntry->HasChildsOnDemand() ==
sal_True) )
+ if( (pEntry->mxNode->hasChildrenOnDemand() == sal_True) != (pEntry->HasChildrenOnDemand()
== sal_True) )
{
- pEntry->EnableChildsOnDemand( pEntry->mxNode->hasChildrenOnDemand() ? sal_True :
sal_False );
+ pEntry->EnableChildrenOnDemand( pEntry->mxNode->hasChildrenOnDemand() ? sal_True :
sal_False );
bChanged = true;
}
@@ -1582,7 +1582,7 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry*
pParent,
// --------------------------------------------------------------------
-void UnoTreeListBoxImpl::RequestingChilds( SvLBoxEntry* pParent )
+void UnoTreeListBoxImpl::RequestingChildren( SvLBoxEntry* pParent )
{
UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent );
if( pEntry && pEntry->mxNode.is() && mxPeer.is() )
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index 7209159..419094f 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.cxx
@@ -245,13 +245,13 @@ void DirectoryTree::fillNode( const Reference< XMutableTreeNode >& xNode )
// XTreeExpansionListener
void SAL_CALL DirectoryTree::requestChildNodes( const TreeExpansionEvent& rEvent ) throw
(RuntimeException)
{
- if( rEvent.Node.is() && rEvent.Node->hasChildsOnDemand() )
+ if( rEvent.Node.is() && rEvent.Node->hasChildrenOnDemand() )
{
Reference< XMutableTreeNode > xNode( rEvent.Node, UNO_QUERY );
if( xNode.is() )
{
fillNode( xNode );
- xNode->setHasChildsOnDemand( sal_False );
+ xNode->setHasChildrenOnDemand( sal_False );
}
}
}
@@ -278,7 +278,7 @@ void SAL_CALL DirectoryTree::treeCollapsed( const TreeExpansionEvent& /*rEvent*/
{
while( xNode->getChildCount() )
xNode->removeChildByIndex(0);
- xNode->setHasChildsOnDemand( sal_True );
+ xNode->setHasChildrenOnDemand( sal_True );
}
}
*/
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index 3e386be..3226838 100755
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.hrc
@@ -43,7 +43,7 @@
#define RID_SVXSTR_A11Y_AND (RID_SVXSTR_ACCESSIBILITY_START + 11)
-// SvxRectCtl & childs
+// SvxRectCtl & children
#define RID_SVXSTR_RECTCTL_ACC_START (RID_SVXSTR_ACCESSIBILITY_START + 20)
#define RID_SVXSTR_RECTCTL_ACC_CORN_NAME (RID_SVXSTR_RECTCTL_ACC_START + 0)
#define RID_SVXSTR_RECTCTL_ACC_CORN_DESCR (RID_SVXSTR_RECTCTL_ACC_START + 1)
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index 8b44b74..fbedbd5 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -53,7 +53,7 @@ private:
using SvTreeListBox::InsertEntry;
// Avoid ambiguity with new InsertEntry:
virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
- sal_Bool bChildsOnDemand,
+ sal_Bool bChildrenOnDemand,
sal_uIntPtr nPos, void* pUserData,
SvLBoxButtonKind eButtonKind );
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 02fa0d2..1e1f11a 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -121,7 +121,7 @@ public:
void SetState( CTL_STATE nState );
- sal_uInt8 GetNumOfChilds( void ) const; // returns number of usable radio
buttons
+ sal_uInt8 GetNumOfChildren( void ) const; // returns number of usable radio
buttons
Rectangle CalculateFocusRectangle( void ) const;
Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const;
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 873c00f..f8729ef 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -153,10 +153,10 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
SvxRectCtlAccessibleContext_Base( m_aMutex ),
mxParent( rxParent ),
mpRepr( &rRepr ),
- mpChilds( NULL ),
+ mpChildren( NULL ),
mnClientId( 0 ),
mnSelectedChild( NOCHILDRENELECTED ),
- mbAngleMode( rRepr.GetNumOfChilds() == 8 )
+ mbAngleMode( rRepr.GetNumOfChildren() == 8 )
{
DBG_CTOR( SvxRectCtlAccessibleContext, NULL );
@@ -176,9 +176,9 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
msDescription = SVX_RESSTR( mbAngleMode? RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR :
RID_SVXSTR_RECTCTL_ACC_CORN_DESCR );
}
- mpChilds = new SvxRectCtlChildAccessibleContext*[ MAX_NUM_OF_CHILDREN ];
+ mpChildren = new SvxRectCtlChildAccessibleContext*[ MAX_NUM_OF_CHILDREN ];
- SvxRectCtlChildAccessibleContext** p = mpChilds;
+ SvxRectCtlChildAccessibleContext** p = mpChildren;
for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p )
*p = NULL;
}
@@ -191,7 +191,7 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext()
if( IsAlive() )
{
osl_incrementInterlockedCount( &m_refCount );
- dispose(); // set mpRepr = NULL & release all childs
+ dispose(); // set mpRepr = NULL & release all children
}
}
@@ -278,7 +278,7 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void )
ThrowExceptionIfNotAlive();
- return mpRepr->GetNumOfChilds();
+ return mpRepr->GetNumOfChildren();
}
Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int32
nIndex )
@@ -286,7 +286,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
{
checkChildIndex( nIndex );
- Reference< XAccessible > xChild = mpChilds[ nIndex ];
+ Reference< XAccessible > xChild = mpChildren[ nIndex ];
if( !xChild.is() )
{
::SolarMutexGuard aSolarGuard;
@@ -295,7 +295,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
ThrowExceptionIfNotAlive();
- xChild = mpChilds[ nIndex ];
+ xChild = mpChildren[ nIndex ];
if( !xChild.is() )
{
@@ -311,7 +311,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
SvxRectCtlChildAccessibleContext* pChild = new SvxRectCtlChildAccessibleContext(
this, *mpRepr, aName, aDescr, aFocusRect,
nIndex );
- xChild = mpChilds[ nIndex ] = pChild;
+ xChild = mpChildren[ nIndex ] = pChild;
pChild->acquire();
// set actual state
@@ -640,13 +640,13 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew )
::osl::MutexGuard aGuard( m_aMutex );
if( nNew != mnSelectedChild )
{
- long nNumOfChilds = getAccessibleChildCount();
- if( nNew < nNumOfChilds )
+ long nNumOfChildren = getAccessibleChildCount();
+ if( nNew < nNumOfChildren )
{ // valid index
SvxRectCtlChildAccessibleContext* pChild;
if( mnSelectedChild != NOCHILDRENELECTED )
{ // deselect old selected child if one is selected
- pChild = mpChilds[ mnSelectedChild ];
+ pChild = mpChildren[ mnSelectedChild ];
if( pChild )
pChild->setStateChecked( sal_False );
}
@@ -656,7 +656,7 @@ void SvxRectCtlAccessibleContext::selectChild( long nNew )
if( nNew != NOCHILDRENELECTED )
{
- pChild = mpChilds[ nNew ];
+ pChild = mpChildren[ nNew ];
if( pChild )
pChild->setStateChecked( sal_True );
}
@@ -718,7 +718,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
::osl::MutexGuard aGuard( m_aMutex );
mpRepr = NULL; // object dies with representation
- SvxRectCtlChildAccessibleContext** p = mpChilds;
+ SvxRectCtlChildAccessibleContext** p = mpChildren;
for( int i = MAX_NUM_OF_CHILDREN ; i ; --i, ++p )
{
SvxRectCtlChildAccessibleContext* pChild = *p;
@@ -730,8 +730,8 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
}
}
- delete[] mpChilds;
- mpChilds = NULL;
+ delete[] mpChildren;
+ mpChildren = NULL;
}
{
@@ -825,7 +825,7 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
if( IsAlive() )
{
osl_incrementInterlockedCount( &m_refCount );
- dispose(); // set mpRepr = NULL & release all childs
+ dispose(); // set mpRepr = NULL & release all children
}
}
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 4a9ad6d..2e5eb1e 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -267,9 +267,9 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
// -----------------------------------------------------------------------
-SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool
bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool
bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
{
- return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData,
eButtonKind );
+ return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData,
eButtonKind );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 18cc826..4187f36 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -659,7 +659,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
}
-sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const
+sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const
{
return ( eCS == CS_ANGLE )? 8 : 9;
}
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index b67f2a1..95ae0a8 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -311,9 +311,9 @@ void FmEntryData::Clear()
}
//------------------------------------------------------------------------
-sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
+sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com",
"FmEntryData::IsEqualWithoutChilds" );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com",
"FmEntryData::IsEqualWithoutChildren" );
if(this == pEntryData)
return sal_True;
@@ -332,7 +332,7 @@ sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
if( !pEntryData->GetParent() && !pParent )
return sal_True;
- if( !pParent->IsEqualWithoutChilds(pEntryData->GetParent()) )
+ if( !pParent->IsEqualWithoutChildren(pEntryData->GetParent()) )
return sal_False;
return sal_True;
@@ -395,7 +395,7 @@ FmEntryData* FmFormData::Clone()
}
//------------------------------------------------------------------------
-sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData )
+sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
if(this == pEntryData)
return sal_True;
@@ -405,7 +405,7 @@ sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData )
if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() )
return sal_False;
- return FmEntryData::IsEqualWithoutChilds( pFormData );
+ return FmEntryData::IsEqualWithoutChildren( pFormData );
}
@@ -571,9 +571,9 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
}
//------------------------------------------------------------------------
-sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
+sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com",
"FmControlData::IsEqualWithoutChilds" );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com",
"FmControlData::IsEqualWithoutChildren" );
if(this == pEntryData)
return sal_True;
@@ -584,7 +584,7 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
if( (XFormComponent*)m_xFormComponent.get() !=
(XFormComponent*)pControlData->GetFormComponent().get() )
return sal_False;
- return FmEntryData::IsEqualWithoutChilds( pControlData );
+ return FmEntryData::IsEqualWithoutChildren( pControlData );
}
//------------------------------------------------------------------------
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 6aea3ed..e261c21 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2703,7 +2703,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>&
Elem
if (xSelSupplier.is())
xSelSupplier->removeSelectionChangeListener(this);
- // remove connection to childs
+ // remove connection to children
const Reference< XIndexContainer> xContainer(Element, UNO_QUERY);
if (xContainer.is())
{
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ac668eb..a137968 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -299,7 +299,7 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl
}
//------------------------------------------------------------------------
-Reference< XFormController > getControllerSearchChilds( const Reference< XIndexAccess > & xIndex,
const Reference< XTabControllerModel > & xModel)
+Reference< XFormController > getControllerSearchChildren( const Reference< XIndexAccess > &
xIndex, const Reference< XTabControllerModel > & xModel)
{
if (xIndex.is() && xIndex->getCount())
{
@@ -312,7 +312,7 @@ Reference< XFormController > getControllerSearchChilds( const Reference< XIndex
return xController;
else
{
- xController = getControllerSearchChilds(Reference< XIndexAccess > (xController,
UNO_QUERY), xModel);
+ xController = getControllerSearchChildren(Reference< XIndexAccess > (xController,
UNO_QUERY), xModel);
if ( xController.is() )
return xController;
}
@@ -333,7 +333,7 @@ Reference< XFormController > FormViewPageWindowAdapter::getController( const Re
return *i;
// the current-round controller isn't the right one. perhaps one of it's children ?
- Reference< XFormController > xChildSearch = getControllerSearchChilds(Reference<
XIndexAccess > (*i, UNO_QUERY), xModel);
+ Reference< XFormController > xChildSearch = getControllerSearchChildren(Reference<
XIndexAccess > (*i, UNO_QUERY), xModel);
if (xChildSearch.is())
return xChildSearch;
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 8934926..7c854bf 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1126,7 +1126,7 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw
(In
sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
- return !m_aChilds.empty();
+ return !m_aChildren.empty();
}
//------------------------------------------------------------------------------
@@ -1149,7 +1149,7 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void)
thro
sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
- return m_aChilds.size();
+ return m_aChildren.size();
}
//------------------------------------------------------------------------------
@@ -1157,10 +1157,10 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw(
IndexOutOfBounds
{
::osl::MutexGuard aGuard( m_aMutex );
if (Index < 0 ||
- Index >= (sal_Int32)m_aChilds.size())
+ Index >= (sal_Int32)m_aChildren.size())
throw IndexOutOfBoundsException();
- return makeAny( m_aChilds[ Index ] );
+ return makeAny( m_aChildren[ Index ] );
}
// EventListener
@@ -1237,8 +1237,8 @@ void FormController::disposing(void)
implSetCurrentControl( NULL );
// clean up our children
- for (FmFormControllers::const_iterator i = m_aChilds.begin();
- i != m_aChilds.end(); ++i)
+ for (FmFormControllers::const_iterator i = m_aChildren.begin();
+ i != m_aChildren.end(); ++i)
{
// search the position of the model within the form
Reference< XFormComponent > xForm((*i)->getModel(), UNO_QUERY);
@@ -1258,7 +1258,7 @@ void FormController::disposing(void)
Reference< XComponent > (*i, UNO_QUERY)->dispose();
}
- m_aChilds.clear();
+ m_aChildren.clear();
disposeAllFeaturesAndDispatchers();
@@ -3059,7 +3059,7 @@ void SAL_CALL FormController::addChildController( const Reference<
XFormControll
throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
// TODO: (localized) error message
- m_aChilds.push_back( _ChildController );
+ m_aChildren.push_back( _ChildController );
_ChildController->setParent( *this );
// search the position of the model within the form
@@ -3529,8 +3529,8 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw(
NoSupportExcept
else
stopFiltering();
- for (FmFormControllers::const_iterator i = m_aChilds.begin();
- i != m_aChilds.end(); ++i)
+ for (FmFormControllers::const_iterator i = m_aChildren.begin();
+ i != m_aChildren.end(); ++i)
{
Reference< XModeSelector > xMode(*i, UNO_QUERY);
if ( xMode.is() )
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 4b67905..df1c845 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -563,7 +563,7 @@ namespace svxform
while( pCurEntry )
{
pCurEntryData = (FmEntryData*)pCurEntry->GetUserData();
- if( pCurEntryData && pCurEntryData->IsEqualWithoutChilds(pEntryData) )
+ if( pCurEntryData && pCurEntryData->IsEqualWithoutChildren(pEntryData) )
return pCurEntry;
pCurEntry = Next( pCurEntry );
@@ -658,7 +658,7 @@ namespace svxform
Expand( m_pRootEntry );
//////////////////////////////////////////////////////////////////////
- // Childs einfuegen
+ // Children einfuegen
FmEntryDataList* pChildList = pEntryData->GetChildList();
size_t nChildCount = pChildList->size();
FmEntryData* pChildData;
@@ -914,7 +914,7 @@ namespace svxform
m_aDropActionType = DA_SCROLLDOWN;
bNeedTrigger = sal_True;
} else
- { // auf einem Entry mit Childs, der nicht aufgeklappt ist ?
+ { // auf einem Entry mit Children, der nicht aufgeklappt ist ?
SvLBoxEntry* pDropppedOn = GetEntry(aDropPos);
if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) &&
!IsExpanded(pDropppedOn))
{
@@ -1964,7 +1964,7 @@ namespace svxform
// und selektiere diesen (waere irgendwie intuitiver ;)) 2) ich gehe durch alle meine
SvLBoxEntries und selektiere
// genau die, die ich in der SelectList finde
// 1) braucht O(k*n) (k=Laenge der SelectList, n=Anzahl meiner Entries), plus den
Fakt, dass FindEntry nicht den
- // Pointer auf die UserDaten vergleicht, sondern ein aufwendigeres
IsEqualWithoutChilds durchfuehrt
+ // Pointer auf die UserDaten vergleicht, sondern ein aufwendigeres
IsEqualWithoutChildren durchfuehrt
// 2) braucht O(n*log k), dupliziert aber etwas Code (naemlich den aus FindEntry)
// da das hier eine relativ oft aufgerufenen Stelle sein koennte (bei jeder Aenderung
in der Markierung in der View !),
// nehme ich doch lieber letzteres
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 0e89ce1..e5f3c85 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -822,10 +822,10 @@ namespace svxform
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com",
"NavigatorTreeModel::InsertFormComponent" );
if ( pObject->ISA(SdrObjGroup) )
{ // rekursiv absteigen
- const SdrObjList *pChilds = ((SdrObjGroup*)pObject)->GetSubList();
- for ( sal_uInt16 i=0; i<pChilds->GetObjCount(); ++i )
+ const SdrObjList *pChildren = ((SdrObjGroup*)pObject)->GetSubList();
+ for ( sal_uInt16 i=0; i<pChildren->GetObjCount(); ++i )
{
- SdrObject* pCurrent = pChilds->GetObj(i);
+ SdrObject* pCurrent = pChildren->GetObj(i);
if (!InsertFormComponent(rHint, pCurrent))
return sal_False;
}
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 7070eac..4e733d5 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -183,7 +183,7 @@ public:
FmEntryData* GetParent() const { return pParent; }
FmEntryDataList* GetChildList() const { return pChildList; }
- virtual sal_Bool IsEqualWithoutChilds( FmEntryData* pEntryData );
+ virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone() = 0;
// note that the interface returned is normalized, i.e. querying the given XInterface of the
object
@@ -275,7 +275,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const
{ return m_xForm; }
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >&
GetContainer() const { return m_xContainer; }
- virtual sal_Bool IsEqualWithoutChilds( FmEntryData* pEntryData );
+ virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone();
};
@@ -299,7 +299,7 @@ public:
virtual ~FmControlData();
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >&
GetFormComponent() const { return m_xFormComponent; }
- virtual sal_Bool IsEqualWithoutChilds( FmEntryData* pEntryData );
+ virtual sal_Bool IsEqualWithoutChildren( FmEntryData* pEntryData );
virtual FmEntryData* Clone();
void ModelReplaced(
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index f362d59..5e6530f 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -175,7 +175,7 @@ namespace svxform
m_aParameterListeners,
m_aFilterListeners;
- FmFormControllers m_aChilds;
+ FmFormControllers m_aChildren;
FilterComponents m_aFilterComponents;
FmFilterRows m_aFilterRows;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx
b/svx/source/inc/svxrectctaccessiblecontext.hxx
index ae5982f..d5dd920 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -311,8 +311,8 @@ private:
/// pointer to internal representation
SvxRectCtl* mpRepr;
- /// array for all possible childs
- SvxRectCtlChildAccessibleContext** mpChilds;
+ /// array for all possible children
+ SvxRectCtlChildAccessibleContext** mpChildren;
/// client id in the AccessibleEventNotifier queue
sal_uInt32 mnClientId;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 613ff0b..6100860 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -271,7 +271,7 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos )
SvLBoxEntry* pLBEntry = GetEntryOnPos( nPos );
DictionaryEntry* pEntry = getEntryOnPos( nPos );
if( pLBEntry )
- RemoveParentKeepChilds( pLBEntry );
+ RemoveParentKeepChildren( pLBEntry );
if( pEntry )
{
if( pEntry->m_bNewEntry )
@@ -291,7 +291,7 @@ sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm )
{
nPos = nN;
SvLBoxEntry* pCurLBEntry = GetEntryOnPos( nN );
- RemoveParentKeepChilds( pCurLBEntry );
+ RemoveParentKeepChildren( pCurLBEntry );
if( pCurEntry->m_bNewEntry )
delete pCurEntry;
else
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index b3c3b05..1508acc 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -270,7 +270,7 @@ public:
Invalidate this node and all its descendants.
All iterators holding the last valid node in the according list
- of childs are set to the end of this list, thereby stating all
+ of children are set to the end of this list, thereby stating all
children in the list are invalid.
#i83479# - made public
*/
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 18f1fde..fac84b4 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -625,7 +625,7 @@ public:
// select the given range of OutlineNodes. Optionally including the children
// the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
- sal_Bool bWithChilds = sal_False );
+ sal_Bool bWithChildren = sal_False );
sal_Bool GotoNextOutline();
sal_Bool GotoPrevOutline();
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx
b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 4a7f5c1..2f20150 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -457,7 +457,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
Algorithm:
Search first child A that is greater than pChild,
- A may be the end of childs.
+ A may be the end of children.
If nDepth > 0 then
{
if A is first child then
@@ -833,7 +833,7 @@ bool SwNumberTreeNode::IsFirst() const
// If node isn't the first child, it is the second child and the
// first child is a phanton. In this case check, if the first phantom
- // child have only phanton childs
+ // child have only phanton children
if ( bResult &&
this != *(GetParent()->mChildren.begin()) &&
!(*(GetParent()->mChildren.begin()))->HasOnlyPhantoms() )
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 31c289c..fad9d8b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -903,7 +903,7 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
- sal_Bool bWithChilds )
+ sal_Bool bWithChildren )
{
const SwNodes& rNds = GetDoc()->GetNodes();
const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
@@ -924,7 +924,7 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
SwNode* pSttNd = rOutlNds[ nSttPos ];
SwNode* pEndNd = rOutlNds[ nEndPos ];
- if( bWithChilds )
+ if( bWithChildren )
{
const int nLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;//<-end.zhaojianwei
for( ++nEndPos; nEndPos < rOutlNds.Count(); ++nEndPos )
@@ -935,7 +935,7 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
break; // EndPos steht jetzt auf dem naechsten
}
}
- // ohne Childs, dann aber zumindest auf den naechsten
+ // ohne Children, dann aber zumindest auf den naechsten
else if( ++nEndPos < rOutlNds.Count() )
pEndNd = rOutlNds[ nEndPos ];
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 5d45907..402f7b7 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -317,7 +317,7 @@ void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
// wie sieht es mit dem Parent aus, ist der versteckt ?
// (eigentlich muesste das vom bHiddenFlag angezeigt werden!)
- // erstmal allen Childs sagen, das sie versteckt sind
+ // erstmal allen Children sagen, das sie versteckt sind
SwMsgPoolItem aMsgItem( RES_SECTION_HIDDEN );
pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
@@ -327,13 +327,13 @@ void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const
bCondition)
}
else if (m_Data.IsHiddenFlag()) // show Nodes again
{
- // alle Frames sichtbar machen ( Childs Sections werden vom
+ // alle Frames sichtbar machen ( Children Sections werden vom
// MakeFrms beruecksichtigt). Aber nur wenn die ParentSection
// nichts dagegen hat !
SwSection* pParentSect = pFmt->GetParentSection();
if( !pParentSect || !pParentSect->IsHiddenFlag() )
{
- // erstmal allen Childs sagen, das der Parent nicht mehr
+ // erstmal allen Children sagen, das der Parent nicht mehr
// versteckt ist
SwMsgPoolItem aMsgItem( RES_SECTION_NOT_HIDDEN );
pFmt->ModifyNotification( &aMsgItem, &aMsgItem );
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index aef1648..46260de 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -583,8 +583,8 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
}
}
- // On move forward, assure that object is moved before its own childs.
- // Only Writer fly frames can have childs.
+ // On move forward, assure that object is moved before its own children.
+ // Only Writer fly frames can have children.
if ( pMovedAnchoredObj->ISA(SwFlyFrm) &&
bMovedForward && nNewPos < nObjCount - 1 )
{
@@ -655,7 +655,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
// setup collection of moved 'child' objects to move its 'repeated' objects.
std::vector< SdrObject* > aMovedChildObjs;
- // move 'childs' accordingly
+ // move 'children' accordingly
if ( pMovedAnchoredObj->ISA(SwFlyFrm) )
{
const SwFlyFrm* pFlyFrm = static_cast<SwFlyFrm*>(pMovedAnchoredObj);
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 52e6c26..b90f70e 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -54,7 +54,7 @@ class SwDrawView : public FmFormView
@param <_rParentObj>
input parameter - 'parent' object, for which the maximal order number
- for its 'childs' will be determined.
+ for its 'children' will be determined.
@param <_pExclChildObj>
optional input parameter - 'child' object, which will not be considered
@@ -70,9 +70,9 @@ class SwDrawView : public FmFormView
input parameter - moved object, for which the 'repeated' ones have also
to be moved.
- @param <_rMovedChildsObjs>
+ @param <_rMovedChildrenObjs>
input parameter - data collection of moved 'child' objects - the 'repeated'
- ones of these 'childs' will also been moved.
+ ones of these 'children' will also been moved.
*/
void _MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
const std::vector<SdrObject*>& _rMovedChildObjs ) const;
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 3fc9533..4e025dd 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -275,15 +275,15 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol)
if (sDBName.Len())
{
- Select(sDBName, sTableName, sColumnName); // force RequestingChilds
+ Select(sDBName, sTableName, sColumnName); // force RequestingChildren
}
SetUpdateMode(sal_True);
}
}
-void SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
+void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent)
{
- if (!pParent->HasChilds())
+ if (!pParent->HasChildren())
{
if (GetParent(pParent)) // column names
{
@@ -456,8 +456,8 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const
{
if (rDBName == GetEntryText(pParent))
{
- if (!pParent->HasChilds())
- RequestingChilds(pParent);
+ if (!pParent->HasChildren())
+ RequestingChildren(pParent);
while ((pChild = GetEntry(pParent, nChild++)) != NULL)
{
if (rTableName == GetEntryText(pChild))
@@ -468,8 +468,8 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const
{
nChild = 0;
- if (!pParent->HasChilds())
- RequestingChilds(pParent);
+ if (!pParent->HasChildren())
+ RequestingChildren(pParent);
while ((pChild = GetEntry(pParent, nChild++)) != NULL)
if (rColumnName == GetEntryText(pChild))
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 77647b9..9f262d4 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -520,7 +520,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
pEntry = aTree.InsertEntry(pSect->GetSectionName(), aImg, aImg);
pEntry->SetUserData(pSectRepr);
RecurseList( pFmt, pEntry );
- if (pEntry->HasChilds())
+ if (pEntry->HasChildren())
aTree.Expand(pEntry);
if (pCurrSect==pSect)
aTree.Select(pEntry);
@@ -551,7 +551,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
pSect->GetSectionName(), aImage, aImage, pEntry);
pNEntry->SetUserData(pSectRepr);
RecurseList( aTmpArr[n]->GetFmt(), pNEntry );
- if( pNEntry->HasChilds())
+ if( pNEntry->HasChildren())
aTree.Expand(pNEntry);
if (pCurrSect==pSect)
pSelEntry = pNEntry;
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 3659f84..075ebd3 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -198,7 +198,7 @@ public:
DECL_LINK( TimerUpdate, Timer * );
virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual void GetFocus();
virtual void KeyInput(const KeyEvent& rKEvt);
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index 090654b..f3eb86e 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -57,7 +57,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
SW_DLLPRIVATE void InitTreeList();
- SW_DLLPRIVATE virtual void RequestingChilds( SvLBoxEntry* pParent );
+ SW_DLLPRIVATE virtual void RequestingChildren( SvLBoxEntry* pParent );
SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 8dedffb..abb955d 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -80,7 +80,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
{
Dialog* pParentDlg;
SwRedlineDataParentArr aRedlineParents;
- SwRedlineDataChildArr aRedlineChilds;
+ SwRedlineDataChildArr aRedlineChildren;
SwRedlineDataParentSortArr aUsedSeqNo;
SvxAcceptChgCtr aTabPagesCTRL;
PopupMenu aPopup;
@@ -116,7 +116,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
SW_DLLPRIVATE DECL_LINK( CommandHdl, void* );
SW_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, sal_Bool bChild);
- SW_DLLPRIVATE void InsertChilds(SwRedlineDataParent *pParent, const SwRedline&
rRedln, const sal_uInt16 nAutoFmt);
+ SW_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRedline&
rRedln, const sal_uInt16 nAutoFmt);
SW_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
SW_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
SW_DLLPRIVATE void InitAuthors();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index cab0b19..247c6f3 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3953,9 +3953,9 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId,
xCheckController = new ::svt::CheckBoxCellController(&aCellCheckBox);
//////////////////////////////////////////////////////////////////////
- // HACK: BrowseBox doesn't invalidate its childs, how it should be.
+ // HACK: BrowseBox doesn't invalidate its children, how it should be.
// That's why WB_CLIPCHILDREN is reset in order to enforce the
- // childs' invalidation
+ // children' invalidation
WinBits aStyle = GetStyle();
if( aStyle & WB_CLIPCHILDREN )
{
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 237f4a8..34ebde1 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -276,7 +276,7 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
else
{
pTable->Clear();
- aRedlineChilds.DeleteAndDestroy(0, aRedlineChilds.Count());
+ aRedlineChildren.DeleteAndDestroy(0, aRedlineChildren.Count());
aRedlineParents.DeleteAndDestroy(nStart, aRedlineParents.Count() - nStart);
}
@@ -451,7 +451,7 @@ void SwRedlineAcceptDlg::Activate()
if (!pRedlineData && pBackupData)
{
- // Redline-Childs were deleted
+ // Redline-Children were deleted
if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
return;
continue;
@@ -462,7 +462,7 @@ void SwRedlineAcceptDlg::Activate()
{
if (pRedlineData != pBackupData->pChild)
{
- // Redline-Childs were inserted, changed or deleted
+ // Redline-Children were inserted, changed or deleted
if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
return;
continue;
@@ -520,7 +520,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
if (bChild) // should actually never happen, but just in case...
{
- // throw away all entry's childs and initialise newly
+ // throw away all entry's children and initialise newly
SwRedlineDataChildPtr pBackupData = (SwRedlineDataChildPtr)pParent->pNext;
SwRedlineDataChildPtr pNext;
@@ -530,13 +530,13 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
if (pBackupData->pTLBChild)
pTable->RemoveEntry(pBackupData->pTLBChild);
- aRedlineChilds.DeleteAndDestroy(aRedlineChilds.GetPos(pBackupData), 1);
+ aRedlineChildren.DeleteAndDestroy(aRedlineChildren.GetPos(pBackupData), 1);
pBackupData = pNext;
}
pParent->pNext = 0;
- // insert new childs
- InsertChilds(pParent, rRedln, nAutoFmt);
+ // insert new children
+ InsertChildren(pParent, rRedln, nAutoFmt);
pTable->SetUpdateMode(sal_True);
return nStart;
@@ -576,7 +576,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
return USHRT_MAX;
}
-void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const
sal_uInt16 nAutoFmt)
+void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRedline& rRedln,
const sal_uInt16 nAutoFmt)
{
String sChild;
SwRedlineDataChild *pLastRedlineChild = 0;
@@ -610,7 +610,7 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl
SwRedlineDataChildPtr pRedlineChild = new SwRedlineDataChild;
pRedlineChild->pChild = pRedlineData;
- aRedlineChilds.Insert(pRedlineChild, aRedlineChilds.Count());
+ aRedlineChildren.Insert(pRedlineChild, aRedlineChildren.Count());
if ( pLastRedlineChild )
pLastRedlineChild->pNext = pRedlineChild;
@@ -665,7 +665,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
// because of Bug of TLB that ALWAYS calls the SelectHandler at Remove:
pTable->SetSelectHdl(aOldSelectHdl);
pTable->SetDeselectHdl(aOldDeselectHdl);
- sal_Bool bChildsRemoved = sal_False;
+ sal_Bool bChildrenRemoved = sal_False;
pTable->SelectAll(sal_False);
// set the cursor after the last entry because otherwise performance problem in TLB.
@@ -685,23 +685,23 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
for (sal_uInt16 i = nStart; i <= nEnd; i++)
{
- if (!bChildsRemoved && aRedlineParents[i]->pNext)
+ if (!bChildrenRemoved && aRedlineParents[i]->pNext)
{
SwRedlineDataChildPtr pChildPtr = (SwRedlineDataChildPtr)aRedlineParents[i]->pNext;
- sal_uInt16 nChildPos = aRedlineChilds.GetPos(pChildPtr);
+ sal_uInt16 nChildPos = aRedlineChildren.GetPos(pChildPtr);
if (nChildPos != USHRT_MAX)
{
- sal_uInt16 nChilds = 0;
+ sal_uInt16 nChildren = 0;
while (pChildPtr)
{
pChildPtr = (SwRedlineDataChildPtr)pChildPtr->pNext;
- nChilds++;
+ nChildren++;
}
- aRedlineChilds.DeleteAndDestroy(nChildPos, nChilds);
- bChildsRemoved = sal_True;
+ aRedlineChildren.DeleteAndDestroy(nChildPos, nChildren);
+ bChildrenRemoved = sal_True;
}
}
SvLBoxEntry *pEntry = aRedlineParents[i]->pTLBParent;
@@ -788,7 +788,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
pRedlineParent->pTLBParent = pParent;
- InsertChilds(pRedlineParent, rRedln, nAutoFmt);
+ InsertChildren(pRedlineParent, rRedln, nAutoFmt);
}
}
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index d8be10d..82c7bad 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -952,7 +952,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
void* key = lcl_GetOutlineKey(this, pOutlineContent);
if( !mOutLineNodeMap[key] )
{
- while( pEntry->HasChilds() )
+ while( pEntry->HasChildren() )
{
SvLBoxEntry* pChildEntry = FirstChild( pEntry );
while( pChildEntry )
@@ -1162,12 +1162,12 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
/***************************************************************************
Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt
***************************************************************************/
-void SwContentTree::RequestingChilds( SvLBoxEntry* pParent )
+void SwContentTree::RequestingChildren( SvLBoxEntry* pParent )
{
// ist es ein Inhaltstyp?
if(lcl_IsContentType(pParent))
{
- if(!pParent->HasChilds())
+ if(!pParent->HasChildren())
{
OSL_ENSURE(pParent->GetUserData(), "no UserData?");
SwContentType* pCntType = (SwContentType*)pParent->GetUserData();
@@ -1261,9 +1261,9 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent )
SwWrtShell* pShell = GetWrtShell();
sal_Bool bBool = SvTreeListBox::Expand(pParent);
SvLBoxEntry* pChild = Next(pParent);
- while(pChild && lcl_IsContent(pChild) && pParent->HasChilds())
+ while(pChild && lcl_IsContent(pChild) && pParent->HasChildren())
{
- if(pChild->HasChilds())
+ if(pChild->HasChildren())
{
sal_Int32 nPos = ((SwContent*)pChild->GetUserData())->GetYPos();
void* key =
(void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
@@ -1341,8 +1341,8 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG )
OSL_ENSURE(pEntry, "no current entry!");
if(pEntry)
{
- if(lcl_IsContentType(pEntry) && !pEntry->HasChilds())
- RequestingChilds(pEntry);
+ if(lcl_IsContentType(pEntry) && !pEntry->HasChildren())
+ RequestingChildren(pEntry);
else if(!lcl_IsContentType(pEntry) && (bIsActive || bIsConstant))
{
if(bIsConstant)
@@ -1500,7 +1500,7 @@ void SwContentTree::Display( sal_Bool bActive )
}
}
else
- RequestingChilds(pParent);
+ RequestingChildren(pParent);
Expand(pParent);
if( nRootType == CONTENT_TYPE_OUTLINE && bIsActive )
{
@@ -1890,7 +1890,7 @@ sal_Bool SwContentTree::HasContentChanged()
}
}
- else if(pEntry->HasChilds())
+ else if(pEntry->HasChildren())
{
//war der Eintrag einmal aufgeklappt, dann muessen auch
// die unsichtbaren Eintraege geprueft werden.
@@ -1933,7 +1933,7 @@ sal_Bool SwContentTree::HasContentChanged()
}
if(!nChildCount)
{
- pEntry->EnableChildsOnDemand(sal_False);
+ pEntry->EnableChildrenOnDemand(sal_False);
InvalidateEntry(pEntry);
}
@@ -2290,7 +2290,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
/***************************************************************************
Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t
- Childs verschoben
+ Children verschoben
***************************************************************************/
sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& )
@@ -2329,7 +2329,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
/***************************************************************************
Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e
- Childs verschoben
+ Children verschoben
***************************************************************************/
sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& )
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 96f82a8..84ee924 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -100,11 +100,11 @@ void SwNavigationPI::CleanEntry( String& rEntry )
}
/*------------------------------------------------------------------------
Beschreibung: Ausfuehrung der Drag-Operation
- mit und ohne Childs
+ mit und ohne Children
------------------------------------------------------------------------*/
void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
- sal_Bool bWithChilds)
+ sal_Bool bWithChildren)
{
SwView *pView = GetCreateView();
SwWrtShell &rSh = pView->GetWrtShell();
@@ -115,18 +115,18 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
short nMove = nTarget-nSource; //( nDir<0 ) ? 1 : 0 ;
rSh.GotoOutline(nSource);
- if (bWithChilds)
+ if (bWithChildren)
rSh.MakeOutlineSel(nSource, nSource, sal_True);
// Die selektierten Children zaehlen bei der Bewegung vorwaerts nicht mit
sal_uInt16 nLastOutlinePos = rSh.GetOutlinePos(MAXLEVEL);
- if(bWithChilds && nMove > 1 &&
+ if(bWithChildren && nMove > 1 &&
nLastOutlinePos < nTarget)
{
if(!rSh.IsCrsrPtAtEnd())
rSh.SwapPam();
nMove -= nLastOutlinePos - nSource;
}
- if(!bWithChilds || nMove < 1 || nLastOutlinePos < nTarget )
+ if(!bWithChildren || nMove < 1 || nLastOutlinePos < nTarget )
rSh.MoveOutlinePara( nMove );
rSh.ClearMark();
rSh.GotoOutline( nSource + nMove);
@@ -247,7 +247,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
//Standard: Unterebenen werden mitgenommen
// mit Ctrl Unterebenen nicht mitnehmen
- sal_Bool bOutlineWithChilds = ( KEY_MOD1 != pBox->GetModifier());
+ sal_Bool bOutlineWithChildren = ( KEY_MOD1 != pBox->GetModifier());
int nFuncId = 0;
sal_Bool bFocusToDoc = sal_False;
switch (nCurrItemId)
@@ -347,7 +347,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
if(IsGlobalMode())
aGlobalTree.ExecCommand(nCurrItemId);
else
- aContentTree.ExecCommand(nCurrItemId, bOutlineWithChilds);
+ aContentTree.ExecCommand(nCurrItemId, bOutlineWithChildren);
}
break;
case FN_GLOBAL_SWITCH:
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 1245d0c..5f4685c 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 e5bf767..8854c4c 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 881a542..a10a799 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 105770f..81476ed 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 )
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index cf9d1b2..313e73b 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -968,7 +968,7 @@ BaseContent::setPropertyValues(
rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8 );
- m_pMyShell->move( nMyCommandIdentifier, // move notifies the childs also;
+ m_pMyShell->move( nMyCommandIdentifier, // move notifies the children also;
m_aUncPath,
aDstName,
NameClash::KEEP );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index fcc238b..deb00e0 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2715,7 +2715,7 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >*
liste
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
const rtl::OUString aNewPrefix,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
std::vector< std::list< ContentEventNotifier* >* >* aVectorOnHeap =
@@ -2730,7 +2730,7 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
{
osl::MutexGuard aGuard( m_aMutex );
- if( ! withChilds )
+ if( ! withChildren )
{
aOldName = aOldPrefix;
aNewName = aNewPrefix;
@@ -2756,7 +2756,7 @@ shell::getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
std::list< ContentEventNotifier* >* p = new std::list< ContentEventNotifier* >;
std::list< ContentEventNotifier* >& listeners = *p;
- if( withChilds )
+ if( withChildren )
{
aOldName = oldChildList[j];
aNewName = newName( aNewPrefix,aOldPrefix,aOldName );
@@ -2885,7 +2885,7 @@ void SAL_CALL shell::notifyPropertyChanges( std::list<
PropertyChangeNotifier* >
void SAL_CALL
shell::erasePersistentSet( const rtl::OUString& aUnqPath,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
if( ! m_xFileRegistry.is() )
{
@@ -2895,23 +2895,23 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath,
uno::Sequence< rtl::OUString > seqNames;
- if( withChilds )
+ if( withChildren )
{
uno::Reference< container::XNameAccess > xName( m_xFileRegistry,uno::UNO_QUERY );
seqNames = xName->getElementNames();
}
- sal_Int32 count = withChilds ? seqNames.getLength() : 1;
+ sal_Int32 count = withChildren ? seqNames.getLength() : 1;
rtl::OUString
old_Name = aUnqPath;
for( sal_Int32 j = 0; j < count; ++j )
{
- if( withChilds && ! ( isChild( old_Name,seqNames[j] ) ) )
+ if( withChildren && ! ( isChild( old_Name,seqNames[j] ) ) )
continue;
- if( withChilds )
+ if( withChildren )
{
old_Name = seqNames[j];
}
@@ -2948,7 +2948,7 @@ shell::erasePersistentSet( const rtl::OUString& aUnqPath,
void SAL_CALL
shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
const rtl::OUString& dstUnqPath,
- sal_Bool withChilds )
+ sal_Bool withChildren )
{
if( ! m_xFileRegistry.is() )
{
@@ -2958,13 +2958,13 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
uno::Sequence< rtl::OUString > seqNames;
- if( withChilds )
+ if( withChildren )
{
uno::Reference< container::XNameAccess > xName( m_xFileRegistry,uno::UNO_QUERY );
seqNames = xName->getElementNames();
}
- sal_Int32 count = withChilds ? seqNames.getLength() : 1;
+ sal_Int32 count = withChildren ? seqNames.getLength() : 1;
rtl::OUString
old_Name = srcUnqPath,
@@ -2972,10 +2972,10 @@ shell::copyPersistentSet( const rtl::OUString& srcUnqPath,
for( sal_Int32 j = 0; j < count; ++j )
{
- if( withChilds && ! ( isChild( srcUnqPath,seqNames[j] ) ) )
+ if( withChildren && ! ( isChild( srcUnqPath,seqNames[j] ) ) )
continue;
- if( withChilds )
+ if( withChildren )
{
old_Name = seqNames[j];
new_Name = newName( dstUnqPath,srcUnqPath,old_Name );
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 2660fa1..2584b76 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -429,7 +429,7 @@ namespace fileaccess {
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
getContentExchangedEventListeners( const rtl::OUString aOldPrefix,
const rtl::OUString aNewPrefix,
- sal_Bool withChilds );
+ sal_Bool withChildren );
std::list< PropertyChangeNotifier* >* SAL_CALL
getPropertyChangeNotifier( const rtl::OUString& aName );
@@ -473,7 +473,7 @@ namespace fileaccess {
/********************************************************************************/
void SAL_CALL erasePersistentSet( const rtl::OUString& aUnqPath,
- sal_Bool withChilds = false );
+ sal_Bool withChildren = false );
/********************************************************************************/
/* copy persistent propertyset */
@@ -482,7 +482,7 @@ namespace fileaccess {
void SAL_CALL copyPersistentSet( const rtl::OUString& srcUnqPath,
const rtl::OUString& dstUnqPath,
- sal_Bool withChilds = false );
+ sal_Bool withChildren = false );
// Special optimized method for getting the properties of a directoryitem, which
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 2403dc1..c97a756 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
@@ -165,7 +165,7 @@ class UcbExplorerTreeListBox : public SvTreeListBox
private:
virtual SvLBoxEntry* CreateEntry() const;
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
public:
UcbExplorerTreeListBox( ResMgr & rResMgr, Window* pParent, WinBits nWinStyle = 0 );
@@ -570,11 +570,11 @@ SvLBoxEntry* UcbExplorerTreeListBox::CreateEntry() const
//=========================================================================
// virtual
-void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
+void UcbExplorerTreeListBox::RequestingChildren( SvLBoxEntry* pParent )
{
UcbExplorerListBoxEntry* pEntry
= static_cast< UcbExplorerListBoxEntry * >( pParent );
- if ( !pEntry->HasChilds() )
+ if ( !pEntry->HasChildren() )
{
switch ( pEntry->m_eType )
{
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 68946e2..4c3386f 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -429,10 +429,10 @@ public:
SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos );
SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos );
SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion );
- SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip();
+ SAL_DLLPRIVATE void ImplUpdateSysObjChildrenClip();
SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip();
SAL_DLLPRIVATE void ImplUpdateSysObjClip();
- SAL_DLLPRIVATE sal_Bool ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller =
sal_False );
+ SAL_DLLPRIVATE sal_Bool ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller =
sal_False );
SAL_DLLPRIVATE sal_Bool ImplSetClipFlagOverlapWindows( sal_Bool
bSysObjOnlySmaller = sal_False );
SAL_DLLPRIVATE sal_Bool ImplSetClipFlag( sal_Bool bSysObjOnlySmaller =
sal_False );
SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( Region& rRegion );
@@ -441,8 +441,8 @@ public:
SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion );
SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion );
SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, sal_Bool bThis,
sal_Bool bOverlaps );
- SAL_DLLPRIVATE sal_Bool ImplClipChilds( Region& rRegion );
- SAL_DLLPRIVATE void ImplClipAllChilds( Region& rRegion );
+ SAL_DLLPRIVATE sal_Bool ImplClipChildren( Region& rRegion );
+ SAL_DLLPRIVATE void ImplClipAllChildren( Region& rRegion );
SAL_DLLPRIVATE void ImplClipSiblings( Region& rRegion );
SAL_DLLPRIVATE void ImplInitWinClipRegion();
SAL_DLLPRIVATE void ImplInitWinChildClipRegion();
@@ -451,7 +451,7 @@ public:
SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const Region&
rInterRegion, Region& rRegion );
SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const Region& rInterRegion,
Region& rRegion );
SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect,
Region& rRegion,
- sal_Bool bChilds, sal_Bool bParent, sal_Bool
bSiblings );
+ sal_Bool bChildren, sal_Bool bParent, sal_Bool
bSiblings );
SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, sal_uInt16
nPaintFlags );
SAL_DLLPRIVATE void ImplCallOverlapPaint();
SAL_DLLPRIVATE void ImplPostPaint();
@@ -461,8 +461,8 @@ public:
SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, sal_uInt16
nFlags );
SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, sal_uInt16 nFlags );
- SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long
nHorzScroll, long nVertScroll, sal_Bool bChilds );
- SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long
nHorzScroll, long nVertScroll, sal_Bool bChilds );
+ SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long
nHorzScroll, long nVertScroll, sal_Bool bChildren );
+ SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long
nHorzScroll, long nVertScroll, sal_Bool bChildren );
SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long
nVertScroll, sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplUpdateAll( sal_Bool bOverlapWindows = sal_True );
SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow );
@@ -490,7 +490,7 @@ public:
*/
SAL_DLLPRIVATE bool ImplCheckUIFont( const Font& rFont );
SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
= sal_True );
- SAL_DLLPRIVATE void ImplAlignChilds();
+ SAL_DLLPRIVATE void ImplAlignChildren();
SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight,
sal_uInt16 nFlags );
SAL_DLLPRIVATE void ImplToBottomChild();
SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData );
@@ -628,7 +628,7 @@ public:
void IncrementLockCount();
void DecrementLockCount();
- sal_Bool IsLocked( sal_Bool bChilds = sal_False ) const;
+ sal_Bool IsLocked( sal_Bool bChildren = sal_False ) const;
// returns the input language used for the last key stroke
// may be LANGUAGE_DONTKNOW if not supported by the OS
@@ -693,7 +693,7 @@ public:
virtual void SetSettings( const AllSettings& rSettings );
virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild );
void UpdateSettings( const AllSettings& rSettings, sal_Bool bChild = sal_False
);
- void NotifyAllChilds( DataChangedEvent& rDCEvt );
+ void NotifyAllChildren( DataChangedEvent& rDCEvt );
void SetPointFont( const Font& rFont );
Font GetPointFont() const;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 12f6eed..106fe96 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -198,8 +198,8 @@ struct ImplFrameData
sal_Bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN
sal_Bool mbMinimized; // set, when FrameSize <= 0
sal_Bool mbStartFocusState; // FocusState, beim abschicken des Events
- sal_Bool mbInSysObjFocusHdl; // Innerhalb vom GetFocus-Handler eines SysChilds
- sal_Bool mbInSysObjToTopHdl; // Innerhalb vom ToTop-Handler eines SysChilds
+ sal_Bool mbInSysObjFocusHdl; // Innerhalb vom GetFocus-Handler eines SysChildren
+ sal_Bool mbInSysObjToTopHdl; // Innerhalb vom ToTop-Handler eines SysChildren
sal_Bool mbSysObjFocus; // Hat ein SysChild den Focus
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >
mxDragSource;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 44a0844..1f08f18c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -776,12 +776,12 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt )
Window* pFrame = pSVData->maWinData.mpFirstFrame;
while ( pFrame )
{
- pFrame->NotifyAllChilds( rDCEvt );
+ pFrame->NotifyAllChildren( rDCEvt );
Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
while ( pSysWin )
{
- pSysWin->NotifyAllChilds( rDCEvt );
+ pSysWin->NotifyAllChildren( rDCEvt );
pSysWin = pSysWin->mpWindowImpl->mpNextOverlap;
}
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 1fcfdb0..844eabb 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -226,7 +226,7 @@ void Octree::ImplReduce()
sal_uLong nRedSum = 0L;
sal_uLong nGreenSum = 0L;
sal_uLong nBlueSum = 0L;
- sal_uLong nChilds = 0L;
+ sal_uLong nChildren = 0L;
for ( i = OCTREE_BITS - 1; i && !pReduce[i]; i-- ) {}
@@ -246,7 +246,7 @@ void Octree::ImplReduce()
pNodeCache->ImplReleaseNode( pNode->pChild[ i ] );
pNode->pChild[ i ] = NULL;
- nChilds++;
+ nChildren++;
}
}
@@ -254,7 +254,7 @@ void Octree::ImplReduce()
pNode->nRed = nRedSum;
pNode->nGreen = nGreenSum;
pNode->nBlue = nBlueSum;
- nLeafCount -= --nChilds;
+ nLeafCount -= --nChildren;
}
// ------------------------------------------------------------------------
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index eaf4a14..ba67ed1 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -149,7 +149,7 @@ void TabDialog::ImplPosControls()
// Positionierung vornehmen
pTabControl->SetPosPixel( aTabOffset );
- // Alle anderen Childs positionieren
+ // Alle anderen Children positionieren
sal_Bool bTabCtrl = sal_False;
int nLines = 0;
long nX;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2bdf5f4..98611d1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1817,7 +1817,7 @@ sal_Bool Window::ImplSysObjClip( const Region* pOldRegion )
// -----------------------------------------------------------------------
-void Window::ImplUpdateSysObjChildsClip()
+void Window::ImplUpdateSysObjChildrenClip()
{
if ( mpWindowImpl->mpSysObj && mpWindowImpl->mbInitWinClipRegion )
ImplSysObjClip( NULL );
@@ -1825,7 +1825,7 @@ void Window::ImplUpdateSysObjChildsClip()
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
{
- pWindow->ImplUpdateSysObjChildsClip();
+ pWindow->ImplUpdateSysObjChildrenClip();
pWindow = pWindow->mpWindowImpl->mpNext;
}
}
@@ -1834,7 +1834,7 @@ void Window::ImplUpdateSysObjChildsClip()
void Window::ImplUpdateSysObjOverlapsClip()
{
- ImplUpdateSysObjChildsClip();
+ ImplUpdateSysObjChildrenClip();
Window* pWindow = mpWindowImpl->mpFirstOverlap;
while ( pWindow )
@@ -1850,7 +1850,7 @@ void Window::ImplUpdateSysObjClip()
{
if ( !ImplIsOverlapWindow() )
{
- ImplUpdateSysObjChildsClip();
+ ImplUpdateSysObjChildrenClip();
// siblings should recalculate their clip region
if ( mpWindowImpl->mbClipSiblings )
@@ -1858,7 +1858,7 @@ void Window::ImplUpdateSysObjClip()
Window* pWindow = mpWindowImpl->mpNext;
while ( pWindow )
{
- pWindow->ImplUpdateSysObjChildsClip();
+ pWindow->ImplUpdateSysObjChildrenClip();
pWindow = pWindow->mpWindowImpl->mpNext;
}
}
@@ -1869,7 +1869,7 @@ void Window::ImplUpdateSysObjClip()
// -----------------------------------------------------------------------
-sal_Bool Window::ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller )
+sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller )
{
sal_Bool bUpdate = sal_True;
if ( mpWindowImpl->mpSysObj )
@@ -1884,7 +1884,7 @@ sal_Bool Window::ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller )
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
{
- if ( !pWindow->ImplSetClipFlagChilds( bSysObjOnlySmaller ) )
+ if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) )
bUpdate = sal_False;
pWindow = pWindow->mpWindowImpl->mpNext;
}
@@ -1906,7 +1906,7 @@ sal_Bool Window::ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller )
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
{
- if ( !pWindow->ImplSetClipFlagChilds( bSysObjOnlySmaller ) )
+ if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) )
bUpdate = sal_False;
pWindow = pWindow->mpWindowImpl->mpNext;
}
@@ -1918,7 +1918,7 @@ sal_Bool Window::ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller )
sal_Bool Window::ImplSetClipFlagOverlapWindows( sal_Bool bSysObjOnlySmaller )
{
- sal_Bool bUpdate = ImplSetClipFlagChilds( bSysObjOnlySmaller );
+ sal_Bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller );
Window* pWindow = mpWindowImpl->mpFirstOverlap;
while ( pWindow )
@@ -1937,7 +1937,7 @@ sal_Bool Window::ImplSetClipFlag( sal_Bool bSysObjOnlySmaller )
{
if ( !ImplIsOverlapWindow() )
{
- sal_Bool bUpdate = ImplSetClipFlagChilds( bSysObjOnlySmaller );
+ sal_Bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller );
Window* pParent = ImplGetParent();
if ( pParent &&
@@ -1953,7 +1953,7 @@ sal_Bool Window::ImplSetClipFlag( sal_Bool bSysObjOnlySmaller )
Window* pWindow = mpWindowImpl->mpNext;
while ( pWindow )
{
- if ( !pWindow->ImplSetClipFlagChilds( bSysObjOnlySmaller ) )
+ if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) )
bUpdate = sal_False;
pWindow = pWindow->mpWindowImpl->mpNext;
}
@@ -2069,7 +2069,7 @@ void Window::ImplClipBoundaries( Region& rRegion, sal_Bool bThis, sal_Bool
bOver
// -----------------------------------------------------------------------
-sal_Bool Window::ImplClipChilds( Region& rRegion )
+sal_Bool Window::ImplClipChildren( Region& rRegion )
{
sal_Bool bOtherClip = sal_False;
Window* pWindow = mpWindowImpl->mpFirstChild;
@@ -2094,7 +2094,7 @@ sal_Bool Window::ImplClipChilds( Region& rRegion )
// -----------------------------------------------------------------------
-void Window::ImplClipAllChilds( Region& rRegion )
+void Window::ImplClipAllChildren( Region& rRegion )
{
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -2165,7 +2165,7 @@ void Window::ImplInitWinChildClipRegion()
else
*mpWindowImpl->mpChildClipRegion = mpWindowImpl->maWinClipRegion;
- ImplClipChilds( *mpWindowImpl->mpChildClipRegion );
+ ImplClipChildren( *mpWindowImpl->mpChildClipRegion );
}
mpWindowImpl->mbInitChildRegion = sal_False;
@@ -2249,7 +2249,7 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion,
Region&
// -----------------------------------------------------------------------
void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion,
- sal_Bool bChilds, sal_Bool bParent, sal_Bool bSiblings )
+ sal_Bool bChildren, sal_Bool bParent, sal_Bool bSiblings )
{
Region aRegion( rSourceRect );
if ( mpWindowImpl->mbWinRegion )
@@ -2302,8 +2302,8 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region&
rRegio
while ( pWindow );
}
- // Childs
- if ( bChilds )
+ // Children
+ if ( bChildren )
{
pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -2680,10 +2680,10 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
if ( !(nFlags & INVALIDATE_NOCLIPCHILDREN) )
{
if ( nOrgFlags & INVALIDATE_NOCHILDREN )
- ImplClipAllChilds( aRegion );
+ ImplClipAllChildren( aRegion );
else
{
- if ( ImplClipChilds( aRegion ) )
+ if ( ImplClipChildren( aRegion ) )
nFlags |= INVALIDATE_CHILDREN;
}
}
@@ -2700,7 +2700,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
long nHorzScroll, long nVertScroll,
- sal_Bool bChilds )
+ sal_Bool bChildren )
{
if ( (mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTALL)) ==
IMPL_PAINT_PAINT )
{
@@ -2710,7 +2710,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
mpWindowImpl->maInvalidateRegion.Union( aTempRegion );
}
- if ( bChilds && (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTCHILDREN) )
+ if ( bChildren && (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTCHILDREN) )
{
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -2725,10 +2725,10 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
long nHorzScroll, long nVertScroll,
- sal_Bool bChilds )
+ sal_Bool bChildren )
{
// also shift Paint-Region when paints need processing
- ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, bChilds );
+ ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, bChildren );
// Paint-Region should be shifted, as drawn by the parents
if ( !ImplIsOverlapWindow() )
{
@@ -2753,7 +2753,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
{
aPaintAllRegion.Move( nHorzScroll, nVertScroll );
sal_uInt16 nPaintFlags = 0;
- if ( bChilds )
+ if ( bChildren )
mpWindowImpl->mnPaintFlags |= INVALIDATE_CHILDREN;
ImplInvalidateFrameRegion( &aPaintAllRegion, nPaintFlags );
}
@@ -2833,10 +2833,10 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags )
{
nFlags &= ~VALIDATE_CHILDREN;
if ( nOrgFlags & VALIDATE_NOCHILDREN )
- ImplClipAllChilds( aRegion );
+ ImplClipAllChildren( aRegion );
else
{
- if ( ImplClipChilds( aRegion ) )
+ if ( ImplClipChildren( aRegion ) )
nFlags |= VALIDATE_CHILDREN;
}
}
@@ -2876,11 +2876,11 @@ void Window::ImplScroll( const Rectangle& rRect,
}
Region aInvalidateRegion;
- sal_Bool bScrollChilds = (nFlags & SCROLL_CHILDREN) != 0;
+ sal_Bool bScrollChildren = (nFlags & SCROLL_CHILDREN) != 0;
sal_Bool bErase = (nFlags & SCROLL_NOERASE) == 0;
if ( !mpWindowImpl->mpFirstChild )
- bScrollChilds = sal_False;
+ bScrollChildren = sal_False;
// --- RTL --- check if this window requires special action
sal_Bool bReMirror = ( ImplIsAntiparallel() );
@@ -2894,11 +2894,11 @@ void Window::ImplScroll( const Rectangle& rRect,
}
// adapt paint areas
- ImplMoveAllInvalidateRegions( aRectMirror, nHorzScroll, nVertScroll, bScrollChilds );
+ ImplMoveAllInvalidateRegions( aRectMirror, nHorzScroll, nVertScroll, bScrollChildren );
if ( !(nFlags & SCROLL_NOINVALIDATE) )
{
- ImplCalcOverlapRegion( aRectMirror, aInvalidateRegion, !bScrollChilds, sal_True, sal_False
);
+ ImplCalcOverlapRegion( aRectMirror, aInvalidateRegion, !bScrollChildren, sal_True,
sal_False );
// --- RTL ---
// if the scrolling on the device is performed in the opposite direction
@@ -2931,12 +2931,12 @@ void Window::ImplScroll( const Rectangle& rRect,
aRegion.Exclude( aInvalidateRegion );
ImplClipBoundaries( aRegion, sal_False, sal_True );
- if ( !bScrollChilds )
+ if ( !bScrollChildren )
{
if ( nOrgFlags & SCROLL_NOCHILDREN )
- ImplClipAllChilds( aRegion );
+ ImplClipAllChildren( aRegion );
else
- ImplClipChilds( aRegion );
+ ImplClipChildren( aRegion );
}
if ( mbClipRegion && (nFlags & SCROLL_USECLIPREGION) )
aRegion.Intersect( maRegion );
@@ -2984,17 +2984,17 @@ void Window::ImplScroll( const Rectangle& rRect,
sal_uInt16 nPaintFlags = INVALIDATE_CHILDREN;
if ( !bErase )
nPaintFlags |= INVALIDATE_NOERASE;
- if ( !bScrollChilds )
+ if ( !bScrollChildren )
{
if ( nOrgFlags & SCROLL_NOCHILDREN )
- ImplClipAllChilds( aInvalidateRegion );
+ ImplClipAllChildren( aInvalidateRegion );
else
- ImplClipChilds( aInvalidateRegion );
+ ImplClipChildren( aInvalidateRegion );
}
ImplInvalidateFrameRegion( &aInvalidateRegion, nPaintFlags );
}
- if ( bScrollChilds )
+ if ( bScrollChildren )
{
Window* pWindow = mpWindowImpl->mpFirstChild;
while ( pWindow )
@@ -5343,12 +5343,12 @@ void Window::PostStateChanged( StateChangedType nState )
// -----------------------------------------------------------------------
-sal_Bool Window::IsLocked( sal_Bool bChilds ) const
+sal_Bool Window::IsLocked( sal_Bool bChildren ) const
{
if ( mpWindowImpl->mnLockCount != 0 )
return sal_True;
- if ( bChilds || mpWindowImpl->mbChildNotify )
+ if ( bChildren || mpWindowImpl->mbChildNotify )
{
Window* pChild = mpWindowImpl->mpFirstChild;
while ( pChild )
@@ -5726,7 +5726,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
// -----------------------------------------------------------------------
-void Window::NotifyAllChilds( DataChangedEvent& rDCEvt )
+void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
{
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
@@ -5735,7 +5735,7 @@ void Window::NotifyAllChilds( DataChangedEvent& rDCEvt )
Window* pChild = mpWindowImpl->mpFirstChild;
while ( pChild )
{
- pChild->NotifyAllChilds( rDCEvt );
+ pChild->NotifyAllChildren( rDCEvt );
pChild = pChild->mpWindowImpl->mpNext;
}
}
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index e40fd2e..23b9b64 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -170,7 +170,7 @@ void AtkListener::handleChildRemoved(
}
// FIXME: two problems here:
- // a) we get child-removed events for objects that are no real childs
+ // a) we get child-removed events for objects that are no real children
// in the accessibility hierarchy or have been removed before due to
// some child removing batch.
// b) spi_atk_bridge_signal_listener ignores the given parameters
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index c472f9a..ab5d956 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -60,21 +60,21 @@ namespace treeview {
TVDom( TVDom* arent = 0 )
: kind( other ),
parent( arent ),
- childs( 0 )
+ children( 0 )
{
}
~TVDom()
{
- for( unsigned i = 0; i < childs.size(); ++i )
- delete childs[i];
+ for( unsigned i = 0; i < children.size(); ++i )
+ delete children[i];
}
TVDom* newChild()
{
- childs.push_back( new TVDom( this ) );
- return childs.back();
+ children.push_back( new TVDom( this ) );
+ return children.back();
}
@@ -166,7 +166,7 @@ namespace treeview {
rtl::OUString targetURL;
TVDom *parent;
- std::vector< TVDom* > childs;
+ std::vector< TVDom* > children;
};
}
@@ -491,9 +491,9 @@ extern "C" void data_handler( void *userData,
TVChildTarget::TVChildTarget( const ConfigData& configData,TVDom* tvDom )
{
- Elements.resize( tvDom->childs.size() );
+ Elements.resize( tvDom->children.size() );
for( unsigned i = 0; i < Elements.size(); ++i )
- Elements[i] = new TVRead( configData,tvDom->childs[i] );
+ Elements[i] = new TVRead( configData,tvDom->children[i] );
}
@@ -541,9 +541,9 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
// now TVDom holds the relevant information
- Elements.resize( tvDom.childs.size() );
+ Elements.resize( tvDom.children.size() );
for( unsigned i = 0; i < Elements.size(); ++i )
- Elements[i] = new TVRead( configData,tvDom.childs[i] );
+ Elements[i] = new TVRead( configData,tvDom.children[i] );
}
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index 52a3584..f00fe20 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -80,7 +80,7 @@ public:
// EndElement instead if this is required.
virtual ~SvXMLImportContext();
- // 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 SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index bff6431..a98bd32 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 7ed5d93..58989d15 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 28d411e..2a03e47 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 9295a75..8bd98bd 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 45a311c..71d390d 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 b15c0fb..eb52101 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 0d48a40..7ccca93 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 54aca4b..933197c 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 07b33e0..3866cf8 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,
--
1.7.3.2
Context
- [Libreoffice] childs -> children · Mike Whiteley
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.