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 /dbaccess/source/ui | |
parent | Less succes, more success (diff) | |
download | core-dcfd4beb213c551f6ef6ba379651bf303bd9017a.tar.gz core-dcfd4beb213c551f6ef6ba379651bf303bd9017a.zip |
childs -> children
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r-- | dbaccess/source/ui/browser/formadapter.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 6 | ||||
-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 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/adtabdlg.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/tablespage.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableDesignView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableDesignView.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2 |
12 files changed, 25 insertions, 25 deletions
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 73ba7f268493..874a4e7a3243 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1149,7 +1149,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException ) m_aDisposeListeners.disposeAndClear(aEvt); m_aContainerListeners.disposeAndClear(aEvt); - // dispose all childs + // dispose all children for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 9ca13920b9af..5a8b8a187e01 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2142,7 +2142,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb m_pTreeView->getListBox().InsertEntry( _rQueryName, _rQueryImage, _rQueryImage, pDatasourceEntry, - sal_True /*ChildsOnDemand*/, LIST_APPEND, pQueriesData ); + sal_True /*ChildrenOnDemand*/, LIST_APPEND, pQueriesData ); } // the child for the tables container @@ -2152,7 +2152,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb m_pTreeView->getListBox().InsertEntry( _rTableName, _rTableImage, _rTableImage, pDatasourceEntry, - sal_True /*ChildsOnDemand*/, LIST_APPEND, pTablesData ); + sal_True /*ChildrenOnDemand*/, LIST_APPEND, pTablesData ); } } @@ -2228,7 +2228,7 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const //------------------------------------------------------------------------------ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) { - if (_pParent->HasChilds()) + if (_pParent->HasChildren()) // nothing to to ... return 1L; 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); } diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 04f76cda07e5..7fa80c177e13 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); SvLBoxEntry* pEntry = m_rTableList.First(); - while( pEntry && m_rTableList.GetModel()->HasChilds( pEntry ) ) + while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) ) { m_rTableList.Expand( pEntry ); pEntry = m_rTableList.Next( pEntry ); @@ -235,7 +235,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) bool TableListFacade::isLeafSelected() const { SvLBoxEntry* pEntry = m_rTableList.FirstSelected(); - return pEntry && !m_rTableList.GetModel()->HasChilds( pEntry ); + return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry ); } //============================================================================== @@ -335,7 +335,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const bool QueryListFacade::isLeafSelected() const { SvLBoxEntry* pEntry = m_rQueryList.FirstSelected(); - return pEntry && !m_rQueryList.GetModel()->HasChilds( pEntry ); + return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry ); } //============================================================================== diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index f8bddfcb980c..160f9b402673 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -492,7 +492,7 @@ DBG_NAME(OTableSubscriptionPage) SvLBoxEntry* pSchema = NULL; SvLBoxEntry* pCatalog = NULL; - if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry)) + if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChildren(pEntry)) { // checked and a leaf, which means it's no catalog, no schema, but a real table ::rtl::OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 9f4a96b6844d..9e9784670de1 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -47,7 +47,7 @@ namespace dbaui OTableEditorCtrl* m_pEditorCtrl; void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); - void ArrangeChilds( long nSplitPos ,Rectangle& rRect); + void ArrangeChildren( long nSplitPos ,Rectangle& rRect); DECL_LINK( SplitHdl, Splitter* ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 86e8ee277226..bd40f3a7a0c1 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -122,7 +122,7 @@ namespace dbaui void EnableExpandHandler(SvLBoxEntry* _pEntry); SvLBoxEntry* GetEntryPosByName( const String& aName, SvLBoxEntry* pStart = NULL, const IEntryFilter* _pFilter = NULL ) const; - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void RequestingChildren( SvLBoxEntry* pParent ); virtual void SelectHdl(); virtual void DeselectHdl(); // Window diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 21d36d9dcdf4..fd1a745f573d 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -59,7 +59,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD ImplInitSettings( sal_True, sal_True, sal_True ); ////////////////////////////////////////////////////////////////////// - // Childs erzeugen + // Children erzeugen m_pEditorCtrl = new OTableEditorCtrl( this); m_pFieldDescWin = new OTableFieldDescWin( this ); @@ -77,7 +77,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD OTableBorderWindow::~OTableBorderWindow() { ////////////////////////////////////////////////////////////////////// - // Childs zerstoeren + // Children zerstoeren // ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pEditorCtrl->Hide(); m_pFieldDescWin->Hide(); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 8e4b65125c58..4321d04f4be5 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -87,7 +87,7 @@ OTableFieldDescWin::~OTableFieldDescWin() { DBG_DTOR(OTableFieldDescWin,NULL); ////////////////////////////////////////////////////////////////////// - // Childs zerstoeren + // Children zerstoeren m_pHelpBar->Hide(); getGenPage()->Hide(); m_pHeader->Hide(); |