diff options
Diffstat (limited to 'rsc')
71 files changed, 646 insertions, 2241 deletions
diff --git a/rsc/doku/feinkonz.43/rsc.doc b/rsc/doku/feinkonz.43/rsc.sdw index 5727feb5b6f0..5727feb5b6f0 100644 --- a/rsc/doku/feinkonz.43/rsc.doc +++ b/rsc/doku/feinkonz.43/rsc.sdw diff --git a/rsc/doku/feinkonz.43/rscerror.doc b/rsc/doku/feinkonz.43/rscerror.sdw index f6e48c96237d..f6e48c96237d 100644 --- a/rsc/doku/feinkonz.43/rscerror.doc +++ b/rsc/doku/feinkonz.43/rscerror.sdw diff --git a/rsc/doku/feinkonz.43/rscinst.doc b/rsc/doku/feinkonz.43/rscinst.sdw index 88a2cc475bd2..88a2cc475bd2 100644 --- a/rsc/doku/feinkonz.43/rscinst.doc +++ b/rsc/doku/feinkonz.43/rscinst.sdw diff --git a/rsc/doku/schriftw.16/change.doc b/rsc/doku/schriftw.16/change.sdw index 4a2120bd1d3c..4a2120bd1d3c 100644 --- a/rsc/doku/schriftw.16/change.doc +++ b/rsc/doku/schriftw.16/change.sdw diff --git a/rsc/inc/pch/precompiled_rsc.cxx b/rsc/inc/pch/precompiled_rsc.cxx index ca6005d3aed8..a8edf6962a99 100644 --- a/rsc/inc/pch/precompiled_rsc.cxx +++ b/rsc/inc/pch/precompiled_rsc.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. @@ -27,3 +28,4 @@ #include "precompiled_rsc.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/pch/precompiled_rsc.hxx b/rsc/inc/pch/precompiled_rsc.hxx index 829e1e736b93..051d99585bba 100644 --- a/rsc/inc/pch/precompiled_rsc.hxx +++ b/rsc/inc/pch/precompiled_rsc.hxx @@ -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. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsc/rscsfx.hxx b/rsc/inc/rsc/rscsfx.hxx index 830bbcf37baa..36babfb8c520 100644 --- a/rsc/inc/rsc/rscsfx.hxx +++ b/rsc/inc/rsc/rscsfx.hxx @@ -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. @@ -60,3 +61,5 @@ enum SfxStyleFamily { SFX_STYLE_FAMILY_CHAR = 1, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h index 4a1b20663904..fed155cc90d3 100644 --- a/rsc/inc/rscall.h +++ b/rsc/inc/rscall.h @@ -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. @@ -110,3 +111,5 @@ struct SUBINFO_STRUCT { void InitRscCompiler(); #endif // _RSCALL_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index 6a5ebb934dc2..52ef742b55f7 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -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. @@ -92,7 +93,7 @@ public: // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst ); virtual void SetToDefault( const RSCINST & rInst ); sal_Bool IsDefault( const RSCINST & rInst ); sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); @@ -134,3 +135,5 @@ public: }; #endif //_RSCARRAY + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index e849a9969d07..7dc3e95488ad 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -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. @@ -83,7 +84,7 @@ public: // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst ); void SetToDefault( const RSCINST & rInst ); sal_Bool IsDefault( const RSCINST & rInst ); sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); @@ -137,3 +138,5 @@ public: }; #endif //_RSCCLASS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index 75277813a8cb..3a6006501b7a 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -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. @@ -31,22 +32,6 @@ #include <rscdef.hxx> #include <rscall.h> -/****************** C L A S S E S ****************************************/ -class RscTypCont; - -/*********** R s c I n c o n s i s t e n t *******************************/ -class RscInconsistent { -public: - RscId aFirstId; //Paar von inkonsistenten Id's - RscId aSecondId; - RscInconsistent( const RscId & rFirst, const RscId & rSecond ){ - aFirstId = rFirst; - aSecondId = rSecond; - }; -}; - -DECLARE_LIST( RscInconsList, RscInconsistent * ) - /******************* O b j N o d e ***************************************/ class ObjNode : public IdNode{ RscId aRscId; // Id der Resource @@ -75,7 +60,7 @@ public: // get the Object from this Node return( pRscObj ); } - sal_Bool IsConsistent( RscInconsList * pList = NULL ); + sal_Bool IsConsistent(); }; /******************* R e f N o d e ***************************************/ @@ -110,3 +95,5 @@ public: }; #endif // _RSCCLOBJ_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index a48ec3c05ab3..d1ebeeff87d3 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -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. @@ -108,3 +109,5 @@ public: }; #endif // _RSCCONST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx index 668a40e0508e..3c34377bbe1a 100644 --- a/rsc/inc/rsccont.hxx +++ b/rsc/inc/rsccont.hxx @@ -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. @@ -98,7 +99,7 @@ public: // Gibt die Groesse der Klasse in Bytes sal_uInt32 Size(){ return( nSize ); }; - sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst ); void SetToDefault( const RSCINST & rInst ); sal_Bool IsDefault( const RSCINST & rInst ); sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); @@ -151,3 +152,5 @@ public: }; #endif //_RSCCONT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 3e8b263a0399..54c386dab315 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -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. @@ -56,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 @@ -67,7 +68,8 @@ struct RscSysEntry sal_uInt32 nTyp; sal_uInt32 nRefId; }; -DECLARE_LIST( RscSysList, RscSysEntry * ) + +typedef ::std::vector< RscSysEntry* > RscSysList; class RscTypCont { @@ -97,6 +99,7 @@ class RscTypCont Atom nMinimizeId; Atom nMaximizeId; Atom nCloseableId; + Atom nStdPopupId; Atom nAppId; Atom nTabstopId; Atom nGroupId; @@ -330,7 +333,7 @@ public: ByteString GetSysSearchPath() const { return aSysSearchPath; } void InsertType( RscTop * pType ) { - aBaseLst.Insert( pType, LIST_APPEND ); + aBaseLst.push_back( pType ); } RscTop * SearchType( Atom nTypId ); RscTop * Search( Atom typ ); @@ -351,9 +354,11 @@ public: void WriteSyntax( FILE * fOutput ); void WriteRcCtor( FILE * fOutput ); void FillNameIdList( REResourceList * pList, sal_uLong lFileKey ); - sal_Bool MakeConsistent( RscInconsList * pList ); + sal_Bool MakeConsistent(); sal_uInt32 PutTranslatorKey( sal_uInt64 nKey ); void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; } }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 8900c5708c99..4ff5e2201dd6 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -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. @@ -27,10 +28,9 @@ #ifndef _RSCDEF_HXX #define _RSCDEF_HXX -#ifndef _TOOLS_UNQIDX_HXX #include <tools/unqidx.hxx> -#endif #include <rsctree.hxx> +#include <vector> /****************** C L A S S E S ****************************************/ class RscExpression; @@ -153,21 +153,28 @@ public: ByteString GetMacro(); }; -DECLARE_LIST( RscSubDefList, RscDefine * ) +typedef ::std::vector< RscDefine* > RscSubDefList; -class RscDefineList : public RscSubDefList { +class RscDefineList { friend class RscFile; friend class RscFileTab; private: + RscSubDefList maList; // pExpression wird auf jedenfall Eigentum der Liste RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName, - sal_Int32 lDefId, sal_uLong lPos ); + sal_Int32 lDefId, size_t lPos ); RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName, - RscExpression * pExpression, sal_uLong lPos ); + RscExpression * pExpression, size_t lPos ); sal_Bool Befor( const RscDefine * pFree, const RscDefine * pDepend ); sal_Bool Remove( RscDefine * pDef ); - sal_Bool Remove( sal_uLong nIndex ); + sal_Bool Remove( size_t nIndex ); sal_Bool Remove(); + size_t GetPos( RscDefine* item ) { + for ( size_t i = 0, n = maList.size(); i < n; ++i ) + if ( maList[ i ] == item ) + return i; + return size_t(-1); + } public: void WriteAll( FILE * fOutput ); }; @@ -193,10 +200,11 @@ public: RscDepend( sal_uLong lIncKey ){ lKey = lIncKey; }; sal_uLong GetFileKey(){ return lKey; } }; -DECLARE_LIST( RscDependList, RscDepend * ) + +typedef ::std::vector< RscDepend* > RscDependList; // Tabelle die alle Dateinamen enthaelt -class RscFile : public RscDependList +class RscFile { friend class RscFileTab; sal_Bool bIncFile; // Ist es eine Include-Datei @@ -207,10 +215,11 @@ public: ByteString aFileName; // Name der Datei ByteString aPathName; // Pfad und Name der Datei RscDefineList aDefLst; // Liste der Defines + RscDependList aDepLst; // List of Depend RscFile(); ~RscFile(); - sal_Bool InsertDependFile( sal_uLong lDepFile, sal_uLong lPos ); + sal_Bool InsertDependFile( sal_uLong lDepFile, size_t lPos ); void RemoveDependFile( sal_uLong lDepFile ); sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); void SetIncFlag(){ bIncFile = sal_True; }; @@ -245,9 +254,9 @@ public: RscDefine * FindDef( sal_uLong lKey, const ByteString & ); sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); - sal_Bool TestDef( sal_uLong lFileKey, sal_uLong lPos, + sal_Bool TestDef( sal_uLong lFileKey, size_t lPos, const RscDefine * pDefDec ); - sal_Bool TestDef( sal_uLong lFileKey, sal_uLong lPos, + sal_Bool TestDef( sal_uLong lFileKey, size_t lPos, const RscExpression * pExpDec ); RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName, @@ -272,3 +281,5 @@ public: }; #endif // _RSCDEF_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 41f012040a0c..bc1516a73c41 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -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. @@ -160,3 +161,5 @@ public: }; #endif // _RSCERROR_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx index 2c36fdde6221..48770605f0a3 100644 --- a/rsc/inc/rscflag.hxx +++ b/rsc/inc/rscflag.hxx @@ -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. @@ -104,3 +105,5 @@ public: }; #endif // _RSCFLAG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx index bb8b4670b11b..dcba480ecd67 100644 --- a/rsc/inc/rschash.hxx +++ b/rsc/inc/rschash.hxx @@ -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. @@ -29,7 +30,7 @@ #include <sal/types.h> #include <rtl/string.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> typedef sal_uInt32 Atom; @@ -38,8 +39,8 @@ typedef sal_uInt32 Atom; class AtomContainer { Atom m_nNextID; - std::hash_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID; - std::hash_map< Atom, rtl::OString > m_aIDToString; + boost::unordered_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID; + boost::unordered_map< Atom, rtl::OString > m_aIDToString; public: AtomContainer(); @@ -52,3 +53,4 @@ class AtomContainer #endif // _RSCHASH_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx index 107060dd863c..b64016bfac72 100644 --- a/rsc/inc/rscinst.hxx +++ b/rsc/inc/rscinst.hxx @@ -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. @@ -242,3 +243,5 @@ public: }; #endif //_RSCINST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx index 221512e73eaf..dd99b68b0fae 100644 --- a/rsc/inc/rsckey.hxx +++ b/rsc/inc/rsckey.hxx @@ -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. @@ -59,3 +60,5 @@ public: #endif// _RSCKEY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx index 942205c5671e..32d64d424006 100644 --- a/rsc/inc/rsclst.hxx +++ b/rsc/inc/rsclst.hxx @@ -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. @@ -28,16 +29,11 @@ #ifndef _RSCLST_HXX #define _RSCLST_HXX -#ifndef _TOOLS_LIST_HXX -#include <tools/list.hxx> -#endif #include <rscall.h> class REResourceList; -DECLARE_LIST( RESubResourceList, REResourceList * ) - -class REResourceList : public RESubResourceList +class REResourceList { protected: REResourceList* pParent; @@ -65,3 +61,5 @@ public: }; #endif // _RSCLST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index 43c2b9720958..09303a4944bb 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -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. @@ -71,10 +72,11 @@ public: RscTypCont * pTC, const RscId & rId ); ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ); - sal_Bool IsConsistent( const RSCINST & rInst, - RscInconsList * pList = NULL ); + sal_Bool IsConsistent( const RSCINST & rInst ); ERRTYPE GetRef( const RSCINST & rInst, RscId * ); ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); }; #endif //_RSCMGR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx index 952c4670616c..69037ba8c027 100644 --- a/rsc/inc/rscpar.hxx +++ b/rsc/inc/rscpar.hxx @@ -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. @@ -90,3 +91,5 @@ ERRTYPE parser( RscFileInst * pFileInst ); RscExpression * MacroParser( RscFileInst & rFileInst ); #endif // _RSCPAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index c23b2b97e715..fc43ae88a388 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -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. @@ -163,7 +164,7 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - sal_Bool IsConsistent( const RSCINST & rInst, RscInconsList * pList ); + sal_Bool IsConsistent( const RSCINST & rInst ); void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, const char * ); @@ -207,3 +208,5 @@ public: }; #endif // _RSCRANGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index 711b686f8a27..367118858918 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -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. @@ -27,15 +28,9 @@ #ifndef _RSCRSC_HXX #define _RSCRSC_HXX -#ifndef RSCALL_H #include <rscall.h> -#endif -#ifndef RSCERROR_H #include <rscerror.h> -#endif -#ifndef RSCTOOLS_HXX #include <rsctools.hxx> -#endif #include <list> @@ -56,7 +51,6 @@ class RscCmdLine public: RscStrList aInputList; // Liste der Quelldateien - RscStrList aSymbolList; // Liste der Symbole ByteString aPath; // Liste der Pfade RSCBYTEORDER_TYPE nByteOrder; unsigned short nCommands; // Steuerbits @@ -96,7 +90,6 @@ struct WriteRcContext; class RscCompiler { private: - RscStrList aTmpFileList; // Liste der Tmp-Dateien ByteString aTmpOutputHxx; // Name der TempHxx-Ausgabedatei ByteString aTmpOutputCxx; // Name der TempCxx-Ausgabedatei ByteString aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei @@ -136,3 +129,5 @@ public: }; #endif //_RSCRSC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx index e485a023d933..7df40992cdce 100644 --- a/rsc/inc/rscstr.hxx +++ b/rsc/inc/rscstr.hxx @@ -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. @@ -77,3 +78,5 @@ public: }; #endif // _RSCSTR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index a119ab7f1431..b65207dafac3 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -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. @@ -35,7 +36,7 @@ class RscPtrPtr; #endif #include <stdio.h> #include <tools/string.hxx> -#include <tools/list.hxx> +#include <vector> /******************* T y p e s *******************************************/ // Zeichensatz @@ -62,7 +63,9 @@ int rsc_stricmp( const char *string1, const char *string2 ); char* rsc_strdup( const char* ); /****************** C L A S S E S ****************************************/ -DECLARE_LIST( RscStrList, ByteString * ) + +typedef ::std::vector< ByteString* > RscStrList; + /*********** R s c C h a r ***********************************************/ class RscChar { @@ -218,3 +221,5 @@ public: }; #endif // _RSCTOOLS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 2e23d5ef410a..77e32041ac8b 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -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. @@ -190,8 +191,7 @@ public: virtual void Destroy( const RSCINST & rInst ); // prueft auf konsistenz - virtual sal_Bool IsConsistent( const RSCINST & rInst, - RscInconsList * pList = NULL ); + virtual sal_Bool IsConsistent( const RSCINST & rInst ); // Alles auf Default setzen virtual void SetToDefault( const RSCINST & rInst ); @@ -245,3 +245,5 @@ public: }; #endif //_RSCTOP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx index 30f56da2cdd7..0ff82212bbbf 100644 --- a/rsc/inc/rsctree.hxx +++ b/rsc/inc/rsctree.hxx @@ -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. @@ -116,3 +117,5 @@ public: }; #endif // _RSCTREE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 11b3f57c1dd2..2189340bc74d 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -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. @@ -33,6 +34,7 @@ #include <tools/wintypes.hxx> #include <tools/fldunit.hxx> #include <tools/mapunit.hxx> +#include <tools/wintypes.hxx> // from vcl/inc/vclenum.hxx #ifndef ENUM_TIMEFIELDFORMAT_DECLARED @@ -170,3 +172,5 @@ typedef sal_uInt16 SymbolType; #define SYMBOL_NOSYMBOL (SYMBOL_DONTKNOW) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx index 7afde9e7c65b..5e6faeb47c22 100644 --- a/rsc/source/misc/rscdbl.cxx +++ b/rsc/source/misc/rscdbl.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. @@ -40,15 +41,11 @@ |* |* RscTypCont::FillNameIdList() |* -|* Beschreibung -|* Ersterstellung MM 07.05.91 -|* Letzte Aenderung MM 30.05.91 -|* *************************************************************************/ REResourceList * InsertList( Atom nClassName, const RscId& rId, - REResourceList * pList ){ + REResourceList * pList ) { REResourceList * pSubList; - const char * pStrClass; + const char * pStrClass; ByteString aStrClass; pStrClass = pHS->getString( nClassName ).getStr(); @@ -59,8 +56,7 @@ REResourceList * InsertList( Atom nClassName, const RscId& rId, pSubList = new REResourceList( pList, aStrClass, rId ); - pList->Insert( pSubList, 0xFFFFFFFF ); - return( pSubList ); + return pSubList; } void FillSubList( RSCINST & rInst, REResourceList * pList ) @@ -117,3 +113,5 @@ void FillList( RscTop * pRscTop, REResourceList * pList, sal_uLong lFileKey ){ void RscTypCont::FillNameIdList( REResourceList * pList, sal_uLong lFileKey ){ FillList( pRoot, pList, lFileKey ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx index ec70635efc44..132b0ae1bcd3 100644 --- a/rsc/source/misc/rsclst.cxx +++ b/rsc/source/misc/rsclst.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. @@ -49,3 +50,5 @@ REResourceList :: REResourceList( REResourceList* pParentList, REResourceList :: ~REResourceList() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index ed63510737aa..23337514b2c5 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.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. @@ -43,10 +44,6 @@ |* |* ERRTYPE::operator = ; |* -|* Beschreibung -|* Ersterstellung MM 25.09.91 -|* Letzte Aenderung MM 25.09.91 -|* *************************************************************************/ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) { @@ -61,10 +58,6 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) |* |* RscError::StdOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) { @@ -81,10 +74,6 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) |* |* RscError::StdErr(); |* -|* Beschreibung -|* Ersterstellung PL 11/07/2001 -|* Letzte Aenderung PL 11/07/2001 -|* *************************************************************************/ void RscError::StdErr( const char * pStr ) { @@ -96,10 +85,6 @@ void RscError::StdErr( const char * pStr ) |* |* RscError::LstOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::LstOut( const char * pStr ){ if( fListing && pStr ) @@ -110,10 +95,6 @@ void RscError::LstOut( const char * pStr ){ |* |* RscError::StdLstOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::StdLstOut( const char * pStr ){ StdOut( pStr ); @@ -124,10 +105,6 @@ void RscError::StdLstOut( const char * pStr ){ |* |* RscError::StdLstErr(); |* -|* Beschreibung -|* Ersterstellung PL 11/07/2001 -|* Letzte Aenderung PL 11/07/2001 -|* *************************************************************************/ void RscError::StdLstErr( const char * pStr ){ StdErr( pStr ); @@ -138,10 +115,6 @@ void RscError::StdLstErr( const char * pStr ){ |* |* RscError::WriteError(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) { @@ -407,10 +380,6 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) |* |* RscErrorFormat() |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, const RscId & aId ){ @@ -469,10 +438,6 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, |* |* RscError::Error() |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, const RscId & aId, const char * pMessage ) @@ -492,10 +457,6 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, |* |* RscError::FatalError(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 -|* *************************************************************************/ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, const char * pMessage ) @@ -512,3 +473,4 @@ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, exit( 1 ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 51df773ef182..a71b4a51eea2 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.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. @@ -38,6 +39,7 @@ #include <tools/rc.h> #include <tools/isofallback.hxx> #include <rtl/strbuf.hxx> +#include <sal/macros.h> // Programmabhaengige Includes. #include <rsctree.hxx> @@ -46,16 +48,13 @@ #include <rscdb.hxx> #include <rscrsc.hxx> -using namespace rtl; +using ::rtl::OString; +using ::rtl::OStringBuffer; /************************************************************************* |* |* RscTypCont :: RscTypCont |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ RscTypCont :: RscTypCont( RscError * pErrHdl, RSCBYTEORDER_TYPE nOrder, @@ -184,10 +183,6 @@ Atom RscTypCont::AddLanguage( const char* pLang ) |* |* RscTypCont :: ~RscTypCont |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ){ if( pObjNode ){ @@ -231,9 +226,6 @@ void Pre_dtorTree( RscTop * pRscTop ){ } RscTypCont :: ~RscTypCont(){ - RscTop * pRscTmp; - RscSysEntry * pSysEntry; - // Alle Unterbaeume loeschen aVersion.pClass->Destroy( aVersion ); rtl_freeMemory( aVersion.pData ); @@ -241,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(); @@ -263,21 +252,20 @@ 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; - }; + for ( size_t i = 0, n = aSysLst.size(); i < n; ++i ) + delete aSysLst[ i ]; + aSysLst.clear(); } void RscTypCont::ClearSysNames() { - RscSysEntry * pSysEntry; - while( NULL != (pSysEntry = aSysLst.Remove()) ){ - delete pSysEntry; - }; + for ( size_t i = 0, n = aSysLst.size(); i < n; ++i ) + delete aSysLst[ i ]; + aSysLst.clear(); } //======================================================================= @@ -316,12 +304,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; } @@ -330,10 +317,6 @@ RscTop * RscTypCont::SearchType( Atom nId ) |* |* RscTypCont :: Search |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ RscTop * RscTypCont :: Search( Atom nRT ){ return( (RscTop *)pRoot->Search( nRT ) ); @@ -355,10 +338,6 @@ CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){ |* |* RscTypCont :: Delete() |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 -|* *************************************************************************/ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){ ObjNode * pObjNode; @@ -388,29 +367,29 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){ |* |* RscTypCont :: PutSysName() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, sal_uInt32 nConst, sal_uInt32 nId, sal_Bool bFirst ) { - RscSysEntry * pSysEntry; + RscSysEntry *pSysEntry; + RscSysEntry *pFoundEntry = NULL; sal_Bool bId1 = sal_False; - pSysEntry = aSysLst.First(); - while( pSysEntry ) + for ( size_t i = 0, n = aSysLst.size(); i < n; ++i ) { + pSysEntry = aSysLst[ i ]; if( pSysEntry->nKey == 1 ) bId1 = sal_True; if( !strcmp( pSysEntry->aFileName.GetBuffer(), pFileName ) ) - if( pSysEntry->nRscTyp == nRscTyp - && pSysEntry->nTyp == nConst - && pSysEntry->nRefId == nId ) + if( pSysEntry->nRscTyp == nRscTyp + && pSysEntry->nTyp == nConst + && pSysEntry->nRefId == nId + ) { + pFoundEntry = pSysEntry; break; - pSysEntry = aSysLst.Next(); + } } + pSysEntry = pFoundEntry; if ( !pSysEntry || (bFirst && !bId1) ) { @@ -423,10 +402,10 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, if( bFirst && !bId1 ) { pSysEntry->nKey = 1; - aSysLst.Insert( pSysEntry, (sal_uLong)0 ); + aSysLst.insert( aSysLst.begin(), pSysEntry ); } else - aSysLst.Insert( pSysEntry, LIST_APPEND ); + aSysLst.push_back( pSysEntry ); } return pSysEntry->nKey; @@ -436,10 +415,6 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, |* |* RscTypCont :: WriteInc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 21.06.90 -|* Letzte Aenderung MM 21.06.90 -|* *************************************************************************/ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) { @@ -467,9 +442,9 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) pFName = aFileTab.Get( lFileKey ); if( pFName ) { - pDep = pFName->First(); - while( pDep ) + for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i ) { + pDep = pFName->aDepLst[ i ]; if( pDep->GetFileKey() != lFileKey ) { pFile = aFileTab.GetFile( pDep->GetFileKey() ); @@ -480,7 +455,6 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) pFile->aFileName.GetBuffer() ); } } - pDep = pFName->Next(); }; }; }; @@ -490,10 +464,6 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) |* |* RscTypCont :: Methoden die ueber all Knoten laufen |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ class RscEnumerateObj @@ -544,10 +514,6 @@ public: |* |* RscEnumerateObj :: CallBackWriteRc |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) { @@ -567,10 +533,6 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) |* |* RscEnumerateObj :: CallBackWriteSrc |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) { @@ -588,10 +550,6 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) |* |* RscEnumerateObj :: CallBackWriteCxx |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) { @@ -607,10 +565,6 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) |* |* RscEnumerateObj :: CallBackWriteHxx |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) { @@ -626,10 +580,6 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) |* |* RscEnumerateObj :: WriteRcFile |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){ // Definition der Struktur, aus denen die Resource aufgebaut ist @@ -747,10 +697,6 @@ public: |* |* RscRscEnumerateRef :: CallBack... |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef ) { @@ -795,10 +741,6 @@ IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef ) |* |* RscTypCont :: WriteRc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 22.07.91 -|* *************************************************************************/ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) @@ -824,10 +766,6 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) |* |* RscTypCont :: WriteSrc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, CharSet /*nCharSet*/, sal_Bool bName ) @@ -836,7 +774,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, RscEnumerateRef aEnumRef( this, pRoot, fOutput ); unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf }; - fwrite( aUTF8BOM, sizeof(unsigned char), sizeof(aUTF8BOM)/sizeof(aUTF8BOM[0]), fOutput ); + fwrite( aUTF8BOM, sizeof(unsigned char), SAL_N_ELEMENTS(aUTF8BOM), fOutput ); if( bName ) { WriteInc( fOutput, nFileKey ); @@ -882,10 +820,6 @@ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, |* |* RscTypCont :: WriteHxx |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 -|* *************************************************************************/ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey ) { @@ -948,10 +882,6 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey ) |* |* RscTypCont :: WriteCxx |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 -|* *************************************************************************/ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey, const ByteString & rHxxName ) @@ -985,15 +915,11 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey, |* |* RscTypCont :: WriteSyntax |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 -|* *************************************************************************/ 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(); } @@ -1012,10 +938,6 @@ void RscTypCont::WriteRcCtor |* |* RscTypCont :: Delete() |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ class RscDel { @@ -1051,61 +973,56 @@ void RscTypCont :: Delete( sal_uLong lFileKey ){ |* |* RscTypCont :: MakeConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ -sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop, - RscInconsList * pList ) +sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop ) { sal_Bool bRet = sal_True; if( pObjNode ){ RSCINST aTmpI; - if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop, pList ) ) + if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop ) ) bRet = sal_False; aTmpI.pClass = pRscTop; aTmpI.pData = pObjNode->GetRscObj(); - if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) ) + if( ! aTmpI.pClass->IsConsistent( aTmpI ) ) bRet = sal_False; - if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop, pList ) ) + if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) ) bRet = sal_False; }; return( bRet ); } -sal_Bool MakeConsistent( RscTop * pRscTop, RscInconsList * pList ) +sal_Bool MakeConsistent( RscTop * pRscTop ) { sal_Bool bRet = sal_True; if( pRscTop ){ - if( ! ::MakeConsistent( (RscTop*)pRscTop->Left(), pList ) ) + if( ! ::MakeConsistent( (RscTop*)pRscTop->Left() ) ) bRet = sal_False; if( pRscTop->GetObjNode() ){ if( ! pRscTop->GetObjNode()->IsConsistent() ){ pRscTop->GetObjNode()->OrderTree(); - if( ! pRscTop->GetObjNode()->IsConsistent( pList ) ) + if( ! pRscTop->GetObjNode()->IsConsistent() ) bRet = sal_False; } - if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop, pList ) ) + if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) ) bRet = sal_False; } - if( ! ::MakeConsistent( (RscTop*)pRscTop->Right(), pList ) ) + if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) ) bRet = sal_False; }; return bRet; } -sal_Bool RscTypCont :: MakeConsistent( RscInconsList * pList ){ - return( ::MakeConsistent( pRoot, pList ) ); +sal_Bool RscTypCont :: MakeConsistent(){ + return( ::MakeConsistent( pRoot ) ); } sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey ) @@ -1114,3 +1031,4 @@ sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey ) return nPMId++; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 75239f82e55b..f2456cfca257 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.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. @@ -49,7 +50,7 @@ #include "rsclex.hxx" #include <yyrscyacc.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> /****************** M A C R O S ******************************************/ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) @@ -77,7 +78,7 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) |* Beschreibung *************************************************************************/ -typedef std::hash_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; +typedef boost::unordered_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; static langmap ULong_Iso_map; sal_uInt32 GetLangId( const ByteString& aLang ) @@ -215,10 +216,6 @@ RscEnum * RscTypCont::InitLangType() |* |* RscTypCont::InitFieldUnitsType() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitFieldUnitsType() { @@ -237,6 +234,9 @@ RscEnum * RscTypCont::InitFieldUnitsType() SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT ); SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE ); SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM ); + // Amelia : adds two units ,"char" and "line" + SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR ); + SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE ); SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT ); return pFieldUnits; @@ -246,10 +246,6 @@ RscEnum * RscTypCont::InitFieldUnitsType() |* |* RscTypCont::InitTimeFieldFormat() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitTimeFieldFormat() { @@ -268,10 +264,6 @@ RscEnum * RscTypCont::InitTimeFieldFormat() |* |* RscTypCont::InitColor() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitColor(){ RscEnum * pColor; @@ -301,10 +293,6 @@ RscEnum * RscTypCont::InitColor(){ |* |* RscTypCont::InitMapUnit() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitMapUnit(){ RscEnum * pMapUnit; @@ -331,10 +319,6 @@ RscEnum * RscTypCont::InitMapUnit(){ |* |* RscTypCont::InitKey() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitKey(){ RscEnum * pKey; @@ -455,10 +439,6 @@ RscEnum * RscTypCont::InitKey(){ |* |* RscTypCont::InitTriState() |* -|* Beschreibung -|* Ersterstellung MM 26.11.91 -|* Letzte Aenderung MM 26.11.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitTriState(){ RscEnum * pTriState; @@ -475,10 +455,6 @@ RscEnum * RscTypCont::InitTriState(){ |* |* RscTypCont::InitMessButtons() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitMessButtons() { @@ -497,10 +473,6 @@ RscEnum * RscTypCont::InitMessButtons() |* |* RscTypCont::InitMessDefButton() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscEnum * RscTypCont::InitMessDefButton(){ RscEnum * pMessDefButton; @@ -520,10 +492,6 @@ RscEnum * RscTypCont::InitMessDefButton(){ |* |* RscTypCont::InitGeometry() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscTupel * RscTypCont::InitGeometry() { @@ -549,10 +517,6 @@ RscTupel * RscTypCont::InitGeometry() |* |* RscTypCont::InitLangGeometry() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo ) { @@ -563,10 +527,6 @@ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo ) |* |* RscTypCont::InitStringList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscCont * RscTypCont::InitStringList() { @@ -582,10 +542,6 @@ RscCont * RscTypCont::InitStringList() |* |* RscTypCont::InitLangStringList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) { @@ -597,10 +553,6 @@ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) |* |* RscTypCont::InitStringTupel() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscTupel * RscTypCont::InitStringTupel() { @@ -621,10 +573,6 @@ RscTupel * RscTypCont::InitStringTupel() |* |* RscTypCont::InitStringLongTupel() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ RscTupel * RscTypCont::InitStringLongTupel() { @@ -645,10 +593,6 @@ RscTupel * RscTypCont::InitStringLongTupel() |* |* RscTypCont::InitStringTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) { @@ -664,10 +608,6 @@ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) |* |* RscTypCont::InitStringLongTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) { @@ -683,10 +623,6 @@ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) |* |* RscTypCont::InitLangStringTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst ) { @@ -698,10 +634,6 @@ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst ) |* |* RscTypCont::InitLangStringLongTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 -|* *************************************************************************/ RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst ) { @@ -709,3 +641,4 @@ RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst ) RSC_NOTYPE, pStrLongTupelLst, &aLangType ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 45e8d5aac301..072f1f085649 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.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. @@ -54,10 +55,9 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, RscClient * pClient; // Clientvariablen einfuegen - aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, - &aWinBits, nVal ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal ) + ); Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME ); pClass->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nWinBitVarId ); @@ -75,9 +75,7 @@ RscTop * RscTypCont::InitClassMgr() RscBaseCont * pClass; Atom nId; - aBaseLst.Insert( pClass = - new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, sal_False ), - LIST_APPEND ); + aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, sal_False ) ); nId = pHS->getID( "Resource" ); pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass ); @@ -89,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 ); @@ -220,7 +215,7 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma RscCont * pCont = new RscCont( pHS->getID( "sal_uInt16 *" ), 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 ); @@ -255,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" ); @@ -270,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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nDisableId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nOutputSizeId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nOutputSizeId ) + ); nId = aNmTb.Put( "OutputSize", VARNAME ); pClassWindow->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nVarId ); @@ -329,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 ); @@ -393,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 ); @@ -587,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 ); @@ -963,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" ); @@ -981,27 +967,24 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) VAR_HIDDEN | VAR_NOENUM ); // Clientvariablen einfuegen - aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, - pFlag, nShiftId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nMod1Id ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nMod2Id ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod2Id ) + ); nId = aNmTb.Put( "Modifier2", VARNAME ); pClassKeyCode->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nVarId ); @@ -1010,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 ); @@ -1087,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 ); @@ -1127,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" ); @@ -1150,42 +1128,37 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, RSC_MENUITEM_STATUS ); // Clientvariablen einfuegen - aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, - pFlag, nCheckableId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nAutoCheckId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nRadioCheckId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nAboutId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, nHelpId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nHelpId ) + ); nId = aNmTb.Put( "Help", VARNAME ); pClassMenuItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nVarId ); @@ -1238,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 ); @@ -1935,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 ); @@ -1953,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" ); @@ -1978,39 +1945,39 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, RSC_TOOLBOXITEM_STATUS ); // Clientvariablen einfuegen - aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nCheckableId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nAutoCheckId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nRadioCheckId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nLeftId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nAutoSizeId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_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( "sal_Bool" ), RSC_NOTYPE, - pFlag, l_nDropDownId ), LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nDropDownId ) + ); nId = aNmTb.Put( "DropDown", VARNAME ); pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); } @@ -2069,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 ); @@ -2084,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 ); @@ -2116,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 ); @@ -2218,6 +2181,7 @@ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, INS_WINBIT(pClassFloatingWindow,Zoomable) INS_WINBIT(pClassFloatingWindow,HideWhenDeactivate) INS_WINBIT(pClassFloatingWindow,EnableResizing) + INS_WINBIT(pClassFloatingWindow,StdPopup) return pClassFloatingWindow; } @@ -2269,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, @@ -2321,7 +2283,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, @@ -2351,10 +2313,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 ); @@ -2386,3 +2347,4 @@ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index a686fbb5a101..c16c9826dbf7 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.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. @@ -84,10 +85,6 @@ void NameToVerCtrl( RSCINST & aVersion, RscTop * pClass, |* |* RscTypCont::Init() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 -|* *************************************************************************/ void RscTypCont::Init() { @@ -374,35 +371,31 @@ void RscTypCont::Init() aWinBits.SetConstant( nVertId, sal::static_int_cast<sal_Int32>(WB_VERT) ); nSysWinId = pHS->getID( "WB_SYSTEMWINDOW" ); aWinBits.SetConstant( nSysWinId, sal::static_int_cast<sal_Int32>(WB_SYSTEMWINDOW) ); + nStdPopupId = pHS->getID( "WB_STDPOPUP" ); + aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<sal_Int32>(WB_STDPOPUP) ); } { /********** 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 ******************************/ @@ -473,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 @@ -606,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 ***************************************/ @@ -701,10 +694,9 @@ void RscTypCont::Init() // Clientvariablen einfuegen // Sysmodal - aBaseLst.Insert( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, - &aWinBits, nRepeatId ), - LIST_APPEND ); + aBaseLst.push_back( + pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nRepeatId ) + ); nId = aNmTb.Put( "Repeat", VARNAME ); pClassSpinButton->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nWinBitVarId ); @@ -729,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 ); @@ -737,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 ); @@ -745,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 ); @@ -755,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 ); @@ -769,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 ); @@ -778,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 ); @@ -786,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 ); @@ -794,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 ); @@ -804,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 ); @@ -814,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 ); @@ -827,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 ); @@ -836,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 ); @@ -939,3 +931,4 @@ void RscTypCont::Init() aNmTb.SetSort(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 2108b0f349dc..e6e1559a4130 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.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. @@ -44,18 +45,14 @@ /****************** C o d e **********************************************/ /****************** keyword sort function ********************************/ extern "C" { -#if defined( ZTC ) && defined( PM2 ) - int __CLIB KeyCompare( const void * pFirst, const void * pSecond ); -#else -#if defined( WNT ) && !defined( WTC ) && !defined (ICC) +#if defined( WNT ) && !defined (ICC) int _cdecl KeyCompare( const void * pFirst, const void * pSecond ); #else int KeyCompare( const void * pFirst, const void * pSecond ); #endif -#endif } -#if defined( WNT ) && !defined( WTC ) && !defined(ICC) +#if defined( WNT ) && !defined(ICC) int _cdecl KeyCompare( const void * pFirst, const void * pSecond ){ #else int KeyCompare( const void * pFirst, const void * pSecond ){ @@ -72,10 +69,6 @@ int KeyCompare( const void * pFirst, const void * pSecond ){ |* |* RscNameTable::RscNameTable() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 28.02.91 -|* Letzte Aenderung MM 28.02.91 -|* *************************************************************************/ RscNameTable::RscNameTable() { bSort = sal_True; @@ -87,10 +80,6 @@ RscNameTable::RscNameTable() { |* |* RscNameTable::~RscNameTable() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ RscNameTable::~RscNameTable() { if( pTable ) @@ -102,10 +91,6 @@ RscNameTable::~RscNameTable() { |* |* RscNameTable::SetSort() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 28.02.91 -|* Letzte Aenderung MM 28.02.91 -|* *************************************************************************/ void RscNameTable::SetSort( sal_Bool bSorted ){ bSort = bSorted; @@ -120,10 +105,6 @@ void RscNameTable::SetSort( sal_Bool bSorted ){ |* |* RscNameTable::Put() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 28.02.91 -|* Letzte Aenderung MM 28.02.91 -|* *************************************************************************/ Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, long nValue ){ if( pTable ) @@ -175,10 +156,6 @@ Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass ) |* |* RscNameTable::Get() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 28.02.91 -|* Letzte Aenderung MM 28.02.91 -|* *************************************************************************/ sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ KEY_STRUCT * pKey = NULL; @@ -212,3 +189,4 @@ sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ return( sal_False ); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index c8e02d792c6b..0f59c7ab4cdf 100755 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.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. @@ -48,14 +49,17 @@ #include <rtl/textcvt.h> #include <rtl/textenc.h> +#include <tools/list.hxx> -using namespace rtl; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OStringHash; const char* StringContainer::putString( const char* pString ) { OString aString( static_cast<const sal_Char*>(pString) ); std::pair< - std::hash_set< OString, OStringHash >::iterator, + boost::unordered_set< OString, OStringHash >::iterator, bool > aInsert = m_aStrings.insert( aString ); @@ -117,7 +121,6 @@ sal_uInt32 GetNumber(){ int MakeToken( YYSTYPE * pTokenVal ){ int c1; - char * pStr; while( sal_True ){ // Kommentare und Leerzeichen ueberlesen while( isspace( c ) ) @@ -199,7 +202,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ else aBuf.append( sal_Char(c) ); } - pStr = pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() )); + pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() )); return( STRING ); } if (isdigit (c)){ @@ -300,7 +303,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ return( c1 ); } -#if defined( RS6000 ) || defined( HP9000 ) || defined( SCO ) +#if defined( RS6000 ) extern "C" int yylex() #else int yylex() @@ -319,7 +322,7 @@ int yylex() /****************** yyerror **********************************************/ #ifdef RS6000 extern "C" void yyerror( char* pMessage ) -#elif defined HP9000 || defined SCO || defined SOLARIS +#elif defined SOLARIS extern "C" void yyerror( const char* pMessage ) #else void yyerror( char* pMessage ) @@ -445,3 +448,4 @@ RscExpression * MacroParser( RscFileInst & rFileInst ) return( pExpression ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx index ebda82aa4fdd..c861e89402f6 100644 --- a/rsc/source/parser/rsclex.hxx +++ b/rsc/source/parser/rsclex.hxx @@ -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. @@ -26,14 +27,14 @@ ************************************************************************/ #include <tools/stack.hxx> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> // a buffer for unique strings class StringContainer { - std::hash_set< rtl::OString, rtl::OStringHash > m_aStrings; + boost::unordered_set< rtl::OString, rtl::OStringHash > m_aStrings; public: StringContainer() {} ~StringContainer() {} @@ -104,12 +105,12 @@ class ObjectStack { extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( char * ); extern "C" int yylex( void ); -#elif defined( HP9000 ) || defined( SCO ) || defined ( SOLARIS ) +#elif defined ( SOLARIS ) extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); extern "C" int yylex( void ); #else -#if defined ( WTC ) || defined ( GCC ) || (_MSC_VER >= 1400) +#if defined ( GCC ) || (_MSC_VER >= 1400) int yyparse(); // forward Deklaration fuer erzeugte Funktion #else yyparse(); // forward Deklaration fuer erzeugte Funktion @@ -126,3 +127,5 @@ extern RscFileInst * pFI; extern RscExpression * pExp; extern ObjectStack S; extern StringContainer* pStringContainer; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index c7c09f8275da..fc3c44c8754d 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.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. @@ -39,10 +40,6 @@ |* |* RscFileInst::Init() |* -|* Beschreibung -|* Ersterstellung MM 05.11.91 -|* Letzte Aenderung MM 17.02.93 -|* *************************************************************************/ void RscFileInst::Init() { @@ -59,10 +56,6 @@ void RscFileInst::Init() |* |* RscFileInst::RscFileInst() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 -|* *************************************************************************/ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, sal_uLong lFIndex, FILE * fFile ) @@ -100,10 +93,6 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, |* |* RscFileInst::~RscFileInst() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 -|* *************************************************************************/ RscFileInst::~RscFileInst(){ if( pInput ) @@ -116,10 +105,6 @@ RscFileInst::~RscFileInst(){ |* |* RscFileInst::GetChar() |* -|* Beschreibung -|* Ersterstellung MM 01.06.91 -|* Letzte Aenderung MM 09.08.91 -|* *************************************************************************/ int RscFileInst::GetChar() { @@ -142,10 +127,6 @@ int RscFileInst::GetChar() |* |* RscFileInst::GetNewLine() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 -|* *************************************************************************/ void RscFileInst::GetNewLine() { @@ -223,10 +204,6 @@ END: |* |* RscFileInst::SetError() |* -|* Beschreibung -|* Ersterstellung MM 05.11.91 -|* Letzte Aenderung MM 05.11.91 -|* *************************************************************************/ void RscFileInst::SetError( ERRTYPE aError ) { @@ -237,3 +214,5 @@ void RscFileInst::SetError( ERRTYPE aError ) nErrorPos = GetScanPos() -1; }; }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index 63be87f43649..efef5f3b42ff 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.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. @@ -32,6 +33,7 @@ #include <string.h> #include <tools/rc.h> +#include <tools/list.hxx> #include <rscerror.h> #include <rsctools.hxx> #include <rscclass.hxx> @@ -258,10 +260,11 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) #if defined _MSC_VER #pragma warning(push, 1) -#pragma warning(disable:4129 4273 4701) +#pragma warning(disable:4129 4273 4701 4702) #endif #include "yyrscyacc.cxx" #if defined _MSC_VER #pragma warning(pop) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index 67d86a8b35cf..42d45caeb433 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.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. @@ -42,15 +43,11 @@ static RscCompiler * pRscCompiler = NULL; /* */ /* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ -#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) +#if defined( UNX ) || defined ( GCC ) || defined(__MINGW32__) void ExitProgram( void ){ #else -#if defined( CSET ) - void _Optlink ExitProgram( void ){ -#else void cdecl ExitProgram( void ){ #endif -#endif if( pRscCompiler ) delete pRscCompiler; } @@ -71,12 +68,8 @@ RscVerbosity lcl_determineVerbosity( int argc, char ** argv ) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { #ifndef UNX -#ifdef CSET - atexit( ExitProgram ); -#else atexit( ExitProgram ); #endif -#endif #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "debugging %s\n", argv[0] ); #endif @@ -85,11 +78,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { InitRscCompiler(); RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) ); -#ifdef MTW - RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl ); -#else RscCmdLine* pCmdLine = new RscCmdLine( argc, argv, pErrHdl ); -#endif RscTypCont* pTypCont = new RscTypCont( pErrHdl, pCmdLine->nByteOrder, pCmdLine->aPath, @@ -124,3 +113,5 @@ void RscExit( sal_uInt32 nExit ) printf( "Program exit is %ud\n", (unsigned int)nExit ); exit( nExit ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index 89b00a779d3b..b8e0224a5cd0 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -42,24 +42,16 @@ OBJFILES= $(OBJ)$/gui.obj \ $(OBJ)$/start.obj APP1TARGET= rsc -APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB) +APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB) APP1LIBS= $(LB)$/rsctoo.lib APP1OBJS= $(OBJ)$/start.obj .IF "$(GUI)" != "OS2" -# why not this way? APP1STACK=64000 -#APP1STACK=32768 .ENDIF APP1RPATH=NONE APP2TARGET= rsc2 -.IF "$(OS)"=="SCO" -# SCO hat Probleme mit fork/exec und einigen shared libraries. -# rsc2 muss daher statisch gelinkt werden -APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(VOSLIB) $(OSLLIB) $(RTLLIB) $(DYNAMIC) -.ELSE -APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(VOSLIB) $(SALLIB) # $(RTLLIB) -.ENDIF +APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB) APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscres.lib \ $(LB)$/rscpar.lib \ @@ -67,9 +59,7 @@ APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscmis.lib APP2OBJS= $(OBJ)$/gui.obj .IF "$(GUI)" != "OS2" -# why not this way? APP2STACK=64000 -#APP2STACK=32768 .ENDIF APP2RPATH=NONE diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index e25f68cff10a..532851ffbdea 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.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. @@ -32,10 +33,6 @@ #include <stdio.h> #include <fcntl.h> #include <string.h> -#if defined (WNT) && defined (tcpp) -#define _spawnvp spawnvp -#define _P_WAIT P_WAIT -#endif #ifdef UNX #include <unistd.h> @@ -47,7 +44,7 @@ #if defined ( OS2 ) && !defined ( GCC ) #include <direct.h> #endif -#if !defined ( CSET ) && !defined ( OS2 ) +#if !defined ( OS2 ) #include <dos.h> #endif @@ -174,14 +171,8 @@ static sal_Bool CallPrePro( const ByteString& rPrePro, } } -#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 +#if defined UNX || defined OS2 nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); -#elif defined CSET - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); -#elif defined WTC - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() ); -#elif defined MTW - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (char**)pCmdL->GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #endif @@ -209,7 +200,7 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, ByteString aSrsName, RscPtrPtr * pCmdLine ) { - int i, nExit; + int nExit; ByteString* pString; ByteString aRspFileName; // Response-Datei FILE * fRspFile; // Response-Datei @@ -220,7 +211,7 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, RscVerbosity eVerbosity = RscVerbosityNormal; if( fRspFile ) { - for( i = 1; i < (int)(pCmdLine->GetCount() -1); i++ ) + for (int i = 1; i < (int)(pCmdLine->GetCount() -1); ++i) { if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) ) { @@ -258,18 +249,17 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, #ifdef OS2 fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() ); #else - fprintf( fRspFile, aSrsName.GetBuffer() ); + fprintf( fRspFile, "%s", aSrsName.GetBuffer() ); #endif - pString = pInputList->First(); - while( pString ) + for ( size_t i = 0, n = pInputList->size(); i < n; ++i ) { + pString = (*pInputList)[ i ]; #ifdef OS2 fprintf( fRspFile, "%s\n", pString->GetBuffer() ); #else fprintf( fRspFile, " %s", pString->GetBuffer() ); #endif - pString = pInputList->Next(); }; fclose( fRspFile ); @@ -291,14 +281,8 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, printf( "\n" ); } -#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 +#if defined UNX || defined OS2 nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() ); -#elif defined CSET - nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() ); -#elif defined WTC - nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char* const*)aNewCmdL.GetBlock() ); -#elif defined MTW - nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char**)aNewCmdL.GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() ); #endif @@ -318,15 +302,10 @@ static sal_Bool CallRsc2( ByteString aRsc2Name, |* |* main() |* -|* Beschreibung -|* Ersterstellung MM 05.09.91 -|* Letzte Aenderung MM 05.09.91 -|* *************************************************************************/ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { sal_Bool bPrePro = sal_True; - sal_Bool bResFile = sal_True; sal_Bool bHelp = sal_False; sal_Bool bError = sal_False; sal_Bool bResponse = sal_False; @@ -372,11 +351,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { // kein Preprozessor bPrePro = sal_False; } - else if( !rsc_stricmp( (*ppStr) + 1, "r" ) - || !rsc_stricmp( (*ppStr) + 1, "s" ) ) - { // erzeugt kein .res-file - bResFile = sal_False; - } else if( !rsc_stricmp( (*ppStr) + 1, "h" ) ) { // Hilfe anzeigen bHelp = sal_True; @@ -406,36 +380,33 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) else { // Eingabedatei - aInputList.Insert( new ByteString( *ppStr ), CONTAINER_APPEND ); + aInputList.push_back( new ByteString( *ppStr ) ); } ppStr++; i++; } - if( aInputList.Count() ) + if( !aInputList.empty() ) { /* build the output file names */ if( ! aResName.Len() ) - aResName = OutputFile( *aInputList.First(), "res" ); + aResName = OutputFile( *aInputList[ 0 ], "res" ); if( ! bSetSrs ) { aSrsName = "-fp="; - aSrsName += OutputFile( *aInputList.First(), "srs" ); + aSrsName += OutputFile( *aInputList[ 0 ], "srs" ); } }; if( bHelp ) - { bPrePro = sal_False; - bResFile = sal_False; - }; - if( bPrePro && aInputList.Count() ) + if( bPrePro && !aInputList.empty() ) { ByteString aTmpName; - pString = aInputList.First(); - while( pString ) + for ( size_t k = 0, n = aInputList.size(); k < n; ++k ) { + pString = aInputList[ k ]; aTmpName = ::GetTmpFileName(); if( !CallPrePro( aPrePro, *pString, aTmpName, &aCmdLine, bResponse ) ) { @@ -443,8 +414,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) bError = sal_True; break; } - aTmpList.Insert( new ByteString( aTmpName ), CONTAINER_APPEND ); - pString = aInputList.Next(); + aTmpList.push_back( new ByteString( aTmpName ) ); }; }; @@ -461,16 +431,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) }; }; - pString = aTmpList.First(); - while( pString ) - { - #if OSL_DEBUG_LEVEL > 5 - fprintf( stderr, "leaving temp file %s\n", pString->GetBuffer() ); - #else - unlink( pString->GetBuffer() ); - #endif - pString = aTmpList.Next(); - }; + for ( size_t k = 0, n = aTmpList.size(); k < n; ++k ) + unlink( aTmpList[ k ]->GetBuffer() ); return( bError ); } @@ -481,3 +443,5 @@ void RscExit( sal_uInt32 nExit ) printf( "Program exit is %d\n", (int)nExit ); exit( nExit ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index d4f28f598e3f..26193d4cae51 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.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. @@ -62,3 +63,4 @@ void InitRscCompiler() pHS = new AtomContainer(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index cda959ebb79c..656bcfc7a1d3 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.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. @@ -36,9 +37,7 @@ // Programmabhaengige Includes. #include <rscconst.hxx> -#ifndef _RSCSARRAY_HXX #include <rscarray.hxx> -#endif #include <rscdb.hxx> /****************** C O D E **********************************************/ @@ -47,10 +46,6 @@ |* |* RscInstNode::RscInstNode() |* -|* Beschreibung -|* Ersterstellung MM 06.08.91 -|* Letzte Aenderung MM 06.08.91 -|* *************************************************************************/ RscInstNode::RscInstNode( sal_uInt32 nId ) { @@ -61,10 +56,6 @@ RscInstNode::RscInstNode( sal_uInt32 nId ) |* |* RscInstNode::~RscInstNode() |* -|* Beschreibung -|* Ersterstellung MM 06.08.91 -|* Letzte Aenderung MM 06.08.91 -|* *************************************************************************/ RscInstNode::~RscInstNode() { @@ -79,10 +70,6 @@ RscInstNode::~RscInstNode() |* |* RscInstNode::GetId() |* -|* Beschreibung -|* Ersterstellung MM 06.08.91 -|* Letzte Aenderung MM 06.08.91 -|* *************************************************************************/ sal_uInt32 RscInstNode::GetId() const { @@ -94,10 +81,6 @@ sal_uInt32 RscInstNode::GetId() const |* |* RscArray::RscArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscArray::RscArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) : RscTop( nId, nTypeId, pSuper ) @@ -111,10 +94,6 @@ RscArray::RscArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTy |* |* RscArray::~RscArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscArray::~RscArray() { @@ -124,10 +103,6 @@ RscArray::~RscArray() |* |* RscArray::~RscArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RSCCLASS_TYPE RscArray::GetClassType() const { @@ -138,10 +113,6 @@ RSCCLASS_TYPE RscArray::GetClassType() const |* |* RscArray::GetIndexType() |* -|* Beschreibung -|* Ersterstellung MM 23.12.92 -|* Letzte Aenderung MM -|* *************************************************************************/ RscTop * RscArray::GetTypeClass() const { @@ -152,10 +123,6 @@ RscTop * RscArray::GetTypeClass() const |* |* RscArray::Create() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ static RscInstNode * Create( RscInstNode * pNode ) { @@ -326,35 +293,31 @@ ERRTYPE RscArray::GetArrayEle |* |* RscArray::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ -static sal_Bool IsConsistent( RscInstNode * pNode, RscInconsList * pList ) +static sal_Bool IsConsistent( RscInstNode * pNode ) { sal_Bool bRet = sal_True; if( pNode ) { - bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst, pList ); - if( !IsConsistent( pNode->Left(), pList ) ) + bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst ); + if( !IsConsistent( pNode->Left() ) ) bRet = sal_False; - if( !IsConsistent( pNode->Right(), pList ) ) + if( !IsConsistent( pNode->Right() ) ) bRet = sal_False; } return bRet; } -sal_Bool RscArray::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscArray::IsConsistent( const RSCINST & rInst ) { RscArrayInst * pClassData; sal_Bool bRet; - bRet = RscTop::IsConsistent( rInst, pList ); + bRet = RscTop::IsConsistent( rInst ); pClassData = (RscArrayInst *)(rInst.pData + nOffInstData); - if( !::IsConsistent( pClassData->pNode, pList ) ) + if( !::IsConsistent( pClassData->pNode ) ) bRet = sal_False; return( bRet ); @@ -364,10 +327,6 @@ sal_Bool RscArray::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) |* |* RscArray::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ static void SetToDefault( RscInstNode * pNode ) { @@ -394,10 +353,6 @@ void RscArray::SetToDefault( const RSCINST & rInst ) |* |* RscArray::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ static sal_Bool IsDefault( RscInstNode * pNode ) { @@ -431,10 +386,6 @@ sal_Bool RscArray::IsDefault( const RSCINST & rInst ) |* |* RscArray::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 15.01.92 -|* *************************************************************************/ static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) { @@ -619,10 +570,6 @@ void RscArray::WriteRcAccess |* |* RscClassArray::RscClassArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscClassArray::RscClassArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) @@ -634,10 +581,6 @@ RscClassArray::RscClassArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, |* |* RscClassArray::~RscClassArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscClassArray::~RscClassArray() { @@ -647,10 +590,6 @@ RscClassArray::~RscClassArray() |* |* RscClassArray::WriteSrcHeader() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ void RscClassArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -663,10 +602,6 @@ void RscClassArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscClassArray::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -679,10 +614,6 @@ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscClassArray::WriteRcHeader() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, @@ -697,10 +628,6 @@ ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, |* |* RscLangArray::RscLangArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscLangArray::RscLangArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) @@ -712,10 +639,6 @@ RscLangArray::RscLangArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, |* |* RscLangArray::RscLangArray() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RSCCLASS_TYPE RscLangArray::GetClassType() const { @@ -726,3 +649,4 @@ RSCCLASS_TYPE RscLangArray::GetClassType() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 465e55a1e2cd..6f2939cd2fd2 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.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. @@ -48,10 +49,6 @@ |* |* RscClass::RscClass() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) : RscTop( nId, nTypeId, pSuperCl ) @@ -66,10 +63,6 @@ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) |* |* RscClass::Pre_dtor() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ void RscClass::Pre_dtor() { @@ -94,10 +87,6 @@ void RscClass::Pre_dtor() |* |* RscClass::~RscClass() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscClass::~RscClass() { @@ -109,10 +98,6 @@ RscClass::~RscClass() |* |* RscClass::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RSCCLASS_TYPE RscClass::GetClassType() const { @@ -123,10 +108,6 @@ RSCCLASS_TYPE RscClass::GetClassType() const |* |* RscClass::GetInstData() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ RSCINST RscClass::GetInstData ( @@ -192,10 +173,6 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) |* |* RscClass::SetVarDflt() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 22.07.91 -|* *************************************************************************/ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet ) { @@ -212,10 +189,6 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet ) |* |* RscClass::IsDflt() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 08.01.92 -|* *************************************************************************/ sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) { @@ -227,15 +200,6 @@ sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) bRet = sal_True; else bRet = sal_False; -/* { - //Variablenname ist Default - RSCINST aTmpI; - - aTmpI = GetInstData( pData, nEle, sal_True ); - if( aTmpI.IsInst() && !aTmpI.pClass->IsDefault( aTmpI ) ) - bRet = sal_False; - } -*/ return bRet; } @@ -243,10 +207,6 @@ sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) |* |* RscClass::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCINST RscClass::Create ( @@ -559,13 +519,13 @@ RSCINST RscClass::GetCopyVar |* Beschreibung |* *************************************************************************/ -sal_Bool RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscClass::IsConsistent( const RSCINST & rInst ) { sal_uInt32 i = 0; RSCINST aTmpI; sal_Bool bRet; - bRet = RscTop::IsConsistent( rInst, pList ); + bRet = RscTop::IsConsistent( rInst ); for( i = 0; i < nEntries; i++ ) { @@ -574,7 +534,7 @@ sal_Bool RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) aTmpI = GetInstData( rInst.pData, i, sal_True ); if( aTmpI.IsInst() ) - if( ! aTmpI.pClass->IsConsistent( aTmpI, pList ) ) + if( ! aTmpI.pClass->IsConsistent( aTmpI ) ) bRet = sal_False; } }; @@ -1259,3 +1219,5 @@ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput, return; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx index 632633d8d542..7005c9b38f09 100644 --- a/rsc/source/res/rscclobj.cxx +++ b/rsc/source/res/rscclobj.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. @@ -45,10 +46,6 @@ |* |* RefNode::RefNode() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 -|* *************************************************************************/ RefNode::RefNode( Atom nTyp ){ pObjBiTree = 0; @@ -59,10 +56,6 @@ RefNode::RefNode( Atom nTyp ){ |* |* RefNode::GetId() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_uInt32 RefNode::GetId() const { @@ -73,10 +66,6 @@ sal_uInt32 RefNode::GetId() const |* |* RefNode::PutObjNode() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){ // insert a node in the b-tree pObjBiTree @@ -95,10 +84,6 @@ sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){ |* |* RefNode::GetObjNode() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){ // insert a node in the b-tree pObjBiTree @@ -115,10 +100,6 @@ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){ |* |* ObjNode::ObjNode() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){ pRscObj = pData; @@ -130,10 +111,6 @@ ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){ |* |* ObjNode::DelObjNode() |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){ ObjNode * pRetNode = this; @@ -164,10 +141,6 @@ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){ |* |* ObjNode::GetId() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_uInt32 ObjNode::GetId() const { @@ -178,34 +151,24 @@ sal_uInt32 ObjNode::GetId() const |* |* ObjNode::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ -sal_Bool ObjNode::IsConsistent( RscInconsList * pList ) +sal_Bool ObjNode::IsConsistent() { sal_Bool bRet = sal_True; if( (long)aRscId > 0x7FFF || (long)aRscId < 1 ) { bRet = sal_False; - if( pList ) - pList->Insert( new RscInconsistent( aRscId, aRscId ) ); } else { if( Left() ) { - if( !((ObjNode *)Left())->IsConsistent( pList ) ) + if( !((ObjNode *)Left())->IsConsistent() ) bRet = sal_False; if( ((ObjNode *)Left())->aRscId >= aRscId ) { bRet = sal_False; - if( pList ) - pList->Insert( - new RscInconsistent( ((ObjNode *)Left())->GetRscId(), - GetRscId() ) ); } }; if( Right() ) @@ -213,15 +176,13 @@ sal_Bool ObjNode::IsConsistent( RscInconsList * pList ) if( ((ObjNode *)Right())->aRscId <= aRscId ) { bRet = sal_False; - if( pList ) - pList->Insert( - new RscInconsistent( GetRscId(), - ((ObjNode *)Right())->GetRscId() ) ); } - if( !((ObjNode *)Right())->IsConsistent( pList ) ) + if( !((ObjNode *)Right())->IsConsistent() ) bRet = sal_False; }; }; return( bRet ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index c089027a9a5b..04f7b1ae00b1 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.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. @@ -49,10 +50,6 @@ |* |* RscConst::RscConst() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 -|* *************************************************************************/ RscConst::RscConst( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) @@ -65,10 +62,6 @@ RscConst::RscConst( Atom nId, sal_uInt32 nTypeId ) |* |* RscConst::~RscConst() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 -|* *************************************************************************/ RscConst::~RscConst() { @@ -80,10 +73,6 @@ RscConst::~RscConst() |* |* RscConst::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 -|* *************************************************************************/ RSCCLASS_TYPE RscConst::GetClassType() const { @@ -94,10 +83,6 @@ RSCCLASS_TYPE RscConst::GetClassType() const |* |* RscConst::SetConstance() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){ if( pVarArray ) @@ -118,10 +103,6 @@ ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){ |* |* RscConst::GetConstance() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ Atom RscConst::GetConstant( sal_uInt32 nPos ){ if( nPos < nEntries ) @@ -133,10 +114,6 @@ Atom RscConst::GetConstant( sal_uInt32 nPos ){ |* |* RscConst::GetConstValue() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const { @@ -155,10 +132,6 @@ sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const |* |* RscConst::GetValueConst() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const { @@ -180,8 +153,6 @@ sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const |* Beschreibung Sucht die Position der Konstanten |* Return = nEntries, nicht gefunden |* Return = Position im Feld -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ sal_uInt32 RscConst::GetConstPos( Atom nConst ) @@ -201,10 +172,6 @@ sal_uInt32 RscConst::GetConstPos( Atom nConst ) |* |* RscEnum::WriteSyntax() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ void RscConst::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) { @@ -240,10 +207,6 @@ void RscConst::WriteRcAccess |* |* RscEnum::RscEnum() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId ) : RscConst( nId, nTypeId ) @@ -255,10 +218,6 @@ RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId ) |* |* RscEnum::SetConst() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { @@ -278,10 +237,6 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal* |* |* RscEnum::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 18.07.91 -|* Letzte Aenderung MM 18.07.91 -|* *************************************************************************/ ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) { @@ -299,10 +254,6 @@ ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) |* |* RscEnum::GetConst() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){ *pH = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId; @@ -313,10 +264,6 @@ ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){ |* |* RscEnum::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 16.09.91 -|* Letzte Aenderung MM 16.09.91 -|* *************************************************************************/ ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){ *pNumber = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue; @@ -327,10 +274,6 @@ ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){ |* |* RscEnum::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; @@ -359,10 +302,6 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCl |* |* RscEnum::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.01.92 -|* Letzte Aenderung MM 15.01.92 -|* *************************************************************************/ sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ @@ -380,10 +319,6 @@ sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* |* RscEnum::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -396,10 +331,6 @@ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscEnum::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) @@ -413,3 +344,5 @@ RscLangEnum::RscLangEnum() mnLangId( 0x400 ) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index fabfe6bf0b17..c39be82b5c7e 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.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. @@ -45,10 +46,6 @@ |* |* ENTRYSTRUCT::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 06.08.91 -|* Letzte Aenderung MM 06.08.91 -|* *************************************************************************/ void ENTRY_STRUCT::Destroy() { @@ -64,10 +61,6 @@ void ENTRY_STRUCT::Destroy() |* |* RscBaseCont::RscBaseCont() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) @@ -85,10 +78,6 @@ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, |* |* RscBaseCont::~RscBaseCont() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RscBaseCont::~RscBaseCont() { @@ -98,10 +87,6 @@ RscBaseCont::~RscBaseCont() |* |* RscBaseCont::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ RSCCLASS_TYPE RscBaseCont::GetClassType() const { @@ -112,10 +97,6 @@ RSCCLASS_TYPE RscBaseCont::GetClassType() const |* |* DestroyElements() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) { @@ -135,10 +116,6 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) |* |* RscBaseCont::Create() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -192,10 +169,6 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, |* |* RscBaseCont::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 -|* *************************************************************************/ void RscBaseCont::Destroy( const RSCINST & rInst ){ RscBaseContInst * pClassData; @@ -210,10 +183,6 @@ void RscBaseCont::Destroy( const RSCINST & rInst ){ |* |* RscBaseCont::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 -|* *************************************************************************/ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass, sal_uInt32 nPos ) @@ -241,10 +210,6 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName |* |* RscBaseCont::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 -|* *************************************************************************/ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass ) @@ -256,10 +221,6 @@ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, |* |* RscBaseCont::GetElement() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop * pCreateClass, @@ -338,10 +299,6 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, |* |* RscBaseCont::GetCount() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ RscBaseContInst * pClassData; @@ -354,10 +311,6 @@ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ |* |* RscBaseCont::GetPosEle() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; @@ -373,10 +326,6 @@ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ |* |* RscBaseCont::MovePosEle() |* -|* Beschreibung -|* Ersterstellung MM 23.10.91 -|* Letzte Aenderung MM 23.10.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, sal_uInt32 nSourcePos ) @@ -412,10 +361,6 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, |* |* RscBaseCont::SetPosRscId() |* -|* Beschreibung -|* Ersterstellung MM 30.09.91 -|* Letzte Aenderung MM 30.09.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, const RscId & rId ){ @@ -443,10 +388,6 @@ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, |* |* RscBaseCont::GetInfoEle() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; @@ -466,10 +407,6 @@ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) |* |* RscBaseCont::SetString() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) { @@ -508,10 +445,6 @@ else |* |* RscBaseCont::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ RscBaseContInst * pClassData; @@ -627,10 +560,6 @@ else |* |* RscBaseCont::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 02.12.91 -|* Letzte Aenderung MM 02.12.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){ RscBaseContInst * pClassData; @@ -668,17 +597,13 @@ else |* |* RscBaseCont::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ -sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ +sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) { sal_uInt32 i = 0; RscBaseContInst * pClassData; sal_Bool bRet; - bRet = RscTop::IsConsistent( rInst, pList ); + bRet = RscTop::IsConsistent( rInst ); pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -689,23 +614,15 @@ sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList if( (sal_Int32)pClassData->pEntries[ i ].aName > 0x7FFF || (sal_Int32)pClassData->pEntries[ i ].aName < 1 ){ bRet = sal_False; - if( pList ) - pList->Insert( new RscInconsistent( - pClassData->pEntries[ i ].aName, - pClassData->pEntries[ i ].aName ) ); } else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName, pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() ) { bRet = sal_False; - if( pList ) - pList->Insert( new RscInconsistent( - pClassData->pEntries[ i ].aName, - pClassData->pEntries[ i +1 ].aName ) ); }; } if( ! pClassData->pEntries[ i ].aInst.pClass-> - IsConsistent( pClassData->pEntries[ i ].aInst, pList ) ) + IsConsistent( pClassData->pEntries[ i ].aInst ) ) bRet = sal_False; }; @@ -716,10 +633,6 @@ sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList |* |* RscBaseCont::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ void RscBaseCont::SetToDefault( const RSCINST & rInst ) { @@ -741,10 +654,6 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst ) |* |* RscBaseCont::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){ sal_uInt32 i = 0; @@ -770,10 +679,6 @@ sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){ |* |* RscBaseCont::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 15.01.92 -|* *************************************************************************/ sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { @@ -794,10 +699,6 @@ sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* |* RscBaseCont::Delete() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) @@ -823,10 +724,6 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, |* |* RscBaseCont::DeletePos() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; @@ -850,10 +747,6 @@ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ |* |* RscBaseCont::ContWriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -880,10 +773,6 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscBaseCont::ContWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -942,10 +831,6 @@ void RscBaseCont::ContWriteRcAccess |* |* RscBaseCont::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -959,10 +844,6 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscBaseCont::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -980,10 +861,6 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, |* |* RscBaseCont::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rRscId ) @@ -1015,10 +892,6 @@ ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput, |* |* RscBaseCont::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rRscId ) @@ -1051,10 +924,6 @@ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput, |* |* RscContWriteSrc::RscContWriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) @@ -1065,10 +934,6 @@ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, |* |* RscContWriteSrc::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -1095,10 +960,6 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscCont::RscCont() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent ) @@ -1108,10 +969,6 @@ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIde |* |* RscCont::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -1146,10 +1003,6 @@ void RscCont::WriteRcAccess |* |* RscContExtraData::RscContExtraData() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) @@ -1160,10 +1013,6 @@ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, |* |* RscContExtraData::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 -|* *************************************************************************/ ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -1177,3 +1026,5 @@ ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return aError; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index 48c583a3ff8e..aeaf2fd2e43d 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.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. @@ -42,10 +43,6 @@ |* |* RscFlag::RscFlag() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RscFlag::RscFlag( Atom nId, sal_uInt32 nTypeId ) : RscConst( nId, nTypeId ) @@ -57,8 +54,6 @@ RscFlag::RscFlag( Atom nId, sal_uInt32 nTypeId ) |* |* Beschreibung Die Groe�e der Instanzdaten richtet sich nach |* der Anzahl der Flags -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ sal_uInt32 RscFlag::Size() @@ -71,10 +66,6 @@ sal_uInt32 RscFlag::Size() |* |* RscFlag::SetNotConst() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst ) { @@ -95,10 +86,6 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst ) |* |* RscFlag::SetConst() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { @@ -119,10 +106,6 @@ ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal* |* |* RscFlag::CreateBasic() |* -|* Beschreibung -|* Ersterstellung MM 16.01.92 -|* Letzte Aenderung MM 16.01.92 -|* *************************************************************************/ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) { @@ -142,10 +125,6 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) |* |* RscFlag::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 16.01.92 -|* *************************************************************************/ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { @@ -173,10 +152,6 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCl |* |* RscFlag::CreateClient() |* -|* Beschreibung -|* Ersterstellung MM 16.01.92 -|* Letzte Aenderung MM 16.01.92 -|* *************************************************************************/ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI, sal_Bool bOwnClass, Atom nConstId ) @@ -209,10 +184,6 @@ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI, |* |* RscFlag::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ void RscFlag::SetToDefault( const RSCINST & rInst ) { @@ -226,10 +197,6 @@ void RscFlag::SetToDefault( const RSCINST & rInst ) |* |* RscFlag::IsDlft() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ sal_Bool RscFlag::IsDefault( const RSCINST & rInst ) { @@ -260,10 +227,6 @@ sal_Bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) |* |* RscFlag::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, Atom nConstId ) @@ -316,10 +279,6 @@ sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* |* RscFlag::IsSet() |* -|* Beschreibung -|* Ersterstellung MM 10.04.91 -|* Letzte Aenderung MM 10.04.91 -|* *************************************************************************/ sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) { @@ -340,10 +299,6 @@ sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) |* |* RscFlag::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -375,10 +330,6 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscFlag::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) @@ -405,10 +356,6 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, |* |* RscClient::RscClient() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ RscClient::RscClient( Atom nId, sal_uInt32 nTypeId, RscFlag * pClass, Atom nConstantId ) @@ -422,10 +369,6 @@ RscClient::RscClient( Atom nId, sal_uInt32 nTypeId, RscFlag * pClass, |* |* RscClient::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ RSCCLASS_TYPE RscClient::GetClassType() const { @@ -436,10 +379,6 @@ RSCCLASS_TYPE RscClient::GetClassType() const |* |* RscClient::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -454,10 +393,6 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscClient::Create() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -488,3 +423,4 @@ RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt, return( aTmpI ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 69a989c1683b..1e65962099a8 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.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. @@ -45,10 +46,6 @@ |* |* RscMgr::RscMgr() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) : RscClass( nId, nTypeId, pSuperCl ) @@ -59,10 +56,6 @@ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) |* |* RscMgr::Size() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ sal_uInt32 RscMgr::Size() { @@ -73,10 +66,6 @@ sal_uInt32 RscMgr::Size() |* |* RscMgr::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; @@ -108,10 +97,6 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCla |* |* RscMgr::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 21.06.91 -|* Letzte Aenderung MM 21.06.91 -|* *************************************************************************/ void RscMgr::Destroy( const RSCINST & rInst ){ RscMgrInst * pClassData; @@ -126,10 +111,6 @@ void RscMgr::Destroy( const RSCINST & rInst ){ |* |* RscMgr::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ void RscMgr::SetToDefault( const RSCINST & rInst ) { @@ -145,10 +126,6 @@ void RscMgr::SetToDefault( const RSCINST & rInst ) |* |* RscMgr::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){ RscMgrInst * pClassData; @@ -164,10 +141,6 @@ sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){ |* |* RscMgr::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 -|* *************************************************************************/ sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ RscMgrInst * pClassData; @@ -193,10 +166,6 @@ sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* |* RscMgr::WriteSrcHeader() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -233,10 +202,6 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscMgr::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, const char * ) @@ -247,10 +212,6 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, |* |* RscMgr::WriteRcHeader() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId &rId, @@ -344,10 +305,6 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, |* |* RscMgr::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, RscTypCont *, sal_uInt32, sal_Bool ) @@ -398,10 +355,6 @@ static ByteString MakeName( RscTypCont * pTypCon, RscTop * pClass, |* |* RscMgr::WriteHxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId &rId ) @@ -467,10 +420,6 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscMgr::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ) @@ -486,10 +435,6 @@ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput, |* |* RscClass::WriteCxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ) @@ -568,10 +513,6 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscClass::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ) @@ -588,17 +529,13 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, |* |* RscArray::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ -sal_Bool RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscMgr::IsConsistent( const RSCINST & rInst ) { sal_Bool bRet; RscMgrInst * pClassData; - bRet = RscClass::IsConsistent( rInst, pList ); + bRet = RscClass::IsConsistent( rInst ); pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); if( pClassData->aRefId.IsId() && @@ -606,10 +543,6 @@ sal_Bool RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) || (pClassData->aRefId.GetNumber() > 0x7FFF) || IsToDeep( rInst ).IsError()) ) { - if( pList ) - pList->Insert( - new RscInconsistent( pClassData->aRefId, - pClassData->aRefId ) ); bRet = sal_False; } @@ -620,10 +553,6 @@ sal_Bool RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) |* |* RscMgr::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ RscMgrInst * pClassData; @@ -637,10 +566,6 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ |* |* RscMgr::IsToDeep() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) { @@ -681,17 +606,12 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) |* |* RscMgr::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) { RscMgrInst * pClassData; RscId aOldId, aId; ERRTYPE aError; - RSCINST aTmpI = rInst; if( rRefId.IsId() && ((rRefId.GetNumber() < 1) || (rRefId.GetNumber() > 0x7FFF)) ) @@ -715,3 +635,5 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) return( aError ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 78fa86b6fa48..132133d5fe76 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.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. @@ -47,10 +48,6 @@ |* |* RscRange::RscRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) @@ -63,10 +60,6 @@ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) |* |* RscRange::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCCLASS_TYPE RscRange::GetClassType() const { @@ -77,10 +70,6 @@ RSCCLASS_TYPE RscRange::GetClassType() const |* |* RscRange::SetRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { @@ -102,10 +91,6 @@ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) |* |* RscRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.02.92 -|* Letzte Aenderung MM 15.02.92 -|* *************************************************************************/ sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { @@ -125,10 +110,6 @@ sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* |* RscRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { @@ -143,10 +124,6 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) |* |* RscRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 22.04.91 -|* Letzte Aenderung MM 22.04.91 -|* *************************************************************************/ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { @@ -158,10 +135,6 @@ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) |* |* RscRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -197,10 +170,6 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, |* |* RscRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -212,10 +181,6 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) @@ -257,10 +222,6 @@ void RscRange::WriteRcAccess |* |* RscLongRange::RscLongRange() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) @@ -273,10 +234,6 @@ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) |* |* RscLongRange::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ RSCCLASS_TYPE RscLongRange::GetClassType() const { @@ -287,10 +244,6 @@ RSCCLASS_TYPE RscLongRange::GetClassType() const |* |* RscLongRange::SetRange() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { @@ -312,10 +265,6 @@ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) |* |* RscLongRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.02.92 -|* Letzte Aenderung MM 15.02.92 -|* *************************************************************************/ sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { @@ -331,10 +280,6 @@ sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) |* |* RscLongRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { @@ -350,10 +295,6 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) |* |* RscLongRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 22.04.91 -|* Letzte Aenderung MM 22.04.91 -|* *************************************************************************/ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { @@ -366,10 +307,6 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) |* |* RscLongRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -408,10 +345,6 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, |* |* RscLongRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 -|* *************************************************************************/ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -425,10 +358,6 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscLongRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.04.94 -|* *************************************************************************/ ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) @@ -481,10 +410,6 @@ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, |* |* RscIdRange::RscIdRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) @@ -497,10 +422,6 @@ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) |* |* RscIdRange::RscIdRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCCLASS_TYPE RscIdRange::GetClassType() const { @@ -511,10 +432,6 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const |* |* RscIdRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 -|* *************************************************************************/ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; @@ -553,10 +470,6 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOw |* |* RscIdRange::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 -|* *************************************************************************/ void RscIdRange :: Destroy( const RSCINST & rInst ){ ((RscId *)rInst.pData)->Destroy(); @@ -566,10 +479,6 @@ void RscIdRange :: Destroy( const RSCINST & rInst ){ |* |* RscIdRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.01.92 -|* Letzte Aenderung MM 15.01.92 -|* *************************************************************************/ sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ @@ -591,10 +500,6 @@ sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* |* RscIdRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { @@ -610,10 +515,6 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) |* |* RscIdRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){ *plValue = ((RscId *)rInst.pData)->GetNumber(); @@ -624,10 +525,6 @@ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){ |* |* RscIdRange::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 -|* *************************************************************************/ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ ERRTYPE aError; @@ -648,10 +545,6 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ |* |* RscIdRange::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 -|* *************************************************************************/ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){ *pRscId = *(RscId *)rInst.pData; @@ -663,10 +556,6 @@ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){ |* |* RscIdRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -678,10 +567,6 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscIdRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) @@ -710,20 +595,13 @@ void RscIdRange::WriteRcAccess |* |* RscIdRange::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 -|* *************************************************************************/ -sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) +sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst ) { long nValue = ((RscId *)rInst.pData)->GetNumber(); if( (nMax >= nValue) && (nMin <= nValue) ) return sal_True; else { - if( pList ) - pList->Insert( new RscInconsistent( - *(RscId *)rInst.pData, *(RscId *)rInst.pData ) ); return sal_False; } } @@ -733,10 +611,6 @@ sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList |* |* RscBool::RscBool() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 -|* *************************************************************************/ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId ) : RscRange( nId, nTypeId ) @@ -748,10 +622,6 @@ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId ) |* |* RscBool::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 -|* *************************************************************************/ RSCCLASS_TYPE RscBool::GetClassType() const { @@ -762,10 +632,6 @@ RSCCLASS_TYPE RscBool::GetClassType() const |* |* RscBool::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 -|* *************************************************************************/ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -797,10 +663,6 @@ void RscBool::WriteRcAccess |* |* RscBreakRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 -|* *************************************************************************/ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) : RscRange( nId, nTypeId ) @@ -812,10 +674,6 @@ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) |* |* RscBreakRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 -|* *************************************************************************/ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){ if( nValue == nOutRange ) @@ -828,10 +686,6 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){ |* |* RscBreakRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 -|* *************************************************************************/ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -848,3 +702,4 @@ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index ad668ac2b3cb..9126823b5f76 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.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. @@ -47,10 +48,6 @@ |* |* RscString::RscString() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) @@ -63,10 +60,6 @@ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) |* |* RscString::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ RSCCLASS_TYPE RscString::GetClassType() const { @@ -77,10 +70,6 @@ RSCCLASS_TYPE RscString::GetClassType() const |* |* RscString::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ char * pTmp; @@ -111,10 +100,6 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ |* |* RscString::GetString() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){ *ppStr = ((RscStringInst *)rInst.pData)->pStr; @@ -125,10 +110,6 @@ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){ |* |* RscString::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 22.07.91 -|* *************************************************************************/ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ *pRscId = ((RscStringInst *)rInst.pData)->aRefId; @@ -139,10 +120,6 @@ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ |* |* RscString::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ if( pRefClass ){ @@ -159,10 +136,6 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ |* |* RscString::Create() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) @@ -198,10 +171,6 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, |* |* RscString::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 -|* *************************************************************************/ void RscString::Destroy( const RSCINST & rInst ){ if( ((RscStringInst *)rInst.pData)->pStr ) @@ -213,10 +182,6 @@ void RscString::Destroy( const RSCINST & rInst ){ |* |* RscString::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.01.92 -|* Letzte Aenderung MM 15.01.92 -|* *************************************************************************/ sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ RscStringInst * pData = (RscStringInst*)rInst.pData; @@ -265,10 +230,6 @@ sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* |* RscString::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 -|* *************************************************************************/ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) @@ -313,10 +274,6 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscString::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -399,3 +356,4 @@ void RscString::WriteRcAccess fprintf( fOutput, "\t\tnOffset += GetStringSizeRes( aStr );\n" ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index cff9c92ab508..db9eb6fec470 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.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. @@ -42,10 +43,6 @@ |* |* RscTop::RscTop() |* -|* Beschreibung -|* Ersterstellung MM 03.06.91 -|* Letzte Aenderung MM 03.06.91 -|* *************************************************************************/ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) : RefNode( nId ) @@ -62,10 +59,6 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) |* |* RscTop::SetCallPar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2, const ByteString & rParType ) @@ -79,10 +72,6 @@ void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2, |* |* RscTop::GetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetDefault() { @@ -95,10 +84,6 @@ RSCINST RscTop::GetDefault() |* |* RscTop::Pre_dtor() |* -|* Beschreibung -|* Ersterstellung MM 19.06.91 -|* Letzte Aenderung MM 19.06.91 -|* *************************************************************************/ void RscTop :: Pre_dtor(){ if( aDfltInst.IsInst() ){ @@ -112,10 +97,6 @@ void RscTop :: Pre_dtor(){ |* |* RscTop::GetConstant() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ Atom RscTop :: GetConstant( sal_uInt32 ){ return InvalidAtom; @@ -125,10 +106,6 @@ Atom RscTop :: GetConstant( sal_uInt32 ){ |* |* RscTop::GetIndexType() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RscTop * RscTop::GetTypeClass() const { @@ -142,10 +119,6 @@ RscTop * RscTop::GetTypeClass() const |* |* RscTop::Size() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_uInt32 RscTop :: Size() { @@ -159,10 +132,6 @@ sal_uInt32 RscTop :: Size() |* |* RscTop::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ if( pSuperClass ) @@ -175,10 +144,6 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ |* |* RscTop::InHierarchy() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 -|* *************************************************************************/ sal_Bool RscTop::InHierarchy( RscTop * pClass ){ if( this == pClass ) @@ -192,10 +157,6 @@ sal_Bool RscTop::InHierarchy( RscTop * pClass ){ |* |* RscTop::SetVariable() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, @@ -213,10 +174,6 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, |* |* RscTop::EnumVariable() |* -|* Beschreibung -|* Ersterstellung MM 03.02.93 -|* Letzte Aenderung MM 03.02.93 -|* *************************************************************************/ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { @@ -228,10 +185,6 @@ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) |* |* RscTop::GetVariable() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetVariable ( @@ -253,10 +206,6 @@ RSCINST RscTop::GetVariable |* |* RscTop::GetCopyVar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) { @@ -271,10 +220,6 @@ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) |* |* RscTop::GetTupelVar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, const RSCINST & rInitInst ) @@ -289,10 +234,6 @@ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, |* |* RscTop::GetElement() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop *pCreateClass, const RSCINST & rCreateInst, @@ -311,10 +252,6 @@ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, |* |* RscTop::GetArrayEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetArrayEle ( @@ -334,10 +271,6 @@ ERRTYPE RscTop::GetArrayEle |* |* RscTop::GetValueEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetValueEle ( @@ -357,10 +290,6 @@ ERRTYPE RscTop::GetValueEle |* |* RscTop::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass ) @@ -376,10 +305,6 @@ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, |* |* RscTop::GetPosEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ if( pSuperClass ) @@ -393,10 +318,6 @@ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ |* |* RscTop::MovePosEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, sal_uInt32 nSourcePos ) @@ -412,10 +333,6 @@ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, |* |* RscTop::SetPosRscId() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, const RscId & rRscId ) @@ -431,10 +348,6 @@ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, |* |* RscTop::GetInfoEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ if( pSuperClass ) @@ -448,10 +361,6 @@ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ |* |* RscTop::GetCount() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ if( pSuperClass ) @@ -464,10 +373,6 @@ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ |* |* RscTop::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ if( pSuperClass ) @@ -481,10 +386,6 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ |* |* RscTop::SetBool() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){ if( pSuperClass ) @@ -498,10 +399,6 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){ |* |* RscTop::SetConst() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) { @@ -515,10 +412,6 @@ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) |* |* RscTop::SetNotConst() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ if( pSuperClass ) @@ -532,10 +425,6 @@ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ |* |* RscTop::SetString() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ if( pSuperClass ) @@ -549,10 +438,6 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ |* |* RscTop::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){ if( pSuperClass ) @@ -566,10 +451,6 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){ |* |* RscTop::GetBool() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){ if( pSuperClass ) @@ -583,10 +464,6 @@ ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){ |* |* RscTop::GetCont() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ if( pSuperClass ) @@ -600,10 +477,6 @@ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ |* |* RscTop::GetString() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ if( pSuperClass ) @@ -617,10 +490,6 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ |* |* RscTop::Create() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.07.91 -|* *************************************************************************/ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwnRange ) { @@ -638,10 +507,6 @@ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwn |* |* RscTop::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::Destroy( const RSCINST & rInst ){ if( pSuperClass ) @@ -652,16 +517,11 @@ void RscTop::Destroy( const RSCINST & rInst ){ |* |* RscTop::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ -sal_Bool RscTop::IsConsistent( const RSCINST & rInst, - RscInconsList * pList ) +sal_Bool RscTop::IsConsistent( const RSCINST & rInst ) { if( pSuperClass ) - return pSuperClass->IsConsistent( rInst, pList ); + return pSuperClass->IsConsistent( rInst ); else return sal_True; } @@ -670,10 +530,6 @@ sal_Bool RscTop::IsConsistent( const RSCINST & rInst, |* |* RscTop::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::SetToDefault( const RSCINST & rInst ) { @@ -685,10 +541,6 @@ void RscTop::SetToDefault( const RSCINST & rInst ) |* |* RscTop::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_Bool RscTop::IsDefault( const RSCINST & rInst ){ if( pSuperClass ) @@ -701,10 +553,6 @@ sal_Bool RscTop::IsDefault( const RSCINST & rInst ){ |* |* RscTop::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pSuperClass ) @@ -717,10 +565,6 @@ sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ |* |* RscTop::SetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){ if( pSuperClass ) @@ -731,10 +575,6 @@ void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){ |* |* RscTop::GetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ RSCINST RscTop::GetDefault( Atom nVarId ){ if( pSuperClass ) @@ -748,10 +588,6 @@ RSCINST RscTop::GetDefault( Atom nVarId ){ |* |* RscTop::Delete() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) @@ -764,10 +600,6 @@ void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, |* |* RscTop::DeletePos() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 -|* *************************************************************************/ void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) { @@ -779,10 +611,6 @@ void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) |* |* RscTop::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 18.09.91 -|* Letzte Aenderung MM 18.09.91 -|* *************************************************************************/ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ if( pSuperClass ) @@ -795,10 +623,6 @@ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ |* |* RscTop::WriteHxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ) @@ -813,10 +637,6 @@ ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ){ @@ -830,10 +650,6 @@ ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteCxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ) @@ -848,10 +664,6 @@ ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, const RscId & rId ){ @@ -865,10 +677,6 @@ ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteSrcHeader() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, @@ -884,10 +692,6 @@ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) @@ -900,10 +704,6 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, |* |* RscTop::WriteRcHeader() |* -|* Beschreibung -|* Ersterstellung MM 12.04.91 -|* Letzte Aenderung MM 12.04.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId & rId, @@ -920,10 +720,6 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, |* |* RscTop::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 -|* *************************************************************************/ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -939,10 +735,6 @@ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, |* |* RscTop::WriteSyntaxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ) { @@ -958,10 +750,6 @@ void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ) |* |* RscTop::WriteSyntax() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 -|* *************************************************************************/ void RscTop::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) { @@ -992,3 +780,4 @@ void RscTop::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 8e9379738fed..a498f5485f42 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.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. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_rsc.hxx" /****************************************************************/ -/* Include File */ +/* Include File */ /****************************************************************/ #include <stdlib.h> @@ -49,13 +50,6 @@ #include <ctype.h> #include <errno.h> -#if defined( PM2 ) && defined( ZTC ) -#include <svpm.h> -#ifndef unlink -#define unlink( p ) DosDelete( (PSZ)(const char*)p ) -#endif -#endif - #include <tools/fsys.hxx> #include <tools/stream.hxx> #include <rscerror.h> @@ -76,7 +70,10 @@ #include <algorithm> -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OStringToOUString; /*************** F o r w a r d s *****************************************/ /*************** G l o b a l e V a r i a b l e n **********************/ @@ -96,8 +93,6 @@ AtomContainer* pHS = NULL; |* RscCmdLine::Init() |* |* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 |* *************************************************************************/ void RscCmdLine::Init() @@ -116,8 +111,6 @@ void RscCmdLine::Init() |* RscCmdLine::RscCmdLine() |* |* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::RscCmdLine() @@ -130,8 +123,6 @@ RscCmdLine::RscCmdLine() |* RscCmdLine::RscCmdLine() |* |* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) @@ -223,7 +214,6 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else if( !rsc_strnicmp( (*ppStr) + 1, "d", 1 ) ) { // Symbole definieren nCommands |= DEFINE_FLAG; - aSymbolList.Insert( new ByteString( (*ppStr) + 2 ), 0xFFFF ); } else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) ) { // Include-Pfade definieren @@ -241,14 +231,18 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) ) { // additional language specific include for system dependent files const ByteString aSysSearchDir( (*ppStr)+5 ); - DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) ); - m_aOutputFiles.back().aSysSearchDirs.push_back( ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ); - - if( m_aOutputFiles.back().aLangSearchPath.Len() ) - m_aOutputFiles.back().aLangSearchPath.Append( ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) ); - - m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir ); + // ignore empty -lip= arguments that we get lots of these days + if (aSysSearchDir.Len()) + { + DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) ); + m_aOutputFiles.back().aSysSearchDirs.push_back( + ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ); + if( m_aOutputFiles.back().aLangSearchPath.Len() ) + m_aOutputFiles.back().aLangSearchPath.Append( + ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) ); + m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir ); + } } else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) { // anderer Name fuer .srs-file @@ -311,7 +305,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else { // Eingabedatei - aInputList.Insert( new ByteString( *ppStr ), 0xFFFF ); + aInputList.push_back( new ByteString( *ppStr ) ); } ppStr++; i++; @@ -320,16 +314,16 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) if( nCommands & HELP_FLAG ) pEH->FatalError( ERR_USAGE, RscId() ); // was an inputted file specified - else if( aInputList.Count() ) + else if( !aInputList.empty() ) { ::std::list<OutputFile>::iterator it; for( it = m_aOutputFiles.begin(); it != m_aOutputFiles.end(); ++it ) { if( ! it->aOutputRc.Len() ) - it->aOutputRc = ::OutputFile( *aInputList.First(), "rc" ); + it->aOutputRc = ::OutputFile( *aInputList.front(), "rc" ); } if( ! bOutputSrsIsSet ) - aOutputSrs = ::OutputFile( *aInputList.First(), "srs" ); + aOutputSrs = ::OutputFile( *aInputList.front(), "srs" ); } else if( !(nCommands & PRINTSYNTAX_FLAG) ) pEH->FatalError( ERR_NOINPUT, RscId() ); @@ -340,18 +334,13 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) |* RscCmdLine::~RscCmdLine() |* |* Beschreibung dtor -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::~RscCmdLine() { - ByteString *pString; - - while( NULL != (pString = aInputList.Remove( (sal_uLong)0 )) ) - delete pString; - while( NULL != (pString = aSymbolList.Remove( (sal_uLong)0 )) ) - delete pString; + for ( size_t i = 0, n = aInputList.size(); i < n; ++i ) + delete aInputList[ i ]; + aInputList.clear(); } /************************************************************************* @@ -424,24 +413,9 @@ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont ) |* |* RscCompiler :: RscCompiler() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 -|* *************************************************************************/ RscCompiler::~RscCompiler() { - ByteString* pString; - - // Dateien loeschen - pString = aTmpFileList.First(); - while( pString ) - { - unlink( pString->GetBuffer() ); - delete pString; - pString = aTmpFileList.Next(); - } - pTC->pEH->SetListFile( NULL ); if( fListing ) @@ -464,14 +438,11 @@ RscCompiler::~RscCompiler() |* RscCompiler::Start() |* |* Beschreibung Datei in Kommandozeile aendern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ ERRTYPE RscCompiler::Start() { ERRTYPE aError; - ByteString* pString; RscFile* pFName; if( PRINTSYNTAX_FLAG & pCL->nCommands ) @@ -482,15 +453,11 @@ ERRTYPE RscCompiler::Start() } // Kein Parameter, dann Hilfe - pString = pCL->aInputList.First(); - if( !pString ) + if( pCL->aInputList.empty() ) pTC->pEH->FatalError( ERR_NOINPUT, RscId() ); - while( pString ) - { - pTC->aFileTab.NewCodeFile( *pString ); - pString = pCL->aInputList.Next(); - } + for( size_t i = 0, n = pCL->aInputList.size(); i < n; ++i ) + pTC->aFileTab.NewCodeFile( *pCL->aInputList[ i ] ); if( !(pCL->nCommands & NOSYNTAX_FLAG) ) { @@ -546,8 +513,6 @@ ERRTYPE RscCompiler::Start() |* RscCmdLine::EndCompile() |* |* Beschreibung Datei in Kommandozeile aendern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ void RscCompiler::EndCompile() @@ -651,10 +616,6 @@ void RscCompiler::EndCompile() |* |* RscCompiler::IncludeParser() |* -|* Beschreibung -|* Ersterstellung MM 21.06.91 -|* Letzte Aenderung MM 21.06.91 -|* *************************************************************************/ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) { @@ -686,16 +647,15 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) fclose( finput ); // Include-Pfad durchsuchen - pDep = pFName->First(); - while( pDep ) + for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i ) { + pDep = pFName->aDepLst[ i ]; pFNTmp = pTC->aFileTab.GetFile( pDep->GetFileKey() ); - pDep = pFName->Next(); } - pDep = pFName->First(); - while( pDep ) + for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i ) { + pDep = pFName->aDepLst[ i ]; pFNTmp = pTC->aFileTab.GetFile( pDep->GetFileKey() ); // Kein Pfad und Include Datei if( pFNTmp && !pFNTmp->bLoaded ) @@ -707,7 +667,6 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) else aError = ERR_OPENFILE; } - pDep = pFName->Next(); }; }; }; @@ -719,10 +678,6 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) |* |* RscCompiler :: ParseOneFile() |* -|* Beschreibung -|* Ersterstellung MM 26.06.91 -|* Letzte Aenderung MM 26.06.91 -|* *************************************************************************/ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, @@ -741,12 +696,11 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, //Include-Dateien vorher lesen pFName->bLoaded = sal_True; //Endlos Rekursion vermeiden - pDep = pFName->First(); - while( pDep && aError.IsOk() ) + + for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i ) { + pDep = pFName->aDepLst[ i ]; aError = ParseOneFile( pDep->GetFileKey(), pOutputFile, pContext ); - pFName->Seek( pDep ); - pDep = pFName->Next(); } if( aError.IsError() ) @@ -798,10 +752,6 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, |* |* RscCompiler :: Link() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 -|* *************************************************************************/ namespace @@ -859,6 +809,7 @@ ERRTYPE RscCompiler::Link() } } + // get two temp file urls OString aRcTmp, aSysListTmp, aSysList; try @@ -1109,7 +1060,6 @@ ByteString RscCompiler::GetTmpFileName() ByteString aFileName; aFileName = ::GetTmpFileName(); - aTmpFileList.Insert( new ByteString( aFileName ) ); return( aFileName ); } @@ -1236,7 +1186,6 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC ); ::std::vector< ByteString > aMissingImages; FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL; - bool bRet = true; if( !aIStm.GetError() && !aOStm.GetError() ) { @@ -1302,7 +1251,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aBaseFileName += ByteString::CreateFromInt32( 0 ); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) ) - aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); + aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); else aMissingImages.push_back( aBaseFileName ); } @@ -1346,8 +1295,6 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine( aLine ); } } - else - bRet = false; if( aMissingImages.size() > 0 ) { @@ -1368,3 +1315,4 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, fclose( pSysListFile ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 11327d4fb9d1..8ec451ab9d3d 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -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. @@ -413,3 +414,5 @@ void ciwarn( char *format, int n); void dumpdef( char *why ); void dumpadef( char *why, DEFBUF *dp ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index 1eb7561a2db0..378adaa17c5e 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -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. @@ -38,7 +39,7 @@ FILE *pDefOut = NULL; /* ER evtl. #define's dump */ #endif #ifdef B200 -/* BP, 25.07.91, einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ +/* einzige Moeglichkeit unter BC Stack und Heap festzusetzen */ extern unsigned _stklen = 24000; extern unsigned _heaplen = 30000; #endif @@ -188,7 +189,7 @@ char *magic[] = { /* Note: order is important */ "__FILE__", NULL /* Must be last */ }; - + static char *sharpfilename = NULL; int nRunde = 0; @@ -196,7 +197,6 @@ int nRunde = 0; void InitCpp1() { int i; - /* BP */ /* in der LIB-Version muessen alle Variablen initialisiert werden */ line = wrongline = errors = recursion = 0; @@ -233,7 +233,6 @@ void InitCpp1() nflag = 0; incend = incdir; sharpfilename = NULL; - /* BP */ } int MAIN(int argc, char** argv) @@ -286,8 +285,6 @@ nRunde++; if ((i = creat(useargv[3], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[3], "w", stdout) == NULL) { */ - pDefOut = fopen( useargv[3], "w" ); if( pDefOut == NULL ) { #endif @@ -297,7 +294,6 @@ nRunde++; } } /* Continue by opening output */ } -/* OSL_DEBUG_LEVEL > 1 */ #endif case 3: /* @@ -311,8 +307,6 @@ nRunde++; if ((i = creat(useargv[2], 0, "rat=cr", "rfm=var")) == -1 || dup2(i, fileno(stdout)) == -1) { #else -/* alt if (freopen(useargv[2], "w", stdout) == NULL) { */ - pCppOut = fopen( useargv[2], "w" ); if( pCppOut == NULL ) { #endif @@ -326,7 +320,6 @@ nRunde++; * Open input file, "-" means use stdin. */ if (!streq(useargv[1], "-")) { -/* alt: if (freopen(useargv[1], "r", stdin) == NULL) { */ pCppIn = fopen( useargv[1], "r" ); if( pCppIn == NULL) { perror(useargv[1]); @@ -348,16 +341,6 @@ nRunde++; default: exit(IO_ERROR); /* Can't happen */ } -/* if ( pfargv ) - { - for ( j=0;j++;j < PARALIMIT ) - { - if (pfargv[j]!=0) - free(pfargv[j]); - } - free(pfargv); - } -*/ setincdirs(); /* Setup -I include directories */ addfile( pCppIn, work); /* "open" main input file */ @@ -398,7 +381,7 @@ nRunde++; #endif } - + FILE_LOCAL void cppmain() /* @@ -550,7 +533,7 @@ end_line: if (c == '\n') { /* Compiling at EOL? */ EvalBuf[nEvalOff++] = '\0'; #endif } - + void output(int c) /* * Output one character to stdout -- output() is passed as an @@ -562,7 +545,6 @@ void output(int c) #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ PUTCHAR(c); } @@ -579,7 +561,6 @@ int c; #else if (c != TOK_SEP) #endif -/* alt: PUTCHAR(c); */ { PUTCHAR(c); if ( bIsInEval && nEvalOff < NEVALBUF ) @@ -614,3 +595,5 @@ void sharp() PUTCHAR('\n'); wrongline = FALSE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index 68d1d2dc72ba..c9046c73724c 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -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. @@ -316,7 +317,7 @@ nest_err: cerror("#%s must be in an #if", token); } return (counter + 1); } - + FILE_LOCAL void doif(int hash) /* @@ -361,7 +362,7 @@ badif: cerror("#if, #ifdef, or #ifndef without an argument", NULLST); #endif return; } - + FILE_LOCAL void doinclude() /* @@ -431,7 +432,7 @@ void doinclude() incerr: cerror("#include syntax error", NULLST); return; } - + FILE_LOCAL int openinclude(char* filename, int searchlocal) /* @@ -507,7 +508,7 @@ openinclude(char* filename, int searchlocal) } return (FALSE); } - + FILE_LOCAL int hasdirectory(char* source, char* result) /* @@ -551,7 +552,7 @@ hasdirectory(char* source, char* result) #endif #endif } - + #if HOST == SYS_VMS /* @@ -623,3 +624,4 @@ char *result; /* Size is at least NAM$C_MAXRSS + 1 */ } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index e9c03cdd4874..3654330a9035 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -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. @@ -24,10 +25,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER > 1310) -#define _USE_32BIT_TIME_T -#endif - #include <stdio.h> #ifdef UNX #include <stdlib.h> @@ -89,16 +86,14 @@ void addfile(FILE* fp, char* filename) */ { register FILEINFO *file; -/* #ifndef _NO_PROTO */ - extern FILEINFO *getfile( int bufsize, char *filename ); /* BP */ -/* #endif */ + extern FILEINFO *getfile( int bufsize, char *filename ); file = getfile(NBUFF, filename); file->fp = fp; /* Better remember FILE * */ file->buffer[0] = EOS; /* Initialize for first read */ line = 1; /* Working on line 1 now */ wrongline = TRUE; /* Force out initial #line */ } - + void setincdirs() /* * Append system-specific directories to the include directory list. @@ -162,7 +157,7 @@ void setincdirs() #if HOST == SYS_UNKNOWN /* - * BP: 25.07.91, Kontext: GenMake + * Kontext: GenMake * Unter DOS wird nun auch die Environment-Variable INCLUDE ausgewetet. * Es kommt erschwerend hinzu, dass alle Eintraege, die mit ';' getrennt * sind, mit in die Liste aufenommen werden muessen. @@ -173,7 +168,7 @@ void setincdirs() * verwendete knallte es in strcpy() ! */ -#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && ! defined UNX && ! defined OS2 +#if !defined( WNT ) && ! defined UNX && ! defined OS2 extern char *getenv( char *pStr ); /* BP */ #endif char *pIncGetEnv = NULL; /* Pointer auf INCLUDE */ @@ -187,7 +182,7 @@ void setincdirs() } -/* BP: 11.09.91, Kontext: Erweiterung des INCLUDE-Services +/* Kontext: Erweiterung des INCLUDE-Services * Bislang konnte der cpp keine Include-Angaben in der Kommandozeile * vertragen, bei denen die directries mit ';' getrennt wurden. * Dies ist auch verstaendlich, da dieses cpp fuer UNIX-Systeme @@ -213,9 +208,6 @@ int AddInclude( char* pIncStr ) return( 1 ); } - - - int dooptions(int argc, char** argv) /* @@ -251,9 +243,6 @@ dooptions(int argc, char** argv) break; case 'D': /* Define symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap); */ /* Force define to U.C. */ -#endif /* * If the option is just "-Dfoo", make it -Dfoo=1 */ @@ -314,9 +303,6 @@ dooptions(int argc, char** argv) break; case 'U': /* Undefine symbol */ -#if HOST != SYS_UNIX -/* zap_uc(ap);*/ -#endif if (defendel(ap, TRUE) == NULL) cwarn("\"%s\" wasn't defined", ap); break; @@ -366,7 +352,7 @@ dooptions(int argc, char** argv) } return (j); /* Return new argc */ } - + int readoptions(char* filename, char*** pfargv) { @@ -429,8 +415,6 @@ readoptions(char* filename, char*** pfargv) return (back); } - - #if HOST != SYS_UNIX FILE_LOCAL void zap_uc(char* ap) @@ -466,9 +450,9 @@ void initdefines() register char *tp; register DEFBUF *dp; int i; - long tvec; + time_t tvec; -#if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3) +#if !defined( WNT ) && !defined(G3) extern char *ctime(); #endif @@ -504,14 +488,14 @@ void initdefines() dp = defendel("__DATE__", FALSE); dp->repl = tp = getmem(27); dp->nargs = DEF_NOARGS; - time( (time_t*)&tvec); + time( &tvec); *tp++ = '"'; - strcpy(tp, ctime((const time_t*)&tvec)); + strcpy(tp, ctime(&tvec)); tp[24] = '"'; /* Overwrite newline */ #endif } } - + #if HOST == SYS_VMS /* * getredirection() is intended to aid in porting C programs @@ -599,3 +583,5 @@ char **argv; return (j); /* Return new argc */ } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index 04d715f35351..3f5e03a0b5b7 100644 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -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. @@ -236,7 +237,7 @@ bad_define: cerror("#define syntax error", NULLST); inmacro = FALSE; /* Stop <newline> hack */ } - + void checkparm(int c, DEFBUF* dp) /* * Replace this param if it's defined. Note that the macro name is a @@ -264,7 +265,7 @@ void checkparm(int c, DEFBUF* dp) for (cp = token; *cp != EOS;) /* And save */ save(*cp++); /* The token itself */ } - + #if STRING_FORMAL void stparmscan(delim, dp) int delim; @@ -336,7 +337,7 @@ void stparmscan(int delim) workp[-1] = wp[-1]; /* Nope, reset end quote. */ } #endif - + void doundef() /* * Remove the symbol from the defined list. @@ -384,7 +385,7 @@ void charput(int c) *parmp++ = (char)c; } } - + /* * M a c r o E x p a n s i o n */ @@ -404,9 +405,7 @@ void expand(DEFBUF* tokenp) { register int c; register FILEINFO *file; -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif #if OSL_DEBUG_LEVEL > 1 if (debug) @@ -487,7 +486,7 @@ void expand(DEFBUF* tokenp) expstuff(tokenp); /* Do actual parameters */ } /* nargs switch */ } - + FILE_LOCAL int expcollect() /* @@ -548,7 +547,7 @@ expcollect() } /* Collect all args. */ return (TRUE); /* Normal return */ } - + FILE_LOCAL void expstuff(DEFBUF* tokenp) /* @@ -562,9 +561,7 @@ void expstuff(DEFBUF* tokenp) char *defend; /* -> output buff end */ int string_magic; /* String formal hack */ FILEINFO *file; /* Funny #include */ -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif file = getfile(NBUFF, tokenp->name); inp = tokenp->repl; /* -> macro replacement */ @@ -633,3 +630,5 @@ void dumpparm(char* why) } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index 70f05543c465..4eb3183b5a86 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -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. @@ -113,7 +114,7 @@ register int op; #define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) #define isunary(op) (op >= FIRST_UNOP && op <= LAST_UNOP) #endif - + /* * The following definitions are used to specify basic variable sizes. */ @@ -157,7 +158,7 @@ register int op; #ifndef S_PFPTR #define S_PFPTR (sizeof (int (*)())) #endif - + typedef struct types { short type; /* This is the bit if */ char *name; /* this is the token word */ @@ -202,7 +203,6 @@ SIZES size_table[] = { { T_FPTR, 0, S_PFPTR }, /* int (*()) */ { 0, 0, 0 }, /* End of table */ }; - void InitCpp5() { @@ -235,9 +235,7 @@ eval() int skip; /* For short-circuit testing */ int value[NEXP]; /* Value stack */ OPTAB opstack[NEXP]; /* Operand stack */ -#ifndef ZTC /* BP */ extern int *evaleval(); /* Does actual evaluation */ -#endif valp = value; opp = opstack; opp->op = OP_END; /* Mark bottom of stack */ @@ -380,7 +378,7 @@ again: ; } /* op1 switch end */ } /* Stack unwind loop */ } - + FILE_LOCAL int evallex(int skip) /* @@ -663,7 +661,7 @@ evalnum(int c) unget(); return (value); } - + FILE_LOCAL int evalchar(int skip) /* @@ -769,7 +767,7 @@ evalchar(int skip) instring = FALSE; return (value); } - + FILE_LOCAL int * evaleval(int* valp, int op, int skip) /* @@ -907,7 +905,7 @@ evaleval(int* valp, int op, int skip) *valp++ = v1; return (valp); } - + #ifdef DEBUG_EVAL dumpstack(opstack, opp, value, valp) OPTAB opstack[NEXP]; /* Operand stack */ @@ -927,3 +925,4 @@ register int *valp; /* -> value vector */ } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index fd2a2a9a0dd7..cb628ba4c04d 100644 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -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. @@ -81,7 +82,7 @@ * cierror & ciwarn take a format and a single int (char) argument. * cfatal takes a format and a single string argument. */ - + /* * This table must be rewritten for a non-Ascii machine. * @@ -168,7 +169,6 @@ OP_LPA,OP_RPA,OP_MUL,OP_ADD, 000,OP_SUB, DOT,OP_DIV, /* 28 ()*+,-./ */ #endif - /* * C P P S y m b o l T a b l e s */ @@ -226,7 +226,7 @@ skipws() #endif return (c); } - + void scanid(int c) /* * Get the next token (an id) into the token buffer. @@ -267,7 +267,7 @@ macroid(int c) } return (c); } - + int catenate() /* @@ -333,7 +333,7 @@ catenate() return (FALSE); /* Not supported */ #endif } - + int scanstring(int delim, #ifndef _NO_PROTO @@ -372,7 +372,7 @@ void (*outfun)() /* BP */ return (FALSE); } } - + void scannumber(int c, #ifndef _NO_PROTO register void (*outfun)( int ) /* BP */ /* Output/store func */ @@ -466,7 +466,7 @@ register void (*outfun)() /* BP */ done: if (dotflag || expseen) { /* Floating point? */ if (c == 'l' || c == 'L') { (*outfun)(c); - c = get(); /* Ungotten later */ + get(); /* Ungotten later */ } } else { /* Else it's an integer */ @@ -502,7 +502,7 @@ nomore: unget(); /* Not part of a number */ if (octal89 && radix == 8) cwarn("Illegal digit in octal number", NULLST); } - + void save(int c) { if (workp >= &work[NWORK]) { @@ -563,7 +563,6 @@ getmem(int size) cfatal("Out of memory", NULLST); return (result); } - DEFBUF * lookid(int c) @@ -603,7 +602,7 @@ lookid(int c) } return ((temp == 0) ? dp : NULL); } - + DEFBUF * defendel(char* name, int delete) /* @@ -771,7 +770,7 @@ void dumpadef(char *why, register DEFBUF *dp) pCppOut = pRememberOut; } #endif - + /* * G E T */ @@ -792,11 +791,7 @@ get_from_file: if ((file = infile) == NULL) return (EOF_CHAR); newline: -#if 0 - fprintf( pCppOut, "get(%s), recursion %d, line %d, bptr = %d, buffer \"%s\"\n", - file->filename, recursion, line, - file->bptr - file->buffer, file->buffer); -#endif + /* * Read a character from the current input line or macro. * At EOS, either finish the current macro (freeing temp. @@ -1033,9 +1028,7 @@ void ungetstring(char* text) */ { register FILEINFO *file; -#ifndef ZTC /* BP */ extern FILEINFO *getfile(); -#endif file = getfile(strlen(text) + 1, ""); strcpy(file->buffer, text); } @@ -1058,7 +1051,7 @@ cget() #endif return (c); } - + /* * Error messages and other hacks. The first byte of severity * is 'S' for string arguments and 'I' for int arguments. This @@ -1146,3 +1139,4 @@ void ciwarn(char* format, int narg) domsg("IWarning", format, &narg); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index cdbf07766c8f..2490f1df7d7b 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -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. @@ -184,7 +185,7 @@ #ifndef LINE_PREFIX #define LINE_PREFIX "" #endif - + /* * OLD_PREPROCESSOR forces the definition of OK_DOLLAR, OK_CONCAT, * COMMENT_INVISIBLE, and STRING_FORMAL to values appropriate for @@ -303,12 +304,7 @@ #else #define PAR_MAC (31 + 1) #endif -/* ER 13.06.95 19:33 - da Makros im file->buffer expandiert werden, muss NBUFF mindestens NWORK sein -#define NWORK 4096 -#define NBUFF 4096 - */ -/* ER 13.06.95 20:05 NWORK wg. grooossen Makros in *.src erhoeht, +/* NWORK wg. grooossen Makros in *.src erhoeht, da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */ #define NWORK 128000 #define NBUFF NWORK @@ -344,3 +340,4 @@ #endif #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c index 3060a6d6be9a..144576e2846b 100644 --- a/rsc/source/rscpp/cppmain.c +++ b/rsc/source/rscpp/cppmain.c @@ -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. @@ -36,10 +37,7 @@ int main( argc, argv ) int argc; char *argv[]; { -#ifdef TSTCPP - ( start_cpp( argc, argv ) ); - puts("erster teil ist fertig" ); -#endif return( start_cpp( argc, argv ) ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index f554040c4ec9..f110a260de27 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.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. @@ -32,9 +33,7 @@ #include <string.h> #include <ctype.h> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif // Solar Definitionen #include <tools/solar.h> @@ -49,8 +48,6 @@ |* RscChar::MakeChar() |* |* Beschreibung Der String wird nach C-Konvention umgesetzt -|* Ersterstellung MM 20.03.91 -|* Letzte Aenderung MM 20.03.91 |* *************************************************************************/ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) @@ -192,3 +189,5 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) return pUtf8; }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 6231bbd92aae..99268b83d3d8 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.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. @@ -31,6 +32,7 @@ // Programmuebergreifende Includes. #include <rscdef.hxx> +#include <tools/list.hxx> /****************** C o d e **********************************************/ /****************** R s c I d ********************************************/ @@ -41,10 +43,6 @@ sal_Bool RscId::bNames = sal_True; |* static RscId::SetNames |* static RscId::SetNoNames |* -|* Beschreibung -|* Ersterstellung MM 26.06.91 -|* Letzte Aenderung MM 26.06.91 -|* *************************************************************************/ void RscId::SetNames( sal_Bool bSet ) { bNames = bSet; } sal_Bool RscId::IsSetNames() { return bNames; } @@ -53,10 +51,6 @@ sal_Bool RscId::IsSetNames() { return bNames; } |* |* RscId::GetNumber |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 -|* *************************************************************************/ sal_Int32 RscId::GetNumber() const{ sal_Int32 lVal; @@ -68,10 +62,6 @@ sal_Int32 RscId::GetNumber() const{ |* |* RscId::Create() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ void RscId::Create( const RscExpType & rExpType ) { @@ -90,10 +80,6 @@ void RscId::Create( const RscExpType & rExpType ) |* |* RscId::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ void RscId::Destroy(){ if( aExp.IsDefinition() ) @@ -105,10 +91,6 @@ void RscId::Destroy(){ |* |* RscId::RscId() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscId::RscId( const RscId& rRscId ){ aExp = rRscId.aExp; @@ -120,10 +102,6 @@ RscId::RscId( const RscId& rRscId ){ |* |* RscId::RscId() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ RscId::RscId( RscDefine * pDef ){ RscExpType aExpType; @@ -137,10 +115,6 @@ RscId::RscId( RscDefine * pDef ){ |* |* RscId:: = |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscId& RscId::operator = ( const RscId& rRscId ){ if( rRscId.aExp.IsDefinition() ) @@ -154,10 +128,6 @@ RscId& RscId::operator = ( const RscId& rRscId ){ |* |* RscId::operator == |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_Bool RscId::operator == ( const RscId& rRscId ) const { @@ -168,10 +138,6 @@ sal_Bool RscId::operator == ( const RscId& rRscId ) const |* |* RscId::operator < |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_Bool RscId::operator < ( const RscId& rRscId ) const { @@ -182,10 +148,6 @@ sal_Bool RscId::operator < ( const RscId& rRscId ) const |* |* RscId::operator > |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_Bool RscId::operator > ( const RscId& rRscId ) const { @@ -196,10 +158,6 @@ sal_Bool RscId::operator > ( const RscId& rRscId ) const |* |* RscId::sal_Int32() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ RscId::operator sal_Int32() const { @@ -210,10 +168,6 @@ RscId::operator sal_Int32() const |* |* RscId::GetNames() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ ByteString RscId::GetName() const { @@ -234,10 +188,6 @@ ByteString RscId::GetName() const |* |* RscId::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 25.11.91 -|* *************************************************************************/ ByteString RscId::GetMacro() const { @@ -256,10 +206,6 @@ ByteString RscId::GetMacro() const |* |* RscDefine::RscDefine() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName, sal_Int32 lDefId ) : StringNode( rDefName ) @@ -284,10 +230,6 @@ RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName, |* |* RscDefine::~RscDefine() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscDefine::~RscDefine(){ if( pExp ) @@ -300,10 +242,6 @@ RscDefine::~RscDefine(){ |* |* RscDefine::DecRef() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ void RscDefine::DecRef(){ nRefCount--; @@ -316,10 +254,6 @@ void RscDefine::DecRef(){ |* |* RscDefine::DefineToNumber() |* -|* Beschreibung -|* Ersterstellung MM 07.11.91 -|* Letzte Aenderung MM 07.11.91 -|* *************************************************************************/ void RscDefine::DefineToNumber() { @@ -333,10 +267,6 @@ void RscDefine::DefineToNumber() |* |* RscDefine::ChangeMacro() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ void RscDefine::ChangeMacro( RscExpression * pExpression ){ if( pExp ) @@ -357,10 +287,6 @@ void RscDefine::ChangeMacro( sal_Int32 lIdentifier ){ |* |* RscDefine::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ sal_Bool RscDefine::Evaluate(){ sal_Bool bRet = sal_True; @@ -375,10 +301,6 @@ sal_Bool RscDefine::Evaluate(){ |* |* RscDefine::Search() |* -|* Beschreibung -|* Ersterstellung MM 11.11.91 -|* Letzte Aenderung MM 11.11.91 -|* *************************************************************************/ RscDefine * RscDefine::Search( const char * pStr ){ return (RscDefine *)StringNode::Search( pStr ); @@ -388,10 +310,6 @@ RscDefine * RscDefine::Search( const char * pStr ){ |* |* RscDefine::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ ByteString RscDefine::GetMacro() { @@ -405,31 +323,40 @@ ByteString RscDefine::GetMacro() |* |* RscDefineList::New() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, - sal_Int32 lDefId, sal_uLong lPos ) + sal_Int32 lDefId, size_t lPos ) { RscDefine * pDef; pDef = new RscDefine( lFileKey, rDefName, lDefId ); pDef->IncRef(); - Insert( pDef, lPos ); + if ( lPos < maList.size() ) + { + RscSubDefList::iterator it = maList.begin(); + ::std::advance( it, lPos ); + maList.insert( it, pDef ); + } else { + maList.push_back( pDef ); + } return pDef; } RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, - RscExpression * pExpression, sal_uLong lPos ) + RscExpression * pExpression, size_t lPos ) { RscDefine * pDef; pDef = new RscDefine( lFileKey, rDefName, pExpression ); pDef->IncRef(); - Insert( pDef, lPos ); - + if ( lPos < maList.size() ) + { + RscSubDefList::iterator it = maList.begin(); + ::std::advance( it, lPos ); + maList.insert( it, pDef ); + } else { + maList.push_back( pDef ); + } return pDef; } @@ -437,69 +364,61 @@ RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, |* |* RscDefineList::Remove() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ -sal_Bool RscDefineList::Remove( RscDefine * pDef ){ - pDef = RscSubDefList::Remove( pDef ); - if( pDef ){ - pDef->DefineToNumber(); - pDef->DecRef(); +sal_Bool RscDefineList::Remove( RscDefine * pDef ) { + for ( RscSubDefList::iterator it = maList.begin(); it < maList.end(); ++it ) { + if ( *it == pDef ) { + (*it)->DefineToNumber(); + (*it)->DecRef(); + maList.erase( it ); + return sal_True; + } } - - return( NULL != pDef ); + return sal_False; } -sal_Bool RscDefineList::Remove( sal_uLong lIndex ){ - RscDefine * pDef = RscSubDefList::Remove( lIndex ); - if( pDef ){ - pDef->DefineToNumber(); - pDef->DecRef(); +sal_Bool RscDefineList::Remove( size_t lIndex ) { + if ( lIndex < maList.size() ) { + RscSubDefList::iterator it = maList.begin(); + ::std::advance( it, lIndex ); + (*it)->DefineToNumber(); + (*it)->DecRef(); + maList.erase( it ); + return sal_True; } - - return( NULL != pDef ); + return sal_False; } -sal_Bool RscDefineList::Remove(){ - RscDefine * pDef; - - pDef = RscSubDefList::Remove( (sal_uLong)0 ); +sal_Bool RscDefineList::Remove() { + if ( maList.empty() ) + return sal_False; - if( pDef ){ - pDef->DefineToNumber(); - pDef->DecRef(); - } - return( NULL != pDef ); + maList[ 0 ]->DefineToNumber(); + maList[ 0 ]->DecRef(); + maList.erase( maList.begin() ); + return sal_True; } /************************************************************************* |* |* RscDefineList::Befor() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ sal_Bool RscDefineList::Befor( const RscDefine * pFree, const RscDefine * pDepend ) { - RscDefine * pDef; - - pDef = First(); - while( pDef ){ - if( pDef == pFree ){ - pDef = Next(); - while( pDef ){ - if( pDef == pDepend ) + size_t i = 0; + size_t n = maList.size(); + while ( i < n ) { + if ( maList[ i ] == pFree ) { + for ( ++i ; i < n ; ++i ) { + if ( maList[ i ] == pDepend ) { return sal_True; - pDef = Next(); + } } } - pDef = Next(); - }; + ++i; + } return sal_False; } @@ -507,21 +426,15 @@ sal_Bool RscDefineList::Befor( const RscDefine * pFree, |* |* RscDefineList::WriteAll() |* -|* Beschreibung -|* Ersterstellung MM 28.10.91 -|* Letzte Aenderung MM 28.10.91 -|* *************************************************************************/ void RscDefineList::WriteAll( FILE * fOutput ) { - RscDefine * pDefEle = First(); - - while( pDefEle ) - { + for ( size_t i = 0, n = maList.size(); i < n; ++i ) { + RscDefine* pDefEle = maList[ i ]; fprintf( fOutput, "#define %s %s\n", pDefEle->GetName().GetBuffer(), - pDefEle->GetMacro().GetBuffer() ); - pDefEle = Next(); + pDefEle->GetMacro().GetBuffer() + ); }; } @@ -530,10 +443,6 @@ void RscDefineList::WriteAll( FILE * fOutput ) |* |* RscExpType::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{ if( IsDefinition() ){ @@ -555,10 +464,6 @@ sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{ |* |* RscExpType::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ void RscExpType::GetMacro( ByteString & rStr ) const { @@ -580,10 +485,6 @@ void RscExpType::GetMacro( ByteString & rStr ) const |* |* RscExpression::RscExpression() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) { @@ -600,10 +501,6 @@ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) |* |* RscExpression::~RscExpression() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscExpression::~RscExpression(){ if( aLeftExp.IsDefinition() ) @@ -621,10 +518,6 @@ RscExpression::~RscExpression(){ |* |* RscExpression::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ sal_Int32 lLeft; @@ -660,10 +553,6 @@ sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ |* |* RscExpression::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ ByteString RscExpression::GetMacro() { @@ -706,10 +595,6 @@ ByteString RscExpression::GetMacro() |* |* RscFile::RscFile() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ RscFile :: RscFile(){ bLoaded = sal_False; @@ -722,22 +607,14 @@ RscFile :: RscFile(){ |* |* RscFile::~RscFile() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ -RscFile :: ~RscFile(){ - RscDepend * pDep = Remove( (sal_uLong)0 ); - - while( pDep ){ - delete pDep; - pDep = Remove( (sal_uLong)0 ); - } +RscFile :: ~RscFile() { + for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) + delete aDepLst[ i ]; + aDepLst.clear(); //von hinten nach vorne ist besser wegen der Abhaengigkeiten //Objekte zerstoeren sich, wenn Referenzzaehler NULL - aDefLst.Last(); while( aDefLst.Remove() ) ; } @@ -748,26 +625,24 @@ RscFile :: ~RscFile(){ |* Beschreibung Diese Methode gibt sal_True zurueck, wenn lDepend |* existiert und hinter lFree steht, oder wenn |* lDepend nicht existiert. -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){ RscDepend * pDep; - pDep = Last(); - while( pDep ){ - if( pDep->GetFileKey() == lDepend ){ - while( pDep ){ + for ( size_t i = aDepLst.size(); i > 0; ) + { + pDep = aDepLst[ --i ]; + if( pDep->GetFileKey() == lDepend ) { + for ( size_t j = i ? --i : 0; j > 0; ) + { + pDep = aDepLst[ --j ]; if( pDep->GetFileKey() == lFree ) return sal_True; - pDep = Prev(); } return sal_False; } - pDep = Prev(); - }; - + } return sal_True; } @@ -775,30 +650,26 @@ sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){ |* |* RscFile::InsertDependFile() |* -|* Beschreibung -|* Ersterstellung MM 06.01.92 -|* Letzte Aenderung MM 06.01.92 -|* *************************************************************************/ -sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, sal_uLong lPos ) +sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos ) { - RscDepend * pDep; - - pDep = First(); - while( pDep ){ + for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) + { + RscDepend* pDep = aDepLst[ i ]; if( pDep->GetFileKey() == lIncFile ) return sal_True; - pDep = Next(); } // Current-Zeiger steht auf letztem Element - if( lPos >= Count() ){ //letztes Element muss immer letztes bleiben + if( lPos >= aDepLst.size() ) { //letztes Element muss immer letztes bleiben // Abhaengigkeit vor der letzten Position eintragen - Insert( new RscDepend( lIncFile ) ); + aDepLst.push_back( new RscDepend( lIncFile ) ); + } + else { + RscDependList::iterator it = aDepLst.begin(); + ::std::advance( it, lPos ); + aDepLst.insert( it, new RscDepend( lIncFile ) ); } - else - Insert( new RscDepend( lIncFile ), lPos ); - return sal_True; } @@ -806,22 +677,18 @@ sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, sal_uLong lPos ) |* |* RscFile::RemoveDependFile() |* -|* Beschreibung -|* Ersterstellung MM 18.11.91 -|* Letzte Aenderung MM 18.11.91 -|* *************************************************************************/ void RscFile :: RemoveDependFile( sal_uLong lDepFile ) { - - RscDepend * pDep = Last(); - - while( pDep ){ - if( pDep->GetFileKey() == lDepFile ){ - Remove( pDep ); - delete pDep; + for ( size_t i = aDepLst.size(); i > 0; ) + { + RscDepend* pDep = aDepLst[ --i ]; + if( pDep->GetFileKey() == lDepFile ) { + RscDependList::iterator it = aDepLst.begin(); + ::std::advance( it, i ); + delete *it; + aDepLst.erase( it ); } - pDep = Prev(); } } @@ -830,10 +697,6 @@ void RscFile :: RemoveDependFile( sal_uLong lDepFile ) |* |* RscDefTree::~RscDefTree() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ RscDefTree::~RscDefTree(){ Remove(); @@ -843,10 +706,6 @@ RscDefTree::~RscDefTree(){ |* |* RscDefTree::Remove() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ void RscDefTree::Remove(){ RscDefine * pDef; @@ -861,10 +720,6 @@ void RscDefTree::Remove(){ |* |* RscDefTree::~Search() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ RscDefine * RscDefTree::Search( const char * pName ){ if( pDefRoot ) @@ -876,10 +731,6 @@ RscDefine * RscDefTree::Search( const char * pName ){ |* |* RscDefTree::Insert() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ void RscDefTree::Insert( RscDefine * pDef ){ if( pDefRoot ) @@ -893,10 +744,6 @@ void RscDefTree::Insert( RscDefine * pDef ){ |* |* RscDefTree::Remove() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ void RscDefTree::Remove( RscDefine * pDef ){ if( pDefRoot ){ @@ -910,10 +757,6 @@ void RscDefTree::Remove( RscDefine * pDef ){ |* |* RscDefTree::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 -|* *************************************************************************/ sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){ if( pDef ){ @@ -934,10 +777,6 @@ sal_Bool RscDefTree::Evaluate(){ |* |* RscFileTab::RscFileTab() |* -|* Beschreibung -|* Ersterstellung MM 07.11.91 -|* Letzte Aenderung MM 07.11.91 -|* *************************************************************************/ RscFileTab::RscFileTab(){ } @@ -946,10 +785,6 @@ RscFileTab::RscFileTab(){ |* |* RscFileTab::~RscFileTab() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ RscFileTab :: ~RscFileTab(){ RscFile * pFile; @@ -968,10 +803,6 @@ RscFileTab :: ~RscFileTab(){ |* |* RscFileTab::Find() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_uLong RscFileTab :: Find( const ByteString & rName ) { @@ -991,10 +822,6 @@ sal_uLong RscFileTab :: Find( const ByteString & rName ) |* |* RscFileTab::FindDef() |* -|* Beschreibung -|* Ersterstellung MM 30.10.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscDefine * RscFileTab::FindDef( const char * pName ){ return aDefTree.Search( pName ); @@ -1004,10 +831,6 @@ RscDefine * RscFileTab::FindDef( const char * pName ){ |* |* RscFileTab::FindDef() |* -|* Beschreibung -|* Ersterstellung MM 30.10.91 -|* Letzte Aenderung MM 01.11.91 -|* *************************************************************************/ RscDefine * RscFileTab::FindDef( sal_uLong lFileKey, const ByteString & rName ) { @@ -1025,10 +848,6 @@ RscDefine * RscFileTab::FindDef( sal_uLong lFileKey, const ByteString & rName ) |* |* RscFileTab::Depend() |* -|* Beschreibung -|* Ersterstellung MM 08.11.91 -|* Letzte Aenderung MM 08.11.91 -|* *************************************************************************/ sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){ if( lDepend == lFree ) @@ -1050,15 +869,11 @@ sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){ |* |* RscFileTab::TestDef() |* -|* Beschreibung -|* Ersterstellung MM 14.01.92 -|* Letzte Aenderung MM 14.01.92 -|* *************************************************************************/ -sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, +sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, const RscDefine * pDefDec ) { - if( lFileKey == pDefDec->GetFileKey() ){ + if( lFileKey == pDefDec->GetFileKey() ) { RscFile * pFile = GetFile( pDefDec->GetFileKey() ); if( pFile && (lPos <= pFile->aDefLst.GetPos( (RscDefine *)pDefDec )) && (lPos != LIST_APPEND) ) @@ -1074,12 +889,8 @@ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, |* |* RscFileTab::TestDef() |* -|* Beschreibung -|* Ersterstellung MM 14.01.92 -|* Letzte Aenderung MM 14.01.92 -|* *************************************************************************/ -sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, +sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, const RscExpression * pExpDec ) { if( !pExpDec ) @@ -1108,10 +919,6 @@ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, sal_uLong lPos, |* |* RscFileTab::NewDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, sal_Int32 lId, sal_uLong lPos ) @@ -1136,10 +943,6 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, |* |* RscFileTab::NewDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, RscExpression * pExp, sal_uLong lPos ) @@ -1172,10 +975,6 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName, |* |* RscFileTab::IsDefUsed() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 -|* *************************************************************************/ sal_Bool RscFileTab::IsDefUsed( const ByteString & rDefName ) { @@ -1191,10 +990,6 @@ sal_Bool RscFileTab::IsDefUsed( const ByteString & rDefName ) |* |* RscFileTab::DeleteDef() |* -|* Beschreibung -|* Ersterstellung MM 11.11.91 -|* Letzte Aenderung MM 11.11.91 -|* *************************************************************************/ void RscFileTab::DeleteDef( const ByteString & rDefName ) { @@ -1214,10 +1009,6 @@ void RscFileTab::DeleteDef( const ByteString & rDefName ) |* |* RscFileTab::ChangeDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 11.11.91 -|* *************************************************************************/ sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, sal_Int32 lId ) { @@ -1235,20 +1026,17 @@ sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, sal_Int32 lId ) |* |* RscFileTab::ChangeDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 11.11.91 -|* *************************************************************************/ sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, RscExpression * pExp ) { RscDefine * pDef = FindDef( rDefName ); RscFile * pFile; - sal_uLong lPos = 0; - if( pDef ){ + if( pDef ) + { pFile = GetFile( pDef->GetFileKey() ); + sal_uLong lPos = 0; if( pFile ) lPos = pFile->aDefLst.GetPos( pDef ); //Macros in den Expressions sind definiert ? @@ -1270,10 +1058,6 @@ sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, |* |* RscFileTab::ChangeDefName() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 -|* *************************************************************************/ sal_Bool RscFileTab::ChangeDefName( const ByteString & rDefName, const ByteString & rNewName ) @@ -1298,10 +1082,6 @@ sal_Bool RscFileTab::ChangeDefName( const ByteString & rDefName, |* |* RscFileTab::DeleteFileContext() |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 -|* *************************************************************************/ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ RscFile * pFName; @@ -1310,12 +1090,11 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ if( pFName ){ RscDefine * pDef; - pDef = pFName->aDefLst.First(); - while( pDef ){ + for ( size_t i = 0, n = pFName->aDefLst.maList.size(); i < n; ++i ) { + pDef = pFName->aDefLst.maList[ i ]; aDefTree.Remove( pDef ); - pDef = pFName->aDefLst.Next(); }; - while( pFName->aDefLst.Remove( (sal_uLong)0 ) ) ; + while( pFName->aDefLst.Remove() ) ; } } @@ -1323,10 +1102,6 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ |* |* RscFileTab::DeleteFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ void RscFileTab :: DeleteFile( sal_uLong lFileKey ){ RscFile * pFName; @@ -1350,10 +1125,6 @@ void RscFileTab :: DeleteFile( sal_uLong lFileKey ){ |* |* RscFileTab::NewCodeFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_uLong RscFileTab :: NewCodeFile( const ByteString & rName ) { @@ -1376,10 +1147,6 @@ sal_uLong RscFileTab :: NewCodeFile( const ByteString & rName ) |* |* RscFileTab::NewIncFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 -|* *************************************************************************/ sal_uLong RscFileTab :: NewIncFile( const ByteString & rName, const ByteString & rPath ) @@ -1399,3 +1166,5 @@ sal_uLong RscFileTab :: NewIncFile( const ByteString & rName, } return lKey; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx index dc7d898fde7a..424b24c0246d 100644 --- a/rsc/source/tools/rschash.cxx +++ b/rsc/source/tools/rschash.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. @@ -29,7 +30,8 @@ #include "precompiled_rsc.hxx" #include <rschash.hxx> -using namespace rtl; +using ::rtl::OString; +using ::rtl::OStringHash; AtomContainer::AtomContainer() { @@ -45,7 +47,7 @@ AtomContainer::~AtomContainer() Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) { OString aKey = rStr.toAsciiLowerCase(); - std::hash_map< OString, Atom, OStringHash >::const_iterator it = + boost::unordered_map< OString, Atom, OStringHash >::const_iterator it = m_aStringToID.find( aKey ); if( it != m_aStringToID.end() ) return it->second; @@ -62,7 +64,9 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) const OString& AtomContainer::getString( Atom nAtom ) { - std::hash_map< Atom, OString >::const_iterator it = + boost::unordered_map< Atom, OString >::const_iterator it = m_aIDToString.find( nAtom ); return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0]; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 57345d0aa893..11f4fff7caf1 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.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. @@ -51,7 +52,8 @@ #include <rtl/alloc.h> #include <rtl/memory.h> -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OUStringToOString; /****************** C o d e **********************************************/ /************************************************************************* @@ -60,8 +62,6 @@ using namespace rtl; |* |* Beschreibung Vergleicht zwei Strings Case-Unabhaengig bis zu |* einer bestimmten Laenge -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ int rsc_strnicmp( const char *string1, const char *string2, size_t count ) @@ -89,8 +89,6 @@ int rsc_strnicmp( const char *string1, const char *string2, size_t count ) |* rsc_strnicmp() |* |* Beschreibung Vergleicht zwei Strings Case-Unabhaengig -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ int rsc_stricmp( const char *string1, const char *string2 ){ @@ -124,8 +122,6 @@ char* rsc_strdup( const char* pStr ) |* Beschreibung Gibt einen String eines eindeutigen Dateinamens |* zurueck. Der Speicher fuer den String wird mit |* malloc allokiert -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MH 13.10.97 |* *************************************************************************/ ByteString GetTmpFileName() @@ -147,18 +143,20 @@ ByteString GetTmpFileName() sal_Bool Append( FILE * fDest, ByteString aTmpFile ) { #define MAX_BUF 4096 - char szBuf[ MAX_BUF ]; - int nItems; - FILE *fSource; - - fSource = fopen( aTmpFile.GetBuffer(), "rb" ); - if( !fDest || !fSource ){ + FILE *fSource = fopen( aTmpFile.GetBuffer(), "rb" ); + if( !fDest || !fSource ) + { if( fSource ) fclose( fSource ); return sal_False; } - else{ - do{ // append + else + { + char szBuf[ MAX_BUF ]; + int nItems; + + do //appemd + { nItems = fread( szBuf, sizeof( char ), MAX_BUF, fSource ); fwrite( szBuf, sizeof( char ), nItems, fDest ); } while( MAX_BUF == nItems ); @@ -187,8 +185,6 @@ sal_Bool Append( ByteString aOutputSrs, ByteString aTmpFile ) |* Beschreibung Haengt Extension an, wenn keine da ist |* Parameter: pInput, der Input-Dateiname. |* pExt, die Extension des Ausgabenamens -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 28.06.91 |* *************************************************************************/ ByteString InputFile ( const char * pInput, const char * pExt ) @@ -212,8 +208,6 @@ ByteString InputFile ( const char * pInput, const char * pExt ) |* Beschreibung Ersetzt Extension durch eine andere |* Parameter: input, der Input-Dateiname. |* pExt, die Extension des Ausgabenamens -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 28.06.91 |* *************************************************************************/ ByteString OutputFile ( ByteString aInput, const char * pExt ) @@ -232,8 +226,6 @@ ByteString OutputFile ( ByteString aInput, const char * pExt ) |* ::ResonseFile() |* |* Beschreibung Kommandozeile aufbereiten -|* Ersterstellung MM 05.09.91 -|* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) @@ -294,8 +286,6 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) |* RscPtrPtr :: RscPtrPtr() |* |* Beschreibung Eine Tabelle mit Zeigern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscPtrPtr :: RscPtrPtr(){ @@ -309,8 +299,6 @@ RscPtrPtr :: RscPtrPtr(){ |* |* Beschreibung Zerst�rt eine Tabelle mit Zeigern, die Zeiger werde |* ebenfalls freigegebn -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscPtrPtr :: ~RscPtrPtr(){ @@ -321,10 +309,6 @@ RscPtrPtr :: ~RscPtrPtr(){ |* |* RscPtrPtr :: Reset() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 -|* *************************************************************************/ void RscPtrPtr :: Reset(){ sal_uInt32 i; @@ -345,8 +329,6 @@ void RscPtrPtr :: Reset(){ |* RscPtrPtr :: Append() |* |* Beschreibung Haengt einen Eintrag an. -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ @@ -365,8 +347,6 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ |* RscPtrPtr :: GetEntry() |* |* Beschreibung Liefert einen Eintrag, NULL wenn nicht vorhanden. -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){ @@ -380,10 +360,6 @@ void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){ |* |* RscWriteRc :: RscWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) { @@ -408,10 +384,6 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) |* |* RscWriteRc :: ~RscWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ RscWriteRc :: ~RscWriteRc() { @@ -423,10 +395,6 @@ RscWriteRc :: ~RscWriteRc() |* |* RscWriteRc :: IncSize() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) { @@ -440,10 +408,6 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) |* |* RscWriteRc :: GetPointer() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) { @@ -457,10 +421,6 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) |* |* RscWriteRc :: Put() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 -|* *************************************************************************/ void RscWriteRc :: Put( sal_uInt16 nVal ) { @@ -486,3 +446,5 @@ void RscWriteRc :: PutUTF8( char * pStr ) // 0 terminated pMem[ nOldLen + nStrLen ] = '\0'; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index e719cc39548e..19a44f873949 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.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. @@ -45,10 +46,6 @@ |* |* BiNode::BiNode() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 -|* *************************************************************************/ BiNode::BiNode(){ pLeft = pRight = NULL; @@ -58,10 +55,6 @@ BiNode::BiNode(){ |* |* BiNode::~BiNode() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 -|* *************************************************************************/ BiNode::~BiNode(){ } @@ -70,10 +63,6 @@ BiNode::~BiNode(){ |* |* BiNode::EnumNodes() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 -|* *************************************************************************/ void BiNode::EnumNodes( Link aLink ) const{ if( Left() ) @@ -87,10 +76,6 @@ void BiNode::EnumNodes( Link aLink ) const{ |* |* BiNode::ChangeDLListBTree() |* -|* Beschreibung -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 -|* *************************************************************************/ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ BiNode * pRightNode; @@ -130,10 +115,6 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ |* |* BiNode::ChangeBTreeDLList() |* -|* Beschreibung -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 -|* *************************************************************************/ BiNode * BiNode::ChangeBTreeDLList(){ BiNode * pList; @@ -160,10 +141,6 @@ BiNode * BiNode::ChangeBTreeDLList(){ |* |* NameNode::Remove() |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 -|* *************************************************************************/ NameNode * NameNode::Remove( NameNode * pRemove ){ NameNode * pRoot = this; @@ -203,10 +180,6 @@ NameNode * NameNode::Remove( NameNode * pRemove ){ |* |* NameNode::Compare |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 13.07.91 -|* *************************************************************************/ COMPARE NameNode::Compare( const NameNode * pCompare ) const{ if( (long)this < (long)pCompare ) @@ -230,10 +203,6 @@ COMPARE NameNode::Compare( const void * pCompare ) const{ |* |* NameNode::SearchParent |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 -|* *************************************************************************/ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ // search for a parent node. @@ -262,10 +231,6 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ |* |* NameNode::Search |* -|* Beschreibung -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 27.06.90 -|* *************************************************************************/ NameNode* NameNode::Search( const NameNode * pSearch ) const{ // search for a node. @@ -311,10 +276,6 @@ NameNode* NameNode::Search( const void * pSearch ) const{ |* |* NameNode::Insert() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 -|* *************************************************************************/ sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ // Ein Knoten wird in den Baum eingefuegt @@ -346,10 +307,6 @@ sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ |* |* NameNode::Insert() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 11.01.91 -|* *************************************************************************/ sal_Bool NameNode::Insert( NameNode * pTN ){ // insert a node in the tree. @@ -375,10 +332,6 @@ sal_Bool NameNode::Insert( NameNode * pTN ){ |* |* NameNode::OrderTree() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ void NameNode::OrderTree(){ NameNode * pTmpLeft = (NameNode *)Left(); @@ -406,10 +359,6 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){ |* |* NameNode::IdOrderTree() |* -|* Beschreibung -|* Ersterstellung MM 15.11.91 -|* Letzte Aenderung MM 15.11.91 -|* *************************************************************************/ class OrderCtrl { sal_Bool bOrder; @@ -445,10 +394,6 @@ sal_Bool NameNode::IsOrderTree() const{ |* |* IdNode::Search() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 -|* *************************************************************************/ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{ return( (IdNode *)NameNode::Search( (const void *)&nTypeName ) ); @@ -458,10 +403,6 @@ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{ |* |* IdNode::Compare() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 -|* *************************************************************************/ COMPARE IdNode::Compare( const NameNode * pSearch ) const { @@ -488,10 +429,6 @@ COMPARE IdNode::Compare( const void * pSearch ) const{ |* |* IdNode::GetId() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 -|* *************************************************************************/ sal_uInt32 IdNode::GetId() const { @@ -502,10 +439,6 @@ sal_uInt32 IdNode::GetId() const |* |* StringNode::Search() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 -|* *************************************************************************/ StringNode * StringNode::Search( const char * pSearch ) const{ return (StringNode *)NameNode::Search( (const void *)pSearch ); @@ -515,10 +448,6 @@ StringNode * StringNode::Search( const char * pSearch ) const{ |* |* StringNode::Compare() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 -|* *************************************************************************/ COMPARE StringNode::Compare( const NameNode * pSearch ) const { @@ -544,3 +473,5 @@ COMPARE StringNode::Compare( const void * pSearch ) const else return EQUAL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |