diff options
author | Michael T. Whiteley <mike@whiteley.org> | 2011-12-07 02:33:51 -0800 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-08 11:32:41 +0200 |
commit | dcfd4beb213c551f6ef6ba379651bf303bd9017a (patch) | |
tree | a819f50716357c2a5561f6b9a09809cfc52d7dbf /sfx2/source/dialog | |
parent | ad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff) |
childs -> children
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 24 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 6b9c903d4090..91e6b22323bf 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -378,8 +378,8 @@ void SfxSplitWindow::SplitResize() { if ( bPinned ) { - pWorkWin->ArrangeChilds_Impl(); - pWorkWin->ShowChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); + pWorkWin->ShowChildren_Impl(); } else pWorkWin->ArrangeAutoHideWindows( this ); @@ -723,7 +723,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, pEmptyWin->Actualize(); OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE; - pWorkWin->ArrangeChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); if ( bFadeIn ) FadeIn(); } @@ -743,12 +743,12 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } #endif pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE; - pWorkWin->ArrangeChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); if ( bFadeIn ) FadeIn(); } - pWorkWin->ShowChilds_Impl(); + pWorkWin->ShowChildren_Impl(); } if ( bUpdateMode ) @@ -1137,8 +1137,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) pEmptyWin->Hide(); OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" ); pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE; - pWorkWin->ArrangeChilds_Impl(); - pWorkWin->ShowChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); + pWorkWin->ShowChildren_Impl(); } } else @@ -1154,8 +1154,8 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) pEmptyWin->Actualize(); OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" ); pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE; - pWorkWin->ArrangeChilds_Impl(); - pWorkWin->ShowChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); + pWorkWin->ShowChildren_Impl(); pWorkWin->ArrangeAutoHideWindows( this ); } else @@ -1174,17 +1174,17 @@ void SfxSplitWindow::AutoHide() { // It "floats", thus dock it again SetPinned_Impl( sal_True ); - pWorkWin->ArrangeChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); } else { // In "limbo" SetPinned_Impl( sal_False ); - pWorkWin->ArrangeChilds_Impl(); + pWorkWin->ArrangeChildren_Impl(); pWorkWin->ArrangeAutoHideWindows( this ); } - pWorkWin->ShowChilds_Impl(); + pWorkWin->ShowChildren_Impl(); SaveConfig_Impl(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 0a2833bcd8d7..675b1530799b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -638,12 +638,12 @@ struct StyleTree_Impl { String aName; String aParent; - StyleTreeArr_Impl *pChilds; + StyleTreeArr_Impl *pChildren; sal_Bool bIsExpanded; sal_Bool HasParent() const { return aParent.Len() != 0; } StyleTree_Impl(const String &rName, const String &rParent): - aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {} + aName(rName), aParent(rParent), pChildren(0), bIsExpanded(0) {} ~StyleTree_Impl(); void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX); sal_uIntPtr Count(); @@ -656,26 +656,26 @@ SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr) sal_uIntPtr StyleTree_Impl::Count() { - return pChilds ? pChilds->Count() : 0L; + return pChildren ? pChildren->Count() : 0L; } //------------------------------------------------------------------------- StyleTree_Impl::~StyleTree_Impl() { - delete pChilds; + delete pChildren; } //------------------------------------------------------------------------- void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos) { - if ( !pChilds ) - pChilds = new StyleTreeArr_Impl; + if ( !pChildren ) + pChildren = new StyleTreeArr_Impl; if ( ULONG_MAX == lPos ) - lPos = pChilds->Count(); - pChilds->Insert( pIns, (sal_uInt16)lPos ); + lPos = pChildren->Count(); + pChildren->Insert( pIns, (sal_uInt16)lPos ); } //------------------------------------------------------------------------- @@ -703,7 +703,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) // Paste initial filter sal_uInt16 nPos; for( nPos = 0 ; nPos < pCmp->Count() && - aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++) + aSorter.compare((*pCmp->pChildren)[nPos]->aName, pEntry->aName) < 0 ; nPos++) {}; pCmp->Put(pEntry,nPos); break; @@ -743,9 +743,9 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox, SvLBoxEntry* pParent = 0) { SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent); - const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0; + const sal_uInt16 nCount = pEntry->pChildren? pEntry->pChildren->Count(): 0; for(sal_uInt16 i = 0; i < nCount; ++i) - FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry); + FillBox_Impl(pBox, (*pEntry->pChildren)[i], rEntries, pNewEntry); return pNewEntry; } @@ -2069,7 +2069,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) if ( pTreeBox ) { - pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() ); + pTreeBox->RemoveParentKeepChildren( pTreeBox->FirstSelected() ); bDontUpdate = sal_False; } } |