[Libreoffice-commits] .: rsc/inc rsc/source
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Jan 24 07:50:04 PST 2011
rsc/inc/rscdb.hxx | 6 -
rsc/source/parser/rscdb.cxx | 23 +---
rsc/source/parser/rscicpx.cxx | 215 ++++++++++++++++--------------------------
rsc/source/parser/rscinit.cxx | 91 ++++++++---------
4 files changed, 141 insertions(+), 194 deletions(-)
New commits:
commit 9643ee158fe45c518fbc2f809c212cba80737216
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Jan 24 07:49:59 2011 -0800
Remove DECLARE_LIST( RscBaseList, RscTop* )
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 44401cc..8047cea 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -57,7 +57,7 @@ struct WriteRcContext
/****************** R s c T y p C o n ************************************/
// Liste die alle Basistypen enthaelt
-DECLARE_LIST( RscBaseList, RscTop * )
+typedef ::std::vector< RscTop* > RscBaseList;
// Tabelle fuer Systemabhaengige Resourcen
struct RscSysEntry
@@ -330,9 +330,9 @@ public:
ByteString GetSearchPath() const { return aSearchPath; }
void SetSysSearchPath( const ByteString& rStr ) { aSysSearchPath = rStr; }
ByteString GetSysSearchPath() const { return aSysSearchPath; }
- void InsertType( RscTop * pType )
+ void InsertType( RscTop * pType )
{
- aBaseLst.Insert( pType, LIST_APPEND );
+ aBaseLst.push_back( pType );
}
RscTop * SearchType( Atom nTypId );
RscTop * Search( Atom typ );
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 7213a36..d4b643b 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -224,7 +224,6 @@ void Pre_dtorTree( RscTop * pRscTop ){
}
RscTypCont :: ~RscTypCont(){
- RscTop * pRscTmp;
RscSysEntry * pSysEntry;
// Alle Unterbaeume loeschen
@@ -234,11 +233,8 @@ RscTypCont :: ~RscTypCont(){
// Alle Klassen noch gueltig, jeweilige Instanzen freigeben
// BasisTypen
- pRscTmp = aBaseLst.First();
- while( pRscTmp ){
- pRscTmp->Pre_dtor();
- pRscTmp = aBaseLst.Next();
- };
+ for ( size_t i = 0, n = aBaseLst.size(); i < n; ++i )
+ aBaseLst[ i ]->Pre_dtor();
aBool.Pre_dtor();
aShort.Pre_dtor();
aUShort.Pre_dtor();
@@ -256,9 +252,9 @@ RscTypCont :: ~RscTypCont(){
delete aVersion.pClass;
DestroyTree( pRoot );
- while( NULL != (pRscTmp = aBaseLst.Remove()) ){
- delete pRscTmp;
- };
+ for ( size_t i = 0, n = aBaseLst.size(); i < n; ++i )
+ delete aBaseLst[ i ];
+ aBaseLst.clear();
while( NULL != (pSysEntry = aSysLst.Remove()) ){
delete pSysEntry;
@@ -309,12 +305,11 @@ RscTop * RscTypCont::SearchType( Atom nId )
ELSE_IF( aLangString )
ELSE_IF( aLangShort )
- RscTop * pEle = aBaseLst.First();
- while( pEle )
+ for ( size_t i = 0, n = aBaseLst.size(); i < n; ++i )
{
+ RscTop* pEle = aBaseLst[ i ];
if( pEle->GetId() == nId )
return pEle;
- pEle = aBaseLst.Next();
}
return NULL;
}
@@ -921,8 +916,8 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
*************************************************************************/
void RscTypCont::WriteSyntax( FILE * fOutput )
{
- for( sal_uInt32 i = 0; i < aBaseLst.Count(); i++ )
- aBaseLst.GetObject( i )->WriteSyntaxHeader( fOutput, this );
+ for( size_t i = 0; i < aBaseLst.size(); i++ )
+ aBaseLst[ i ]->WriteSyntaxHeader( fOutput, this );
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
aEnumRef.WriteSyntax();
}
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index eb4e8b5..ff73c3f 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -55,10 +55,9 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName,
RscClient * pClient;
// Clientvariablen einfuegen
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- &aWinBits, nVal ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nVal )
+ );
Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME );
pClass->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nWinBitVarId );
@@ -76,9 +75,7 @@ RscTop * RscTypCont::InitClassMgr()
RscBaseCont * pClass;
Atom nId;
- aBaseLst.Insert( pClass =
- new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ),
- LIST_APPEND );
+ aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ) );
nId = pHS->getID( "Resource" );
pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass );
@@ -90,10 +87,7 @@ RscTop * RscTypCont::InitClassMgr()
RscContWriteSrc * pCont;
// Variablen anlegen
- aBaseLst.Insert(
- pCont = new RscContExtraData( pHS->getID( "ContExtradata" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pCont = new RscContExtraData( pHS->getID( "ContExtradata" ), RSC_NOTYPE ) );
pCont->SetTypeClass( &aShort, &aString );
nRsc_EXTRADATA = nId = aNmTb.Put( "ExtraData", VARNAME );
pClassMgr->SetVariable( nId, pCont );
@@ -218,14 +212,14 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma
nId = aNmTb.Put( "MaskColor", VARNAME );
pClassImageList->SetVariable( nId, pClassColor, NULL,
VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR );
-
+
RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE );
pCont->SetTypeClass( &aIdUShort );
- aBaseLst.Insert( pCont, LIST_APPEND );
+ aBaseLst.push_back( pCont );
nId = aNmTb.Put( "IdList", VARNAME );
pClassImageList->SetVariable( nId, pCont, NULL, 0,
RSC_IMAGELIST_IDLIST );
-
+
nId = aNmTb.Put( "FileList", VARNAME );
pClassImageList->SetVariable( nId, pStrLst );
@@ -256,9 +250,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
RscClient * pClient;
Atom nVarId, nDisableId, nOutputSizeId;
- aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ), RSC_NOTYPE ) );
// Konstanten in Tabelle stellen
nDisableId = pHS->getID( "RSWND_DISABLE" );
@@ -271,18 +263,16 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
pClassWindow->SetVariable( nVarId, pFlag, NULL,
VAR_HIDDEN | VAR_NOENUM );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nDisableId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nDisableId )
+ );
nId = aNmTb.Put( "Disable", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nOutputSizeId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nOutputSizeId )
+ );
nId = aNmTb.Put( "OutputSize", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
@@ -330,7 +320,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
// BorderStyle
RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE );
- aBaseLst.Insert( pBorderStyleEnum, LIST_APPEND );
+ aBaseLst.push_back( pBorderStyleEnum );
// Konstanten in Tabelle stellen
SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WINDOW_BORDER_NORMAL );
@@ -394,9 +384,7 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
Atom nVarId;
RscEnum * pShow;
- aBaseLst.Insert( pShow = new RscEnum( pHS->getID( "EnumShowState" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pShow = new RscEnum( pHS->getID( "EnumShowState" ), RSC_NOTYPE ) );
SETCONST( pShow, "SHOW_NORMAL", WORKWIN_SHOWNORMAL );
SETCONST( pShow, "SHOW_MINIMIZED", WORKWIN_SHOWMINIMIZED );
@@ -486,7 +474,7 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper )
INS_WINBIT( pClassCheckBox, Top )
INS_WINBIT( pClassCheckBox, VCenter )
INS_WINBIT( pClassCheckBox, Bottom )
-
+
nId = aNmTb.Put( "Check", VARNAME );
pClassCheckBox->SetVariable( nId, &aBool );
@@ -588,8 +576,7 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
Atom nVarId;
RscEnum * pSymbol;
- aBaseLst.Insert( pSymbol = new RscEnum( pHS->getID( "EnumSymbolButton" ),
- RSC_NOTYPE ), LIST_APPEND );
+ aBaseLst.push_back( pSymbol = new RscEnum( pHS->getID( "EnumSymbolButton" ), RSC_NOTYPE ) );
SETCONST( pSymbol, "IMAGEBUTTON_DONTKNOW", SYMBOL_DONTKNOW );
SETCONST( pSymbol, "IMAGEBUTTON_IMAGE", SYMBOL_IMAGE );
@@ -913,7 +900,7 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper )
INS_WINBIT( pClassRadioButton, Top )
INS_WINBIT( pClassRadioButton, VCenter )
INS_WINBIT( pClassRadioButton, Bottom )
-
+
nId = aNmTb.Put( "Check", VARNAME );
pClassRadioButton->SetVariable( nId, &aBool );
@@ -964,9 +951,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
RscClient * pClient;
Atom nVarId, nShiftId, nMod1Id, nMod2Id;
- aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ), RSC_NOTYPE ) );
// Konstanten in Tabelle stellen
nShiftId = pHS->getID( "KEY_SHIFT" );
@@ -982,27 +967,24 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
VAR_HIDDEN | VAR_NOENUM );
// Clientvariablen einfuegen
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nShiftId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nShiftId )
+ );
nId = aNmTb.Put( "Shift", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nMod1Id ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod1Id )
+ );
nId = aNmTb.Put( "Modifier1", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nMod2Id ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod2Id )
+ );
nId = aNmTb.Put( "Modifier2", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
@@ -1011,9 +993,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
Atom nVarId;
RscEnum * pKeyFunc;
- aBaseLst.Insert( pKeyFunc = new RscEnum( pHS->getID( "EnumKeyFunc" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pKeyFunc = new RscEnum( pHS->getID( "EnumKeyFunc" ), RSC_NOTYPE ) );
SETCONST( pKeyFunc, "KEYFUNC_DONTKNOW", KEYFUNC_DONTKNOW );
SETCONST( pKeyFunc, "KEYFUNC_NEW", KEYFUNC_NEW );
@@ -1088,10 +1068,9 @@ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem )
{
RscCont * pCont;
- aBaseLst.Insert( pCont = new RscCont(
- pHS->getID( "ContAcceleratorKey" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pCont = new RscCont( pHS->getID( "ContAcceleratorKey" ), RSC_NOTYPE )
+ );
pCont->SetTypeClass( pClassAccelItem );
nId = aNmTb.Put( "ItemList", VARNAME );
pClassAccel->SetVariable( nId, pCont );
@@ -1128,9 +1107,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
Atom nVarId, nAutoCheckId, nRadioCheckId;
Atom nCheckableId, nAboutId, nHelpId;
- aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ), RSC_NOTYPE ) );
// Konstanten in Tabelle stellen
nCheckableId = pHS->getID( "MIB_CHECKABLE" );
@@ -1151,42 +1128,37 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
RSC_MENUITEM_STATUS );
// Clientvariablen einfuegen
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nCheckableId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nCheckableId )
+ );
nId = aNmTb.Put( "Checkable", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nAutoCheckId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAutoCheckId )
+ );
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nRadioCheckId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nRadioCheckId )
+ );
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nAboutId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAboutId )
+ );
nId = aNmTb.Put( "About", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, nHelpId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nHelpId )
+ );
nId = aNmTb.Put( "Help", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
@@ -1239,9 +1211,7 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
{
RscCont * pCont;
- aBaseLst.Insert( pCont = new RscCont( pHS->getID( "ContMenuItem" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pCont = new RscCont( pHS->getID( "ContMenuItem" ), RSC_NOTYPE ) );
pCont->SetTypeClass( pClassMenuItem );
nId = aNmTb.Put( "ItemList", VARNAME );
pClassMenu->SetVariable( nId, pCont, NULL, 0, RSC_MENU_ITEMS );
@@ -1936,9 +1906,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
{
RscEnum * pEnum;
- aBaseLst.Insert(
- pEnum = new RscEnum( pHS->getID( "EnumToolBoxItemType" ),
- RSC_NOTYPE ), LIST_APPEND );
+ aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumToolBoxItemType" ), RSC_NOTYPE ) );
SETCONST( pEnum, "TOOLBOXITEM_BUTTON", TOOLBOXITEM_BUTTON );
SETCONST( pEnum, "TOOLBOXITEM_SPACE", TOOLBOXITEM_SPACE );
SETCONST( pEnum, "TOOLBOXITEM_SEPARATOR", TOOLBOXITEM_SEPARATOR );
@@ -1954,9 +1922,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
RscClient * pClient;
Atom l_nVarId, l_nAutoCheckId, l_nRadioCheckId, l_nCheckableId, l_nLeftId, l_nAutoSizeId, l_nDropDownId;
- aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagToolBoxState" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagToolBoxState" ), RSC_NOTYPE ) );
// Konstanten in Tabelle stellen
l_nCheckableId = pHS->getID( "TIB_CHECKABLE" );
@@ -1979,39 +1945,39 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
RSC_TOOLBOXITEM_STATUS );
// Clientvariablen einfuegen
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nCheckableId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nCheckableId )
+ );
nId = aNmTb.Put( "Checkable", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nAutoCheckId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoCheckId )
+ );
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nRadioCheckId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nRadioCheckId )
+ );
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nLeftId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nLeftId )
+ );
nId = aNmTb.Put( "Left", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nAutoSizeId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoSizeId )
+ );
nId = aNmTb.Put( "AutoSize", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- pFlag, l_nDropDownId ), LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nDropDownId )
+ );
nId = aNmTb.Put( "DropDown", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
}
@@ -2070,9 +2036,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
{
RscEnum * pEnum;
- aBaseLst.Insert(
- pEnum = new RscEnum( pHS->getID( "EnumButtonType" ),
- RSC_NOTYPE ), LIST_APPEND );
+ aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumButtonType" ), RSC_NOTYPE ) );
SETCONST( pEnum, "BUTTON_SYMBOL", BUTTON_SYMBOL );
SETCONST( pEnum, "BUTTON_TEXT", BUTTON_TEXT );
SETCONST( pEnum, "BUTTON_SYMBOLTEXT", BUTTON_SYMBOLTEXT );
@@ -2085,9 +2049,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
{
RscEnum * pEnum;
- aBaseLst.Insert(
- pEnum = new RscEnum( pHS->getID( "EnumToolBoxAlign" ),
- RSC_NOTYPE ), LIST_APPEND );
+ aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumToolBoxAlign" ), RSC_NOTYPE ) );
SETCONST( pEnum, "BOXALIGN_TOP", WINDOWALIGN_TOP );
SETCONST( pEnum, "BOXALIGN_LEFT", WINDOWALIGN_LEFT );
SETCONST( pEnum, "BOXALIGN_RIGHT", WINDOWALIGN_RIGHT );
@@ -2117,15 +2079,15 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper,
RscLangArray* pLA;
RscCont * pCont;
- aBaseLst.Insert( pCont = new RscCont( pHS->getID( "ContToolBoxItem" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pCont = new RscCont( pHS->getID( "ContToolBoxItem" ), RSC_NOTYPE ) );
pCont->SetTypeClass( pClassToolBoxItem );
- aBaseLst.Insert( pLA = new RscLangArray( pHS->getID( "LangContToolBoxItem" ),
- RSC_NOTYPE,
- pCont,
- &aLangType ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pLA = new RscLangArray( pHS->getID( "LangContToolBoxItem" )
+ , RSC_NOTYPE
+ , pCont
+ , &aLangType
+ )
+ );
nId = aNmTb.Put( "ItemList", VARNAME );
pClassToolBox->SetVariable( nId, pLA, NULL, 0,
RSC_TOOLBOX_ITEMLIST );
@@ -2271,9 +2233,7 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
{
RscCont * pCont;
- aBaseLst.Insert( pCont = new RscCont( pHS->getID( "ContTabControlItem" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back( pCont = new RscCont( pHS->getID( "ContTabControlItem" ), RSC_NOTYPE ) );
pCont->SetTypeClass( pClassTabControlItem );
nId = aNmTb.Put( "PageList", VARNAME );
pClassTabControl->SetVariable( nId, pCont, NULL, 0,
@@ -2324,7 +2284,7 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper,
SETCONST( pSfxStyleFamily, "SFX_STYLE_FAMILY_FRAME",SFX_STYLE_FAMILY_FRAME);
SETCONST( pSfxStyleFamily, "SFX_STYLE_FAMILY_PAGE", SFX_STYLE_FAMILY_PAGE );
SETCONST( pSfxStyleFamily, "SFX_STYLE_FAMILY_PSEUDO", SFX_STYLE_FAMILY_PSEUDO );
- aBaseLst.Insert( pSfxStyleFamily );
+ aBaseLst.push_back( pSfxStyleFamily );
nId = aNmTb.Put( "StyleFamily", VARNAME );
pClassSfxFamilyStyleItem->SetVariable( nId, pSfxStyleFamily, NULL, 0,
@@ -2354,10 +2314,9 @@ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper,
{
RscCont * pCont;
- aBaseLst.Insert( pCont = new RscCont(
- pHS->getID( "ContFamilyStyleItem" ),
- RSC_NOTYPE ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pCont = new RscCont( pHS->getID( "ContFamilyStyleItem" ), RSC_NOTYPE )
+ );
pCont->SetTypeClass( pClassFamilyStyleItem );
nId = aNmTb.Put( "StyleFamilyList", VARNAME );
pClassSfxTemplateDialog->SetVariable( nId, pCont );
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index b6eb2c4..7b275e9 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -377,31 +377,25 @@ void RscTypCont::Init()
{
/********** I n i t B a s i c T y p e s **************************/
InitLangType();
- aBaseLst.Insert( pFieldUnits = InitFieldUnitsType(), LIST_APPEND );
- aBaseLst.Insert( pTimeFieldFormat = InitTimeFieldFormat(), LIST_APPEND );
- aBaseLst.Insert( pColor = InitColor(), LIST_APPEND );
- aBaseLst.Insert( pMapUnit = InitMapUnit(), LIST_APPEND );
- aBaseLst.Insert( pKey = InitKey(), LIST_APPEND );
- aBaseLst.Insert( pTriState = InitTriState(), LIST_APPEND );
- aBaseLst.Insert( pMessButtons = InitMessButtons(), LIST_APPEND );
- aBaseLst.Insert( pMessDefButton = InitMessDefButton(), LIST_APPEND );
-
- aBaseLst.Insert( pGeometry = InitGeometry(), LIST_APPEND );
- aBaseLst.Insert( pLangGeometry = InitLangGeometry( pGeometry ),
- LIST_APPEND );
- aBaseLst.Insert( pStringList = InitStringList(), LIST_APPEND );
- aBaseLst.Insert( pLangStringList = InitLangStringList( pStringList ),
- LIST_APPEND );
- aBaseLst.Insert( pStringTupel = InitStringTupel(), LIST_APPEND );
- aBaseLst.Insert( pStringTupelList = InitStringTupelList( pStringTupel ),
- LIST_APPEND );
- aBaseLst.Insert( pLangStringTupelList =
- InitLangStringTupelList( pStringTupelList ), LIST_APPEND );
- aBaseLst.Insert( pStringLongTupel = InitStringLongTupel(), LIST_APPEND );
- aBaseLst.Insert( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ),
- LIST_APPEND );
- aBaseLst.Insert( pLangStringLongTupelList =
- InitLangStringLongTupelList( pStringLongTupelList ), LIST_APPEND );
+ aBaseLst.push_back( pFieldUnits = InitFieldUnitsType() );
+ aBaseLst.push_back( pTimeFieldFormat = InitTimeFieldFormat() );
+ aBaseLst.push_back( pColor = InitColor() );
+ aBaseLst.push_back( pMapUnit = InitMapUnit() );
+ aBaseLst.push_back( pKey = InitKey() );
+ aBaseLst.push_back( pTriState = InitTriState() );
+ aBaseLst.push_back( pMessButtons = InitMessButtons() );
+ aBaseLst.push_back( pMessDefButton = InitMessDefButton() );
+
+ aBaseLst.push_back( pGeometry = InitGeometry() );
+ aBaseLst.push_back( pLangGeometry = InitLangGeometry( pGeometry ) );
+ aBaseLst.push_back( pStringList = InitStringList() );
+ aBaseLst.push_back( pLangStringList = InitLangStringList( pStringList ) );
+ aBaseLst.push_back( pStringTupel = InitStringTupel() );
+ aBaseLst.push_back( pStringTupelList = InitStringTupelList( pStringTupel ) );
+ aBaseLst.push_back( pLangStringTupelList = InitLangStringTupelList( pStringTupelList ) );
+ aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() );
+ aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) );
+ aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) );
}
{
/********** R E S O U R C E T Y P E N ******************************/
@@ -472,7 +466,7 @@ void RscTypCont::Init()
pClassDialog = new RscClass( pHS->getID( "Dialog" ),
RSC_DIALOG, pClassSystemWindow );
pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aBaseLst.Insert( pClassDialog, LIST_APPEND );
+ aBaseLst.push_back( pClassDialog );
/********** M O D A L D I A L O G ***********************************/
// Klasse anlegen
@@ -605,7 +599,7 @@ void RscTypCont::Init()
{
pLangClassKeyCode = new RscClassArray( pHS->getID( "LangKeyCode" ),
RSC_KEYCODE, pClassKeyCode, &aLangType );
- aBaseLst.Insert( pLangClassKeyCode );
+ aBaseLst.push_back( pLangClassKeyCode );
}
/********** A C C E L I T E M ***************************************/
@@ -700,10 +694,9 @@ void RscTypCont::Init()
// Clientvariablen einfuegen
// Sysmodal
- aBaseLst.Insert(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE,
- &aWinBits, nRepeatId ),
- LIST_APPEND );
+ aBaseLst.push_back(
+ pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nRepeatId )
+ );
nId = aNmTb.Put( "Repeat", VARNAME );
pClassSpinButton->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nWinBitVarId );
@@ -728,7 +721,7 @@ void RscTypCont::Init()
/********** P A T T E R N F I E L D **********************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassPatternFormatter( pClassSpinField );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassPatternField = InitClassPatternField( pClassTmp );
pRoot->Insert( pClassPatternField );
@@ -736,7 +729,7 @@ void RscTypCont::Init()
/********** N U M E R I C F I E L D **********************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassNumericField = InitClassNumericField( pClassTmp );
pRoot->Insert( pClassNumericField );
@@ -744,9 +737,9 @@ void RscTypCont::Init()
/********** M E T R I C F I E L D ************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassMetricField = InitClassMetricField( pClassTmp );
pRoot->Insert( pClassMetricField );
@@ -754,9 +747,9 @@ void RscTypCont::Init()
/********** C U R R E N C Y F I E L D ********************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassCurrencyFormatter( pClassTmp, pFieldUnits );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassCurrencyField = InitClassCurrencyField( "CurrencyField", RSC_CURRENCYFIELD, pClassTmp );
pRoot->Insert( pClassCurrencyField );
@@ -768,7 +761,7 @@ void RscTypCont::Init()
/********** D A T E F I E L D ****************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassDateField = InitClassDateField( pClassTmp, pClassDate );
pRoot->Insert( pClassDateField );
@@ -777,7 +770,7 @@ void RscTypCont::Init()
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassTimeFormatter( pClassSpinField, pClassTime,
pTimeFieldFormat );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTimeField = InitClassTimeField( pClassTmp, pClassTime );
pRoot->Insert( pClassTimeField );
@@ -785,7 +778,7 @@ void RscTypCont::Init()
/********** P A T T E R N B O X **************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassPatternFormatter( pClassComboBox );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassPatternBox = InitClassPatternBox( pClassTmp );
pRoot->Insert( pClassPatternBox );
@@ -793,7 +786,7 @@ void RscTypCont::Init()
/********** N U M E R I C B O X **************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassNumericBox = InitClassNumericBox( pClassTmp );
pRoot->Insert( pClassNumericBox );
@@ -803,9 +796,9 @@ void RscTypCont::Init()
/********** M E T R I C B O X ****************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassMetricBox = InitClassMetricBox( pClassTmp );
pRoot->Insert( pClassMetricBox );
@@ -813,9 +806,9 @@ void RscTypCont::Init()
/********** C U R R E N C Y B O X ************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassCurrencyFormatter( pClassTmp, pFieldUnits );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassCurrencyBox = InitClassCurrencyBox( "CurrencyBox", RSC_CURRENCYBOX, pClassTmp );
pRoot->Insert( pClassCurrencyBox );
@@ -826,7 +819,7 @@ void RscTypCont::Init()
/********** D A T E B O X ********************************************/
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassDateFormatter( pClassComboBox, pClassDate );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassDateBox = InitClassDateBox( pClassTmp, pClassDate );
pRoot->Insert( pClassDateBox );
@@ -835,7 +828,7 @@ void RscTypCont::Init()
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassTimeFormatter( pClassComboBox, pClassTime,
pTimeFieldFormat );
- aBaseLst.Insert( pClassTmp, LIST_APPEND );
+ aBaseLst.push_back( pClassTmp );
pClassTimeBox = InitClassTimeBox( pClassTmp, pClassTime );
pRoot->Insert( pClassTimeBox );
@@ -903,7 +896,7 @@ void RscTypCont::Init()
pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
INS_WINBIT(pClassFixedLine,Vert)
-
+
aNmTb.Put( nId, CLASSNAME, pClassFixedLine );
pRoot->Insert( pClassFixedLine );
More information about the Libreoffice-commits
mailing list