summaryrefslogtreecommitdiffstats
path: root/svx/source/form/navigatortreemodel.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form/navigatortreemodel.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/form/navigatortreemodel.cxx72
1 files changed, 33 insertions, 39 deletions
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index bd788b731280..ff0bfc07044d 100644..100755
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -176,7 +177,7 @@ namespace svxform
}
else if (pEntryData->ISA(FmFormData))
{
- DBG_ERROR("replacing forms not implemented yet !");
+ OSL_FAIL("replacing forms not implemented yet !");
}
}
@@ -215,12 +216,11 @@ namespace svxform
//========================================================================
//------------------------------------------------------------------------
- NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages )
+ NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages )
:m_pFormShell(NULL)
,m_pFormPage(NULL)
,m_pFormModel(NULL)
,m_aNormalImages( _rNormalImages )
- ,m_aHCImages( _rHCImages )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" );
m_pPropChangeList = new OFormComponentObserver(this);
@@ -271,15 +271,7 @@ namespace svxform
//////////////////////////////////////////////////////////////////////
// RootList loeschen
- FmEntryData* pChildData;
- FmEntryDataList* pRootList = GetRootList();
-
- for( sal_uInt32 i=pRootList->Count(); i>0; i-- )
- {
- pChildData = pRootList->GetObject(i-1);
- pRootList->Remove( pChildData );
- delete pChildData;
- }
+ GetRootList()->clear();
//////////////////////////////////////////////////////////////////////
// UI benachrichtigen
@@ -360,7 +352,7 @@ namespace svxform
}
else
{
- DBG_ERROR("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !");
+ OSL_FAIL("NavigatorTreeModel::Insert : the parent container needs an elementtype I don't know !");
}
if( bUndo )
@@ -383,9 +375,9 @@ namespace svxform
}
if (pFolder)
- pFolder->GetChildList()->Insert( pEntry, nRelPos );
+ pFolder->GetChildList()->insert( pEntry, nRelPos );
else
- GetRootList()->Insert( pEntry, nRelPos );
+ GetRootList()->insert( pEntry, nRelPos );
//////////////////////////////////////////////////////////////////////
// UI benachrichtigen
@@ -466,13 +458,13 @@ namespace svxform
// beim Vater austragen
if (pFolder)
- pFolder->GetChildList()->Remove(pEntry);
+ pFolder->GetChildList()->remove( pEntry );
else
{
- GetRootList()->Remove(pEntry);
+ GetRootList()->remove( pEntry );
//////////////////////////////////////////////////////////////////////
// Wenn keine Form mehr in der Root, an der Shell CurForm zuruecksetzen
- if (!GetRootList()->Count())
+ if ( !GetRootList()->size() )
m_pFormShell->GetImpl()->forgetCurrentForm();
}
@@ -498,10 +490,9 @@ namespace svxform
return;
FmEntryDataList* pChildList = pFormData->GetChildList();
- sal_uInt32 nCount = pChildList->Count();
- for (sal_uInt32 i = nCount; i > 0; i--)
+ for ( size_t i = pChildList->size(); i > 0; )
{
- FmEntryData* pEntryData = pChildList->GetObject(i - 1);
+ FmEntryData* pEntryData = pChildList->at( --i );
//////////////////////////////////////////////////////////////////////
// Child ist Form -> rekursiver Aufruf
@@ -545,15 +536,14 @@ namespace svxform
//////////////////////////////////////////////////////////////////////
// Alle Eintraege dieses Zweiges loeschen
FmEntryDataList* pChildList = pParentData->GetChildList();
- FmEntryData* pChildData;
- for( sal_uInt32 i=pChildList->Count(); i>0; i-- )
+ for( size_t i = pChildList->size(); i > 0; )
{
- pChildData = pChildList->GetObject(i-1);
+ FmEntryData* pChildData = pChildList->at( --i );
if( pChildData->ISA(FmFormData) )
ClearBranch( (FmFormData*)pChildData );
- pChildList->Remove( pChildData );
+ pChildList->remove( pChildData );
}
}
@@ -577,7 +567,7 @@ namespace svxform
"NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm");
xForms->getByIndex(i) >>= xSubForm;
- pSubFormData = new FmFormData( xSubForm, m_aNormalImages, m_aHCImages, pFormData );
+ pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData );
Insert( pSubFormData, LIST_APPEND );
//////////////////////////////////////////////////////////////
@@ -607,7 +597,7 @@ namespace svxform
if (xSubForm.is())
{ // die aktuelle Component ist eine Form
- pSubFormData = new FmFormData(xSubForm, m_aNormalImages, m_aHCImages, pFormData);
+ pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData);
Insert(pSubFormData, LIST_APPEND);
//////////////////////////////////////////////////////////////
@@ -616,7 +606,7 @@ namespace svxform
}
else
{
- pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, m_aHCImages, pFormData);
+ pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData);
Insert(pNewControlData, LIST_APPEND);
}
}
@@ -639,7 +629,7 @@ namespace svxform
if (xParentForm.is())
pParentData = (FmFormData*)FindData( xParentForm, GetRootList() );
- pFormData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, pParentData );
+ pFormData = new FmFormData( xForm, m_aNormalImages, pParentData );
Insert( pFormData, nRelPos );
}
@@ -657,7 +647,7 @@ namespace svxform
FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() );
if( !pParentData )
{
- pParentData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, NULL );
+ pParentData = new FmFormData( xForm, m_aNormalImages, NULL );
Insert( pParentData, LIST_APPEND );
}
@@ -665,7 +655,7 @@ namespace svxform
{
//////////////////////////////////////////////////////////
// Neue EntryData setzen
- FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, m_aHCImages, pParentData );
+ FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData );
//////////////////////////////////////////////////////////
// Neue EntryData einfuegen
@@ -674,12 +664,15 @@ namespace svxform
}
//------------------------------------------------------------------------
- void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew)
+ void NavigatorTreeModel::ReplaceFormComponent(
+ const Reference< XFormComponent > & xOld,
+ const Reference< XFormComponent > & xNew
+ )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ReplaceFormComponent" );
FmEntryData* pData = FindData(xOld, GetRootList(), sal_True);
DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
- ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages, m_aHCImages );
+ ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
FmNavModelReplacedHint aReplacedHint( pData );
Broadcast( aReplacedHint );
@@ -692,9 +685,9 @@ namespace svxform
// normalize
Reference< XInterface > xIFace( xElement, UNO_QUERY );
- for (sal_uInt16 i=0; i < pDataList->Count(); i++)
+ for ( size_t i = 0; i < pDataList->size(); i++ )
{
- FmEntryData* pEntryData = pDataList->GetObject(i);
+ FmEntryData* pEntryData = pDataList->at( i );
if ( pEntryData->GetElement().get() == xIFace.get() )
return pEntryData;
else if (bRecurs)
@@ -721,9 +714,9 @@ namespace svxform
FmEntryData* pEntryData;
FmEntryData* pChildData;
- for( sal_uInt16 i=0; i<pDataList->Count(); i++ )
+ for( size_t i = 0; i < pDataList->size(); i++ )
{
- pEntryData = pDataList->GetObject(i);
+ pEntryData = pDataList->at( i );
aEntryText = pEntryData->GetText();
if (rText == aEntryText)
@@ -988,9 +981,9 @@ namespace svxform
::rtl::OUString aChildText;
FmEntryData* pChildData;
- for( sal_uInt16 i=0; i<pChildList->Count(); i++ )
+ for( size_t i = 0; i < pChildList->size(); i++ )
{
- pChildData = pChildList->GetObject(i);
+ pChildData = pChildList->at( i );
aChildText = pChildData->GetText();
//////////////////////////////////////////////////////////////////////
@@ -1124,3 +1117,4 @@ namespace svxform
//............................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-08-22 09:27:26 +0000