[Libreoffice-commits] .: animations/source autodoc/inc basctl/source basic/source connectivity/source cui/source dbaccess/source dmake/unix drawinglayer/source editeng/inc editeng/source extensions/source forms/source framework/inc framework/source l10ntools/inc l10ntools/source moz/seamonkey-source-1.1.14.patch package/source qadevOOo/tests reportbuilder/java rsc/doku scripting/source sc/source sd/source sfx2/inc sfx2/source svtools/inc svtools/source svtools/workben svx/inc svx/source sw/inc sw/source toolkit/source ucbhelper/workben ucb/source UnoControls/source vcl/inc vcl/source vcl/unx xmlhelp/source xmloff/inc xmloff/source
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Dec 8 01:33:47 PST 2011
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 | 6
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/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 | 12
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/tabledesign/TableDesignView.cxx | 4
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2
dmake/unix/runargv.c | 6
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
editeng/inc/editeng/outliner.hxx | 8
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2
editeng/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
qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java | 18 -
qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java | 8
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 4
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java | 2
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 2
reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java | 8
reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java | 8
reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java | 10
reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java | 40 +-
reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java | 10
reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java | 12
rsc/doku/feinkonz.43/rsc.sdw | 6
sc/source/ui/Accessibility/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
scripting/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 | 16
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 | 42 +-
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
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 40 +-
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
svx/source/unodialogs/textconversiondlgs/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 | 123 +++---
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
175 files changed, 1113 insertions(+), 1114 deletions(-)
New commits:
commit dcfd4beb213c551f6ef6ba379651bf303bd9017a
Author: Michael T. Whiteley <mike at whiteley.org>
Date: Wed Dec 7 02:33:51 2011 -0800
childs -> children
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..52bd71a 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..c4b836e 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..9b3ca10 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;
@@ -2070,12 +2070,12 @@ void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
pEntry->SetFlags(
(pEntry->GetFlags() &
~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN))
- | SV_ENTRYFLAG_CHILDS_ON_DEMAND );
+ | SV_ENTRYFLAG_CHILDREN_ON_DEMAND );
}
else
{
pEntry->SetFlags(
- (pEntry->GetFlags() & ~(SV_ENTRYFLAG_CHILDS_ON_DEMAND)) );
+ (pEntry->GetFlags() & ~(SV_ENTRYFLAG_CHILDREN_ON_DEMAND)) );
}
}
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/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 f2917e1..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..0a177be 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())
{
@@ -216,7 +216,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry)
{
// set the flag which allows if the entry can be expanded
- pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDS_ON_DEMAND );
+ pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDREN_ON_DEMAND );
// redraw the entry
GetModel()->InvalidateEntry( pEntry );
return 0L;
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/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 8447c9c..f08310c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -573,7 +573,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 af0bc52..d8c9ed1 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 {
/**
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list