summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
parentad2eb6c4ba3ca36e2302c721a106dac80d266325 (diff)
childs -> children
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/docvor.hxx4
-rw-r--r--sfx2/inc/sfx2/objsh.hxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx6
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/appl/workwin.cxx146
-rw-r--r--sfx2/source/dialog/splitwin.cxx24
-rw-r--r--sfx2/source/dialog/templdlg.cxx24
-rw-r--r--sfx2/source/doc/docvor.cxx34
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx2
-rw-r--r--sfx2/source/inc/workwin.hxx16
-rw-r--r--sfx2/source/view/frame.cxx4
-rw-r--r--sfx2/source/view/frame2.cxx2
-rw-r--r--sfx2/source/view/viewfrm2.cxx4
14 files changed, 136 insertions, 136 deletions
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index c800d445f6af..f518c296149f 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -73,7 +73,7 @@ protected:
virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource,
SvLBoxEntry* pTarget,
SvLBoxEntry *&pNewParent, sal_uIntPtr &);
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long ExpandingHdl();
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
@@ -125,7 +125,7 @@ private:
sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
- SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False,
+ SvLBoxEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False,
sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
};
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index eecb8bea58e3..228bc97615d5 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -507,7 +507,7 @@ public:
virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
- virtual sal_Bool CanHaveChilds(
+ virtual sal_Bool CanHaveChildren(
sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE
);
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 50c7d59b900e..e435e123b848 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -358,11 +358,11 @@ void ContentListBox_Impl::ClearChildren( SvLBoxEntry* pParent )
// -----------------------------------------------------------------------
-void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
+void ContentListBox_Impl::RequestingChildren( SvLBoxEntry* pParent )
{
try
{
- if ( !pParent->HasChilds() )
+ if ( !pParent->HasChildren() )
{
if ( pParent->GetUserData() )
{
@@ -401,7 +401,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
}
catch( Exception& )
{
- OSL_FAIL( "ContentListBox_Impl::RequestingChilds(): unexpected exception" );
+ OSL_FAIL( "ContentListBox_Impl::RequestingChildren(): unexpected exception" );
}
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 3f05a1444b01..492cb1346965 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -94,7 +94,7 @@ public:
~ContentListBox_Impl();
- virtual void RequestingChilds( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvLBoxEntry* pParent );
virtual long Notify( NotifyEvent& rNEvt );
inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 08af2d259696..3eb2ebec7b89 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -301,14 +301,14 @@ throw (css::uno::RuntimeException)
if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_True );
- m_pWrkWin->ShowChilds_Impl();
- m_pWrkWin->ArrangeChilds_Impl( sal_True );
+ m_pWrkWin->ShowChildren_Impl();
+ m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
{
m_pWrkWin->MakeVisible_Impl( sal_False );
- m_pWrkWin->HideChilds_Impl();
- m_pWrkWin->ArrangeChilds_Impl( sal_True );
+ m_pWrkWin->HideChildren_Impl();
+ m_pWrkWin->ArrangeChildren_Impl( sal_True );
}
else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
{
@@ -515,14 +515,14 @@ sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
void SfxWorkWindow::Sort_Impl()
{
aSortedList.clear();
- for (sal_uInt16 i=0; i<pChilds->Count(); i++)
+ for (sal_uInt16 i=0; i<pChildren->Count(); i++)
{
- SfxChild_Impl *pCli = (*pChilds)[i];
+ SfxChild_Impl *pCli = (*pChildren)[i];
if (pCli)
{
sal_uInt16 k;
for (k=0; k<aSortedList.size(); k++)
- if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
+ if (ChildAlignValue((*pChildren)[aSortedList[k]]->eAlign) >
ChildAlignValue(pCli->eAlign))
break;
aSortedList.insert( aSortedList.begin() + k, i );
@@ -580,12 +580,12 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
pWorkWin (pWin),
pConfigShell( 0 ),
pActiveChild( 0 ),
- nChilds( 0 ),
+ nChildren( 0 ),
nOrigMode( 0 ),
bSorted( sal_True ),
bDockingAllowed(sal_True),
bInternalDockingAllowed(sal_True),
- bAllChildsVisible(sal_True),
+ bAllChildrenVisible(sal_True),
bIsFullScreen( sal_False ),
bShowStatusBar( sal_True ),
m_nLock( 0 ),
@@ -600,13 +600,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
pBindings->SetWorkWindow_Impl( this );
pChildWins = new SfxChildWindows_Impl;
- pChilds = new SfxChildList_Impl;
+ pChildren = new SfxChildList_Impl;
// For the ObjectBars a integral place in the Childlist is reserved,
// so that they always come in a defined order.
SfxChild_Impl* pChild=0;
for (sal_uInt16 n=0; n < SFX_OBJECTBAR_MAX; ++n)
- pChilds->Insert(0,pChild);
+ pChildren->Insert(0,pChild);
// create and initialize layout manager listener
Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface();
@@ -634,8 +634,8 @@ SfxWorkWindow::~SfxWorkWindow()
}
// Delete help structure for Child-Windows
- DBG_ASSERT( pChilds->Count() == 0, "dangling childs" );
- delete pChilds;
+ DBG_ASSERT( pChildren->Count() == 0, "dangling children" );
+ delete pChildren;
delete pChildWins;
if ( m_xLayoutManagerListener.is() )
@@ -655,7 +655,7 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
}
if ( !m_nLock )
- ArrangeChilds_Impl();
+ ArrangeChildren_Impl();
}
//--------------------------------------------------------------------
@@ -704,7 +704,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ATTENTION: The array itself is cleared after this loop!!
// Therefore we have to set every array entry to zero as it could be
// accessed by calling pChild->Destroy().
- // Window::NotifyAllChilds() calls SfxWorkWindow::DataChanged_Impl for
+ // Window::NotifyAllChildren() calls SfxWorkWindow::DataChanged_Impl for
// 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!!
}
@@ -730,7 +730,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
// Delete StatusBar
ResetStatusBar_Impl();
- // Delete ObjectBars (this is done last, so that pChilds does not
+ // Delete ObjectBars (this is done last, so that pChildren does not
// receive dead Pointers)
for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
{
@@ -743,21 +743,21 @@ void SfxWorkWindow::DeleteControllers_Impl()
// ObjectBars are all released at once, since they occupy a
// fixed contiguous area in the array pChild
- pChilds->Remove(0, SFX_OBJECTBAR_MAX);
+ pChildren->Remove(0, SFX_OBJECTBAR_MAX);
bSorted = sal_False;
- nChilds = 0;
+ nChildren = 0;
}
//====================================================================
// Virtual method for placing the child window.
-void SfxWorkWindow::ArrangeChilds_Impl( sal_Bool /*bForce*/)
+void SfxWorkWindow::ArrangeChildren_Impl( sal_Bool /*bForce*/)
{
Arrange_Impl();
}
-void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
+void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce )
{
if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
return;
@@ -775,7 +775,7 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
return;
SvBorder aBorder;
- if ( nChilds )
+ if ( nChildren )
{
if ( IsVisible_Impl() )
aBorder = Arrange_Impl();
@@ -783,12 +783,12 @@ void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
// If the current application document contains a IPClient, then the
// object through SetTopToolFramePixel has to be assigned the available
// space. The object will then point to its UITools and sets the app border
- // (-> SfxInPlaceEnv_Impl:: ArrangeChilds_Impl ()). Otherwise the
+ // (-> SfxInPlaceEnv_Impl:: ArrangeChildren_Impl ()). Otherwise the
// app border is set here directly to possibly overwrite the Border that
// was set by an object from another document. The object does not set
// the SetAppBorder when it removes its UI tools so that no-dithering
// ObjectBar arises.
- // (->SfxInPlaceEnv_Impl::ArrangeChilds_Impl())
+ // (->SfxInPlaceEnv_Impl::ArrangeChildren_Impl())
pMasterFrame->SetToolSpaceBorderPixel_Impl( aBorder );
@@ -813,7 +813,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
aUpperClientArea = aClientArea;
SvBorder aBorder;
- if ( !nChilds )
+ if ( !nChildren )
return aBorder;
if (!bSorted)
@@ -825,7 +825,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( !pCli->pWin )
continue;
@@ -967,7 +967,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
- DBG_ASSERT( pChilds->Count() < 255, "too many children" );
+ DBG_ASSERT( pChildren->Count() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
DBG_ASSERT( !FindChild_Impl(rWindow), "child registered more than once" );
@@ -979,10 +979,10 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
eAlign, rWindow.IsVisible());
pChild->bCanGetFocus = bCanGetFocus;
- pChilds->Insert(pChilds->Count(), pChild);
+ pChildren->Insert(pChildren->Count(), pChild);
bSorted = sal_False;
- nChilds++;
- return (*pChilds)[pChilds->Count()-1];
+ nChildren++;
+ return (*pChildren)[pChildren->Count()-1];
}
//--------------------------------------------------------------------
@@ -993,19 +993,19 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
SfxChild_Impl *pChild = 0;
sal_uInt16 nPos;
- for ( nPos = 0; nPos < pChilds->Count(); ++nPos )
+ for ( nPos = 0; nPos < pChildren->Count(); ++nPos )
{
- pChild = (*pChilds)[nPos];
+ pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
break;
}
- if ( nPos < pChilds->Count() )
+ if ( nPos < pChildren->Count() )
{
bSorted = sal_False;
- nChilds--;
- pChilds->Remove(nPos);
+ nChildren--;
+ pChildren->Remove(nPos);
delete pChild;
}
else {
@@ -1020,10 +1020,10 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
DBG_CHKTHIS(SfxWorkWindow, 0);
SfxChild_Impl *pChild = 0;
- sal_uInt16 nCount = pChilds->Count();
+ sal_uInt16 nCount = pChildren->Count();
for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
{
- pChild = (*pChilds)[nPos];
+ pChild = (*pChildren)[nPos];
if ( pChild )
if ( pChild->pWin == &rWindow )
return pChild;
@@ -1034,17 +1034,17 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
//--------------------------------------------------------------------
-void SfxWorkWindow::ShowChilds_Impl()
+void SfxWorkWindow::ShowChildren_Impl()
{
DBG_CHKTHIS(SfxWorkWindow, 0);
bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
SfxChild_Impl *pCli = 0;
- for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
+ for ( sal_uInt16 nPos = 0; nPos < pChildren->Count(); ++nPos )
{
SfxChildWin_Impl* pCW = 0;
- pCli = (*pChilds)[nPos];
+ pCli = (*pChildren)[nPos];
if ( pCli && pCli->pWin )
{
@@ -1107,12 +1107,12 @@ void SfxWorkWindow::ShowChilds_Impl()
//--------------------------------------------------------------------
-void SfxWorkWindow::HideChilds_Impl()
+void SfxWorkWindow::HideChildren_Impl()
{
SfxChild_Impl *pChild = 0;
- for ( sal_uInt16 nPos = pChilds->Count(); nPos > 0; --nPos )
+ for ( sal_uInt16 nPos = pChildren->Count(); nPos > 0; --nPos )
{
- pChild = (*pChilds)[nPos-1];
+ pChild = (*pChildren)[nPos-1];
if (pChild && pChild->pWin)
{
switch ( pChild->pWin->GetType() )
@@ -1240,23 +1240,23 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
pWork = pParent;
while ( pWork )
{
- pWork->ArrangeChilds_Impl();
+ pWork->ArrangeChildren_Impl();
pWork = pWork->GetParent_Impl();
}
- ArrangeChilds_Impl( sal_False );
+ ArrangeChildren_Impl( sal_False );
pWork = pParent;
while ( pWork )
{
- pWork->ShowChilds_Impl();
+ pWork->ShowChildren_Impl();
pWork = pWork->GetParent_Impl();
}
- ShowChilds_Impl();
+ ShowChildren_Impl();
}
- ShowChilds_Impl();
+ ShowChildren_Impl();
}
Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator()
@@ -1469,7 +1469,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( bCreate )
CreateChildWin_Impl( pCW, sal_False );
- if ( !bAllChildsVisible )
+ if ( !bAllChildrenVisible )
{
if ( pCW->pCli )
pCW->pCli->nVisible &= ~CHILD_ACTIVE;
@@ -1478,7 +1478,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
else if ( pChildWin )
{
// Window already exists, it should also be visible?
- if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildsVisible )
+ if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT ) && bAllChildrenVisible )
{
// Update Mode is compatible; definitely enable it
bCreate = AllowChildWindowCreation_Impl( *pCW );
@@ -1487,7 +1487,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( pCW->pCli )
{
// The window is a direct Child
- if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
+ if ( bAllChildrenVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
}
else
@@ -1548,10 +1548,10 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFoc
if (nPos != CHILDWIN_NOPOS)
{
DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
- if ((*pChilds)[TbxMatch(nPos)])// &&
+ if ((*pChildren)[TbxMatch(nPos)])// &&
{
// ChildWindow replaces ObjectBar
- (*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
+ (*pChildren)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
}
}
@@ -1786,7 +1786,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
sal_uInt16 n;
for ( n=0; n<aSortedList.size(); ++n )
{
- pChild = (*pChilds)[aSortedList[n]];
+ pChild = (*pChildren)[aSortedList[n]];
if ( pChild )
if ( pChild->pWin == pWin )
break;
@@ -1813,7 +1813,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
for ( sal_uInt16 m=0; m<aSortedList.size(); ++m )
{
sal_uInt16 i=aSortedList[m];
- SfxChild_Impl* pCli = (*pChilds)[i];
+ SfxChild_Impl* pCli = (*pChildren)[i];
if ( pCli && pCli->nVisible == CHILD_VISIBLE && pCli->pWin )
{
@@ -1924,7 +1924,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
return;
SfxChildAlignment eAlign = SFX_ALIGN_NOALIGNMENT;
- SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChilds)[nPos] : 0;
+ SfxChild_Impl *pCli = ( nPos != USHRT_MAX ) ? (*pChildren)[nPos] : 0;
if ( pCli && pDockWin )
{
eAlign = pDockWin->GetAlignment();
@@ -1944,8 +1944,8 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
pCli->eAlign = eAlign;
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
}
if ( pCW && pCW->pWin )
@@ -2096,8 +2096,8 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
}
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
if ( pCW->bCreate && bCreationAllowed )
{
@@ -2335,8 +2335,8 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_
}
- ArrangeChilds_Impl();
- ShowChilds_Impl();
+ ArrangeChildren_Impl();
+ ShowChildren_Impl();
}
else if ( bVisible )
{
@@ -2530,19 +2530,19 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
}
}
-void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
+void SfxWorkWindow::MakeChildrenVisible_Impl( sal_Bool bVis )
{
if ( pParent )
- pParent->MakeChildsVisible_Impl( bVis );
+ pParent->MakeChildrenVisible_Impl( bVis );
- bAllChildsVisible = bVis;
+ bAllChildrenVisible = bVis;
if ( bVis )
{
if ( !bSorted )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
if ( (pCli->eAlign == SFX_ALIGN_NOALIGNMENT) || (IsDockingAllowed() && bInternalDockingAllowed) )
pCli->nVisible |= CHILD_ACTIVE;
}
@@ -2553,7 +2553,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
Sort_Impl();
for ( sal_uInt16 n=0; n<aSortedList.size(); ++n )
{
- SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
pCli->nVisible &= ~CHILD_ACTIVE;
}
}
@@ -2760,14 +2760,14 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
{
// Sort all children under list
std::vector<sal_uInt16> aList;
- for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
+ for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChildren->Count(); i++)
{
- SfxChild_Impl *pCli = (*pChilds)[i];
+ SfxChild_Impl *pCli = (*pChildren)[i];
if ( pCli && pCli->bCanGetFocus && pCli->pWin )
{
sal_uInt16 k;
for (k=0; k<aList.size(); k++)
- if ( ChildTravelValue((*pChilds)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
+ if ( ChildTravelValue((*pChildren)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
break;
aList.insert( aList.begin() + k, i );
}
@@ -2779,7 +2779,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
sal_uInt16 nTopValue = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
for ( sal_uInt16 i=0; i<aList.size(); i++ )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[i]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[i]];
if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
break;
}
@@ -2791,7 +2791,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
// Look for the active window
for ( n=0; n<aList.size(); n++ )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli && pCli->pWin && ( pCli->pWin == pActiveChild || !pActiveChild ) )
{
pAct = pCli;
@@ -2831,7 +2831,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
for( ;; )
{
- SfxChild_Impl* pCli = (*pChilds)[aList[n]];
+ SfxChild_Impl* pCli = (*pChildren)[aList[n]];
if ( pCli->pWin )
{
SfxChild_Impl* pNext = pCli;
@@ -2881,7 +2881,7 @@ void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
pCW->pWin->GetWindow()->UpdateSettings( Application::GetSettings() );
}
- ArrangeChilds_Impl();
+ ArrangeChildren_Impl();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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;
}
}
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index b67d273f0a2c..ef882381bdf1 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -706,9 +706,9 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// the general reference point
while(GetModel()->GetDepth(pParentIter) != nTLevel)
pParentIter = GetParent(pParentIter);
- if(pParentIter->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pParentIter))
- RequestingChilds(pParentIter);
+ if(pParentIter->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pParentIter))
+ RequestingChildren(pParentIter);
SvLBoxEntry *pChildIter = 0;
sal_uInt16 i = 0;
@@ -721,16 +721,16 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
// If possible, fill in Items onDemand
++i;
if(i < 2 && p[i+1] != INDEX_IGNORE &&
- pChildIter->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pChildIter))
- RequestingChilds(pChildIter);
+ pChildIter->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pChildIter))
+ RequestingChildren(pChildIter);
pParentIter = pChildIter;
}
rIdx = p[i];
pNewParent = pParentIter;
if(!IsExpanded(pNewParent) &&
- pNewParent->HasChildsOnDemand() &&
- !GetModel()->HasChilds(pNewParent))
+ pNewParent->HasChildrenOnDemand() &&
+ !GetModel()->HasChildren(pNewParent))
{
bOk = sal_False;
if(!bCopy)
@@ -1132,20 +1132,20 @@ SfxObjectShellRef SfxOrganizeListBox_Impl::GetObjectShell(const Path &rPath)
//-------------------------------------------------------------------------
-void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
+void SfxOrganizeListBox_Impl::RequestingChildren( SvLBoxEntry* pEntry )
/* [Description]
- Sent to the Childs of an entry that is going to be inserted.
+ Sent to the children of an entry that is going to be inserted.
(SV-Handler)
[Parameter]
- SvLBoxEntry* pEntry the entry whose Childs is requested
+ SvLBoxEntry* pEntry the entry whose children is requested
*/
{
- if ( !GetModel()->HasChilds( pEntry ) )
+ if ( !GetModel()->HasChildren( pEntry ) )
{
WaitObject aWaitCursor( this );
@@ -1175,8 +1175,8 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
const sal_uInt16 nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
String aText;
Bitmap aClosedBmp, aOpenedBmp;
- const bool bCanHaveChilds =
- aRef->CanHaveChilds(aPath[nDocLevel+1],
+ const bool bCanHaveChildren =
+ aRef->CanHaveChildren(aPath[nDocLevel+1],
aPath[nDocLevel+2]);
for(sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -1191,7 +1191,7 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
SvLBoxEntry *pNew = SvTreeListBox::InsertEntry(
aText, aOpenedImage, aClosedImage,
- pEntry, bCanHaveChilds);
+ pEntry, bCanHaveChildren);
pNew->SetUserData(bDeletable ? &bDeletable : 0);
}
}
@@ -1285,7 +1285,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
const XubString& rText,
BMPTYPE eBmpType,
SvLBoxEntry* pParent,
- sal_Bool bChildsOnDemand,
+ sal_Bool bChildrenOnDemand,
sal_uIntPtr nPos,
void* pUserData
)
@@ -1310,7 +1310,7 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
OSL_FAIL( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" );
}
- pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildsOnDemand, nPos, pUserData );
+ pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildrenOnDemand, nPos, pUserData );
return pEntry;
}
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 9e3a1378de3e..570a13a1e435 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -351,7 +351,7 @@ void SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
}
}
-sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
+sal_Bool SfxObjectShell::CanHaveChildren(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
switch(nIdx1)
{
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a84206d26d52..cb655855c613 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1075,7 +1075,7 @@ sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
return sal_False;
- // Its Childs are locked?
+ // Its children are locked?
for ( sal_uInt16 n = GetChildFrameCount(); n--; )
if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
return sal_False;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 347147d2a835..f4dd3c5d45f2 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -239,19 +239,19 @@ protected:
Rectangle aUpperClientArea;
SfxWorkWindow* pParent;
SfxSplitWindow* pSplit[SFX_SPLITWINDOWS_MAX];
- SfxChildList_Impl* pChilds;
+ SfxChildList_Impl* pChildren;
SfxChildWindows_Impl* pChildWins;
SfxBindings* pBindings;
Window* pWorkWin;
SfxShell* pConfigShell;
Window* pActiveChild;
sal_uInt16 nUpdateMode;
- sal_uInt16 nChilds;
+ sal_uInt16 nChildren;
sal_uInt16 nOrigMode;
sal_Bool bSorted : 1;
sal_Bool bDockingAllowed : 1;
sal_Bool bInternalDockingAllowed : 1;
- sal_Bool bAllChildsVisible : 1;
+ sal_Bool bAllChildrenVisible : 1;
sal_Bool bIsFullScreen : 1;
sal_Bool bShowStatusBar : 1;
sal_Int32 m_nLock;
@@ -295,15 +295,15 @@ public:
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
void ReleaseChild_Impl( Window& rWindow );
SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
- void ShowChilds_Impl();
- void HideChilds_Impl();
+ void ShowChildren_Impl();
+ void HideChildren_Impl();
sal_Bool PrepareClose_Impl();
- virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
+ virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
void DeleteControllers_Impl();
void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
void ConfigChild_Impl(SfxChildIdentifier,
SfxDockingConfig, sal_uInt16);
- void MakeChildsVisible_Impl( sal_Bool bVis );
+ void MakeChildrenVisible_Impl( sal_Bool bVis );
void ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit );
void EndAutoShow_Impl( Point aPos );
@@ -355,7 +355,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
SfxFrame* pFrame;
public:
SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
- virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
+ virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True );
virtual void UpdateObjectBars_Impl();
virtual Rectangle GetTopRect_Impl();
};
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index f4bf5fdb8678..d2705599dd2c 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -917,8 +917,8 @@ void SfxFrame::Resize()
if ( pWork )
{
- pWork->ArrangeChilds_Impl();
- pWork->ShowChilds_Impl();
+ pWork->ArrangeChildren_Impl();
+ pWork->ShowChildren_Impl();
}
// problem in presence of UIActive object: when the window is resized, but the toolspace border
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 35b4435c2abe..e18398fb4352 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -219,7 +219,7 @@ void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange )
DoResize();
SfxViewFrame* pView = pFrame->GetCurrentViewFrame();
if ( pView )
- pView->GetBindings().GetWorkWindow_Impl()->ShowChilds_Impl();
+ pView->GetBindings().GetWorkWindow_Impl()->ShowChildren_Impl();
}
Window::StateChanged( nStateChange );
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 092d165784b1..23641cbbe2fa 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -274,7 +274,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
if ( bShow )
{
// First, make the floats viewable
- pWorkWin->MakeChildsVisible_Impl( bShow );
+ pWorkWin->MakeChildrenVisible_Impl( bShow );
GetDispatcher()->Update_Impl( sal_True );
// Then view it
@@ -291,7 +291,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
}
pWorkWin->HidePopups_Impl( !bShow, sal_True, nId );
- pWorkWin->MakeChildsVisible_Impl( bShow );
+ pWorkWin->MakeChildrenVisible_Impl( bShow );
}
Invalidate( rReq.GetSlot() );