childs -> children

9 files changed, 51 insertions, 51 deletions

diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 3fc9533a9349..4e025dd1316b 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -275,15 +275,15 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol)
 
         if (sDBName.Len())
         {
-            Select(sDBName, sTableName, sColumnName);   // force RequestingChilds
+            Select(sDBName, sTableName, sColumnName);   // force RequestingChildren
         }
         SetUpdateMode(sal_True);
     }
 }
 
-void  SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
+void  SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent)
 {
-    if (!pParent->HasChilds())
+    if (!pParent->HasChildren())
     {
         if (GetParent(pParent)) // column names
         {
@@ -456,8 +456,8 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const
     {
         if (rDBName == GetEntryText(pParent))
         {
-            if (!pParent->HasChilds())
-                RequestingChilds(pParent);
+            if (!pParent->HasChildren())
+                RequestingChildren(pParent);
             while ((pChild = GetEntry(pParent, nChild++)) != NULL)
             {
                 if (rTableName == GetEntryText(pChild))
@@ -468,8 +468,8 @@ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const
                     {
                         nChild = 0;
 
-                        if (!pParent->HasChilds())
-                            RequestingChilds(pParent);
+                        if (!pParent->HasChildren())
+                            RequestingChildren(pParent);
 
                         while ((pChild = GetEntry(pParent, nChild++)) != NULL)
                             if (rColumnName == GetEntryText(pChild))
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 77647b9e68cb..9f262d49ac2a 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -520,7 +520,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
                 pEntry = aTree.InsertEntry(pSect->GetSectionName(), aImg, aImg);
                 pEntry->SetUserData(pSectRepr);
                 RecurseList( pFmt, pEntry );
-                if (pEntry->HasChilds())
+                if (pEntry->HasChildren())
                     aTree.Expand(pEntry);
                 if (pCurrSect==pSect)
                     aTree.Select(pEntry);
@@ -551,7 +551,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
                         pSect->GetSectionName(), aImage, aImage, pEntry);
                     pNEntry->SetUserData(pSectRepr);
                     RecurseList( aTmpArr[n]->GetFmt(), pNEntry );
-                    if( pNEntry->HasChilds())
+                    if( pNEntry->HasChildren())
                         aTree.Expand(pNEntry);
                     if (pCurrSect==pSect)
                         pSelEntry = pNEntry;
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 3659f847ab01..075ebd37768b 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -198,7 +198,7 @@ public:
     DECL_LINK( TimerUpdate, Timer * );
 
     virtual long    GetTabPos( SvLBoxEntry*, SvLBoxTab* );
-    virtual void    RequestingChilds( SvLBoxEntry* pParent );
+    virtual void    RequestingChildren( SvLBoxEntry* pParent );
     virtual void    GetFocus();
     virtual void    KeyInput(const KeyEvent& rKEvt);
 
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index 090654b3f55c..f3eb86e3dc60 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -57,7 +57,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
     SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* );
 
     SW_DLLPRIVATE void          InitTreeList();
-    SW_DLLPRIVATE virtual void  RequestingChilds( SvLBoxEntry* pParent );
+    SW_DLLPRIVATE virtual void  RequestingChildren( SvLBoxEntry* pParent );
 
     SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
     SW_DLLPRIVATE virtual void  StartDrag( sal_Int8 nAction, const Point& rPosPixel );
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 8dedffb9aa4a..abb955da098c 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -80,7 +80,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
 {
     Dialog*                 pParentDlg;
     SwRedlineDataParentArr  aRedlineParents;
-    SwRedlineDataChildArr   aRedlineChilds;
+    SwRedlineDataChildArr   aRedlineChildren;
     SwRedlineDataParentSortArr aUsedSeqNo;
     SvxAcceptChgCtr         aTabPagesCTRL;
     PopupMenu               aPopup;
@@ -116,7 +116,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SW_DLLPRIVATE DECL_LINK( CommandHdl,        void* );
 
     SW_DLLPRIVATE sal_uInt16            CalcDiff(sal_uInt16 nStart, sal_Bool bChild);
-    SW_DLLPRIVATE void          InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const sal_uInt16 nAutoFmt);
+    SW_DLLPRIVATE void          InsertChildren(SwRedlineDataParent *pParent, const SwRedline& rRedln, const sal_uInt16 nAutoFmt);
     SW_DLLPRIVATE void          InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX);
     SW_DLLPRIVATE void          RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
     SW_DLLPRIVATE void          InitAuthors();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index cab0b19477ee..247c6f3b8709 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3953,9 +3953,9 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId,
     xCheckController = new ::svt::CheckBoxCellController(&aCellCheckBox);
 
     //////////////////////////////////////////////////////////////////////
-    // HACK: BrowseBox doesn't invalidate its childs, how it should be.
+    // HACK: BrowseBox doesn't invalidate its children, how it should be.
     // That's why WB_CLIPCHILDREN is reset in order to enforce the
-    // childs' invalidation
+    // children' invalidation
     WinBits aStyle = GetStyle();
     if( aStyle & WB_CLIPCHILDREN )
     {
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 237f4a8915d2..34ebde14663f 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -276,7 +276,7 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
     else
     {
         pTable->Clear();
-        aRedlineChilds.DeleteAndDestroy(0, aRedlineChilds.Count());
+        aRedlineChildren.DeleteAndDestroy(0, aRedlineChildren.Count());
         aRedlineParents.DeleteAndDestroy(nStart, aRedlineParents.Count() - nStart);
     }
 
@@ -451,7 +451,7 @@ void SwRedlineAcceptDlg::Activate()
 
         if (!pRedlineData && pBackupData)
         {
-            // Redline-Childs were deleted
+            // Redline-Children were deleted
             if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
                 return;
             continue;
@@ -462,7 +462,7 @@ void SwRedlineAcceptDlg::Activate()
             {
                 if (pRedlineData != pBackupData->pChild)
                 {
-                    // Redline-Childs were inserted, changed or deleted
+                    // Redline-Children were inserted, changed or deleted
                     if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
                         return;
                     continue;
@@ -520,7 +520,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
 
     if (bChild)     // should actually never happen, but just in case...
     {
-        // throw away all entry's childs and initialise newly
+        // throw away all entry's children and initialise newly
         SwRedlineDataChildPtr pBackupData = (SwRedlineDataChildPtr)pParent->pNext;
         SwRedlineDataChildPtr pNext;
 
@@ -530,13 +530,13 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
             if (pBackupData->pTLBChild)
                 pTable->RemoveEntry(pBackupData->pTLBChild);
 
-            aRedlineChilds.DeleteAndDestroy(aRedlineChilds.GetPos(pBackupData), 1);
+            aRedlineChildren.DeleteAndDestroy(aRedlineChildren.GetPos(pBackupData), 1);
             pBackupData = pNext;
         }
         pParent->pNext = 0;
 
-        // insert new childs
-        InsertChilds(pParent, rRedln, nAutoFmt);
+        // insert new children
+        InsertChildren(pParent, rRedln, nAutoFmt);
 
         pTable->SetUpdateMode(sal_True);
         return nStart;
@@ -576,7 +576,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
     return USHRT_MAX;
 }
 
-void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedline& rRedln, const sal_uInt16 nAutoFmt)
+void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRedline& rRedln, const sal_uInt16 nAutoFmt)
 {
     String sChild;
     SwRedlineDataChild *pLastRedlineChild = 0;
@@ -610,7 +610,7 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl
 
         SwRedlineDataChildPtr pRedlineChild = new SwRedlineDataChild;
         pRedlineChild->pChild = pRedlineData;
-        aRedlineChilds.Insert(pRedlineChild, aRedlineChilds.Count());
+        aRedlineChildren.Insert(pRedlineChild, aRedlineChildren.Count());
 
         if ( pLastRedlineChild )
             pLastRedlineChild->pNext = pRedlineChild;
@@ -665,7 +665,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
     // because of Bug of TLB that ALWAYS calls the SelectHandler at Remove:
     pTable->SetSelectHdl(aOldSelectHdl);
     pTable->SetDeselectHdl(aOldDeselectHdl);
-    sal_Bool bChildsRemoved = sal_False;
+    sal_Bool bChildrenRemoved = sal_False;
     pTable->SelectAll(sal_False);
 
     // set the cursor after the last entry because otherwise performance problem in TLB.
@@ -685,23 +685,23 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
 
     for (sal_uInt16 i = nStart; i <= nEnd; i++)
     {
-        if (!bChildsRemoved && aRedlineParents[i]->pNext)
+        if (!bChildrenRemoved && aRedlineParents[i]->pNext)
         {
             SwRedlineDataChildPtr pChildPtr = (SwRedlineDataChildPtr)aRedlineParents[i]->pNext;
-            sal_uInt16 nChildPos = aRedlineChilds.GetPos(pChildPtr);
+            sal_uInt16 nChildPos = aRedlineChildren.GetPos(pChildPtr);
 
             if (nChildPos != USHRT_MAX)
             {
-                sal_uInt16 nChilds = 0;
+                sal_uInt16 nChildren = 0;
 
                 while (pChildPtr)
                 {
                     pChildPtr = (SwRedlineDataChildPtr)pChildPtr->pNext;
-                    nChilds++;
+                    nChildren++;
                 }
 
-                aRedlineChilds.DeleteAndDestroy(nChildPos, nChilds);
-                bChildsRemoved = sal_True;
+                aRedlineChildren.DeleteAndDestroy(nChildPos, nChildren);
+                bChildrenRemoved = sal_True;
             }
         }
         SvLBoxEntry *pEntry = aRedlineParents[i]->pTLBParent;
@@ -788,7 +788,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
 
         pRedlineParent->pTLBParent = pParent;
 
-        InsertChilds(pRedlineParent, rRedln, nAutoFmt);
+        InsertChildren(pRedlineParent, rRedln, nAutoFmt);
     }
 }
 
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index d8be10dc71ba..82c7bad2fa56 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -952,7 +952,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
             void* key = lcl_GetOutlineKey(this, pOutlineContent);
             if( !mOutLineNodeMap[key] )
             {
-                while( pEntry->HasChilds() )
+                while( pEntry->HasChildren() )
                 {
                     SvLBoxEntry* pChildEntry = FirstChild( pEntry );
                     while( pChildEntry )
@@ -1162,12 +1162,12 @@ long    SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
 /***************************************************************************
     Beschreibung:   Inhalte werden erst auf Anforderung in die Box eingefuegt
 ***************************************************************************/
-void  SwContentTree::RequestingChilds( SvLBoxEntry* pParent )
+void  SwContentTree::RequestingChildren( SvLBoxEntry* pParent )
 {
     // ist es ein Inhaltstyp?
     if(lcl_IsContentType(pParent))
     {
-        if(!pParent->HasChilds())
+        if(!pParent->HasChildren())
         {
             OSL_ENSURE(pParent->GetUserData(), "no UserData?");
             SwContentType* pCntType = (SwContentType*)pParent->GetUserData();
@@ -1261,9 +1261,9 @@ sal_Bool  SwContentTree::Expand( SvLBoxEntry* pParent )
                 SwWrtShell* pShell = GetWrtShell();
                 sal_Bool bBool = SvTreeListBox::Expand(pParent);
                 SvLBoxEntry* pChild = Next(pParent);
-                while(pChild && lcl_IsContent(pChild) && pParent->HasChilds())
+                while(pChild && lcl_IsContent(pChild) && pParent->HasChildren())
                 {
-                    if(pChild->HasChilds())
+                    if(pChild->HasChildren())
                     {
                         sal_Int32 nPos = ((SwContent*)pChild->GetUserData())->GetYPos();
                         void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
@@ -1341,8 +1341,8 @@ IMPL_LINK( SwContentTree, ContentDoubleClickHdl, SwContentTree *, EMPTYARG )
     OSL_ENSURE(pEntry, "no current entry!");
     if(pEntry)
     {
-        if(lcl_IsContentType(pEntry) && !pEntry->HasChilds())
-            RequestingChilds(pEntry);
+        if(lcl_IsContentType(pEntry) && !pEntry->HasChildren())
+            RequestingChildren(pEntry);
         else if(!lcl_IsContentType(pEntry) && (bIsActive || bIsConstant))
         {
             if(bIsConstant)
@@ -1500,7 +1500,7 @@ void SwContentTree::Display( sal_Bool bActive )
                 }
              }
              else
-                 RequestingChilds(pParent);
+                 RequestingChildren(pParent);
             Expand(pParent);
             if( nRootType == CONTENT_TYPE_OUTLINE && bIsActive )
             {
@@ -1890,7 +1890,7 @@ sal_Bool SwContentTree::HasContentChanged()
                     }
 
                 }
-                else if(pEntry->HasChilds())
+                else if(pEntry->HasChildren())
                 {
                     //war der Eintrag einmal aufgeklappt, dann muessen auch
                     // die unsichtbaren Eintraege geprueft werden.
@@ -1933,7 +1933,7 @@ sal_Bool SwContentTree::HasContentChanged()
                     }
                     if(!nChildCount)
                     {
-                        pEntry->EnableChildsOnDemand(sal_False);
+                        pEntry->EnableChildrenOnDemand(sal_False);
                         InvalidateEntry(pEntry);
                     }
 
@@ -2290,7 +2290,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
 
 /***************************************************************************
     Beschreibung :  Nach dem Drag wird der aktuelle Absatz m i t
-                    Childs verschoben
+                    Children verschoben
 ***************************************************************************/
 sal_Bool  SwContentTree::NotifyMoving( SvLBoxEntry*  pTarget,
         SvLBoxEntry*  pEntry, SvLBoxEntry*& , sal_uLong& )
@@ -2329,7 +2329,7 @@ sal_Bool  SwContentTree::NotifyMoving( SvLBoxEntry*  pTarget,
 
 /***************************************************************************
     Beschreibung :  Nach dem Drag wird der aktuelle Absatz o h n e
-                    Childs verschoben
+                    Children verschoben
 ***************************************************************************/
 sal_Bool  SwContentTree::NotifyCopying( SvLBoxEntry*  pTarget,
         SvLBoxEntry*  pEntry, SvLBoxEntry*& , sal_uLong& )
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 96f82a83109a..84ee92425d99 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -100,11 +100,11 @@ void SwNavigationPI::CleanEntry( String& rEntry )
 }
 /*------------------------------------------------------------------------
  Beschreibung:  Ausfuehrung der Drag-Operation
-                mit und ohne Childs
+                mit und ohne Children
 ------------------------------------------------------------------------*/
 
 void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
-                                                    sal_Bool bWithChilds)
+                                                    sal_Bool bWithChildren)
 {
     SwView *pView = GetCreateView();
     SwWrtShell &rSh = pView->GetWrtShell();
@@ -115,18 +115,18 @@ void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
 
         short nMove = nTarget-nSource; //( nDir<0 ) ? 1 : 0 ;
         rSh.GotoOutline(nSource);
-        if (bWithChilds)
+        if (bWithChildren)
             rSh.MakeOutlineSel(nSource, nSource, sal_True);
         // Die selektierten Children zaehlen bei der Bewegung vorwaerts nicht mit
         sal_uInt16 nLastOutlinePos = rSh.GetOutlinePos(MAXLEVEL);
-        if(bWithChilds && nMove > 1 &&
+        if(bWithChildren && nMove > 1 &&
                 nLastOutlinePos < nTarget)
         {
             if(!rSh.IsCrsrPtAtEnd())
                 rSh.SwapPam();
             nMove -= nLastOutlinePos - nSource;
         }
-        if(!bWithChilds || nMove < 1 || nLastOutlinePos < nTarget )
+        if(!bWithChildren || nMove < 1 || nLastOutlinePos < nTarget )
             rSh.MoveOutlinePara( nMove );
         rSh.ClearMark();
         rSh.GotoOutline( nSource + nMove);
@@ -247,7 +247,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
 
     //Standard: Unterebenen werden mitgenommen
     // mit Ctrl Unterebenen nicht mitnehmen
-    sal_Bool bOutlineWithChilds  = ( KEY_MOD1 != pBox->GetModifier());
+    sal_Bool bOutlineWithChildren  = ( KEY_MOD1 != pBox->GetModifier());
     int nFuncId = 0;
     sal_Bool bFocusToDoc = sal_False;
     switch (nCurrItemId)
@@ -347,7 +347,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
             if(IsGlobalMode())
                 aGlobalTree.ExecCommand(nCurrItemId);
             else
-                aContentTree.ExecCommand(nCurrItemId, bOutlineWithChilds);
+                aContentTree.ExecCommand(nCurrItemId, bOutlineWithChildren);
         }
         break;
         case FN_GLOBAL_SWITCH: