From dcfd4beb213c551f6ef6ba379651bf303bd9017a Mon Sep 17 00:00:00 2001 From: "Michael T. Whiteley" Date: Wed, 7 Dec 2011 02:33:51 -0800 Subject: childs -> children --- editeng/inc/editeng/outliner.hxx | 8 +++---- .../accessibility/AccessibleEditableTextPara.cxx | 2 +- .../source/accessibility/AccessibleImageBullet.cxx | 2 +- editeng/source/outliner/outlin2.cxx | 2 +- editeng/source/outliner/outliner.cxx | 14 ++++++------ editeng/source/outliner/outlvw.cxx | 26 +++++++++++----------- editeng/source/outliner/paralist.cxx | 6 ++--- editeng/source/outliner/paralist.hxx | 6 ++--- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'editeng') diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index d2759a4e620b..dbcc9581c98d 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 5e878841a725..e1fd56260754 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 84dd1178b8a2..d6ae16f342d6 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 692a29389174..ab073f623775 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 781cb700eb96..77e6e85c1317 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 cfc9ebe4bc90..e1edd397bb35 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 7c4e38abec8e..c1d928ebaca0 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 f4b0ae4cf0dc..c038e601c11b 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 ); -- cgit