summaryrefslogtreecommitdiff
path: root/sw/source/ui/utlui
diff options
context:
space:
mode:
authorMichael T. Whiteley <mike@whiteley.org>2011-12-07 02:33:51 -0800
committerTor Lillqvist <tlillqvist@suse.com>2011-12-08 11:32:41 +0200
commitdcfd4beb213c551f6ef6ba379651bf303bd9017a (patch)
treea819f50716357c2a5561f6b9a09809cfc52d7dbf /sw/source/ui/utlui
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'sw/source/ui/utlui')
-rw-r--r--sw/source/ui/utlui/content.cxx24
-rw-r--r--sw/source/ui/utlui/navipi.cxx14
2 files changed, 19 insertions, 19 deletions
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: