summaryrefslogtreecommitdiff
path: root/sd
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 /sd
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx24
-rw-r--r--sd/source/ui/func/unmovss.cxx2
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx10
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
7 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 02ec55cf9d3e..fb619f086b24 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -419,7 +419,7 @@ void AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refer
importTimeContainer( pAtom, xNode );
dump( "</par>\n" );
- // for iteration containers, map target from childs to iteration
+ // for iteration containers, map target from children to iteration
Reference< XIterateContainer > xIter( xNode, UNO_QUERY );
if( xIter.is() )
{
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index bb5bf26fc089..a2a26910c642 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -979,7 +979,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
DBG_ASSERT( pStateItem, "SfxStringItem erwartet");
String aPageName = pStateItem->GetValue();
- if( !pNavigatorWin->maTlbObjects.HasSelectedChilds( aPageName ) )
+ if( !pNavigatorWin->maTlbObjects.HasSelectedChildren( aPageName ) )
{
if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION )
{
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1300d1ee8100..4c16804ac19f 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -328,14 +328,14 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
/*************************************************************************
|*
-|* Gibt zurueck, ob Childs des uebergebenen Strings selektiert sind
+|* Gibt zurueck, ob Children des uebergebenen Strings selektiert sind
|*
\************************************************************************/
-sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
+sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
{
sal_Bool bFound = sal_False;
- sal_Bool bChilds = sal_False;
+ sal_Bool bChildren = sal_False;
if( rName.Len() )
{
@@ -351,11 +351,11 @@ sal_Bool SdPageObjsTLB::HasSelectedChilds( const String& rName )
sal_Bool bExpanded = IsExpanded( pEntry );
long nCount = GetChildSelectionCount( pEntry );
if( bExpanded && nCount > 0 )
- bChilds = sal_True;
+ bChildren = sal_True;
}
}
}
- return( bChilds );
+ return( bChildren );
}
@@ -423,7 +423,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
/*************************************************************************
|*
-|* Es wird nur der erste Eintrag eingefuegt. Childs werden OnDemand erzeugt
+|* Es wird nur der erste Eintrag eingefuegt. Children werden OnDemand erzeugt
|*
\************************************************************************/
@@ -541,7 +541,7 @@ void SdPageObjsTLB::AddShapeList (
}
}
- if( pEntry->HasChilds() )
+ if( pEntry->HasChildren() )
{
SetExpandedEntryBmp(
pEntry,
@@ -699,9 +699,9 @@ List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth )
|*
\************************************************************************/
-void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
+void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry )
{
- if( !pFileEntry->HasChilds() )
+ if( !pFileEntry->HasChildren() )
{
if( GetBookmarkDoc() )
{
@@ -754,7 +754,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
}
- if( pPageEntry->HasChilds() )
+ if( pPageEntry->HasChildren() )
{
SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
SetCollapsedEntryBmp( pPageEntry, aImgPageObjs );
@@ -765,7 +765,7 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
}
}
else
- SvTreeListBox::RequestingChilds( pFileEntry );
+ SvTreeListBox::RequestingChildren( pFileEntry );
}
/*************************************************************************
@@ -892,7 +892,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
{
// Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx
SvLBoxEntry* pCursor = GetCurEntry();
- if( pCursor->HasChilds() || pCursor->HasChildsOnDemand() )
+ if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
{
if( IsExpanded( pCursor ) )
Collapse( pCursor );
diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx
index 5cff556a6f8c..2b3d2b0d4484 100644
--- a/sd/source/ui/func/unmovss.cxx
+++ b/sd/source/ui/func/unmovss.cxx
@@ -68,7 +68,7 @@ void SdMoveStyleSheetsUndoAction::Undo()
pPool->Insert((*iter).get());
}
- // now assign the childs again
+ // now assign the children again
std::vector< SdStyleSheetVector >::iterator childlistiter( maListOfChildLists.begin() );
for(SdStyleSheetVector::iterator iter = maStyles.begin(); iter != maStyles.end(); ++iter, ++childlistiter )
{
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 2feaec4f360e..1c9d5b527403 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -150,7 +150,7 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
void DoDrag();
void OnDragFinished( sal_uInt8 nDropAction );
@@ -203,7 +203,7 @@ public:
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes (void) const;
sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
- sal_Bool HasSelectedChilds( const String& rName );
+ sal_Bool HasSelectedChildren( const String& rName );
sal_Bool SelectEntry( const String& rName );
String GetSelectEntry();
List* GetSelectEntryList( sal_uInt16 nDepth );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 32d8e716d45a..1da357bfad4c 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2579,7 +2579,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
typedef sal_uInt16 (*FncGetChildWindowId)();
-FncGetChildWindowId aShowChilds[] =
+FncGetChildWindowId aShowChildren[] =
{
&AnimationChildWindow::GetChildWindowId,
&Svx3DChildWindow::GetChildWindowId,
@@ -2608,9 +2608,9 @@ void SlideshowImpl::hideChildWindows()
if( pViewFrame->GetChildWindow( SID_NAVIGATOR ) != NULL )
mnChildMask |= NAVIGATOR_CHILD_MASK;
- for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
- const sal_uInt16 nId = ( *aShowChilds[ i ] )();
+ const sal_uInt16 nId = ( *aShowChildren[ i ] )();
if( pViewFrame->GetChildWindow( nId ) )
{
@@ -2633,10 +2633,10 @@ void SlideshowImpl::showChildWindows()
{
pViewFrame->SetChildWindow( SID_NAVIGATOR, ( mnChildMask & NAVIGATOR_CHILD_MASK ) != 0 );
- for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
if( mnChildMask & ( 1 << i ) )
- pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), sal_True );
+ pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), sal_True );
}
}
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 8781d602d5f0..f7425f7a06c5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -886,7 +886,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ))
bUnique = sal_False;
- if (pOutl->HasChilds(pPara))
+ if (pOutl->HasChildren(pPara))
{
if (!pOutl->IsExpanded(pPara))
bDisableExpand = sal_False;
@@ -934,10 +934,10 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
Paragraph* pPara = pOutl->GetParagraph( nParaPos );
while (pPara && (bDisableCollapseAll || bDisableExpandAll))
{
- if (!pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
+ if (!pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableExpandAll = sal_False;
- if (pOutl->IsExpanded(pPara) && pOutl->HasChilds(pPara))
+ if (pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara))
bDisableCollapseAll = sal_False;
pPara = pOutl->GetParagraph( ++nParaPos );