diff options
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/marktree.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 40a8aaa3869c..b3e307f65d30 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -263,7 +263,7 @@ OFieldDescControl::~OFieldDescControl() pLastFocusWindow = NULL; ////////////////////////////////////////////////////////////////////// - // Childs zerstoeren + // Children zerstoeren DeactivateAggregate( tpDefault ); DeactivateAggregate( tpRequired ); DeactivateAggregate( tpTextLen ); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 6918dcea76b7..0a177bec75d0 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -120,14 +120,14 @@ DBTreeListBox::~DBTreeListBox() SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const { SvLBoxTreeList* myModel = GetModel(); - SvTreeEntryList* pChilds = myModel->GetChildList(pStart); + SvTreeEntryList* pChildren = myModel->GetChildList(pStart); SvLBoxEntry* pEntry = NULL; - if ( pChilds ) + if ( pChildren ) { - size_t nCount = pChilds->size(); + size_t nCount = pChildren->size(); for (size_t i = 0; i < nCount; ++i) { - pEntry = static_cast<SvLBoxEntry*>((*pChilds)[ i ]); + pEntry = static_cast<SvLBoxEntry*>((*pChildren)[ i ]); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); if ( pItem->GetText().Equals(aName) ) { @@ -149,7 +149,7 @@ void DBTreeListBox::EnableExpandHandler(SvLBoxEntry* _pEntry) } // ------------------------------------------------------------------------- -void DBTreeListBox::RequestingChilds( SvLBoxEntry* pParent ) +void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) { if (m_aPreExpandHandler.IsSet()) { @@ -216,7 +216,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry) { // set the flag which allows if the entry can be expanded - pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDS_ON_DEMAND ); + pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDREN_ON_DEMAND ); // redraw the entry GetModel()->InvalidateEntry( pEntry ); return 0L; diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 58c43ac2ec29..4858b9a6b167 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -117,7 +117,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) { SvButtonState eState = GetCheckButtonState(_pEntry); - if (!GetModel()->HasChilds(_pEntry)) + if (!GetModel()->HasChildren(_pEntry)) // nothing to do in this bottom-up routine if there are no children ... return eState; #ifdef DBG_UTIL @@ -202,7 +202,7 @@ void OMarkableTreeListBox::CheckButtonHdl() void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); - if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken + if (GetModel()->HasChildren(_pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); @@ -217,7 +217,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) while(pEntry) { SetCheckButtonState(pEntry,eState); - if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken + if(GetModel()->HasChildren(pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index ea09ed0bce50..84ce4b0f4d0d 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -398,7 +398,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, // special emphasizing handling for the "all objects" entry sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry); - if ( GetModel()->HasChilds(_pEntry) // the entry has children + if ( GetModel()->HasChildren(_pEntry) // the entry has children || bAllObjectsEntryAffected // or it is the "all objects" entry ) { @@ -416,7 +416,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, SvLBoxEntry* pChildLoop = FirstChild(_pEntry); while (pChildLoop) { - if (GetModel()->HasChilds(pChildLoop)) + if (GetModel()->HasChildren(pChildLoop)) implEmphasize(pChildLoop, sal_False, sal_True, sal_False); pChildLoop = NextSibling(pChildLoop); } |