diff options
Diffstat (limited to 'rsc/source')
40 files changed, 2553 insertions, 2553 deletions
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx index 3029b734e646..38abd37ea515 100644 --- a/rsc/source/misc/rscdbl.cxx +++ b/rsc/source/misc/rscdbl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,18 +39,18 @@ /************************************************************************* |* -|* RscTypCont::FillNameIdList() +|* RscTypCont::FillNameIdList() |* -|* Beschreibung -|* Ersterstellung MM 07.05.91 -|* Letzte Aenderung MM 30.05.91 +|* Beschreibung +|* Ersterstellung MM 07.05.91 +|* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ REResourceList * InsertList( Atom nClassName, const RscId& rId, REResourceList * pList ){ - REResourceList * pSubList; - const char * pStrClass; - ByteString aStrClass; + REResourceList * pSubList; + const char * pStrClass; + ByteString aStrClass; pStrClass = pHS->getString( nClassName ).getStr(); if( pStrClass ) @@ -66,10 +66,10 @@ REResourceList * InsertList( Atom nClassName, const RscId& rId, void FillSubList( RSCINST & rInst, REResourceList * pList ) { - sal_uInt32 nCount, i; - SUBINFO_STRUCT aInfo; + sal_uInt32 nCount, i; + SUBINFO_STRUCT aInfo; REResourceList* pSubList; - RSCINST aTmpI; + RSCINST aTmpI; nCount = rInst.pClass->GetCount( rInst ); for( i = 0; i < nCount; i++ ){ @@ -86,7 +86,7 @@ void FillListObj( ObjNode * pObjNode, RscTop * pRscTop, { if( pObjNode ){ if( pObjNode->GetFileKey() == lFileKey ){ - RSCINST aTmpI; + RSCINST aTmpI; REResourceList* pSubList; FillListObj( (ObjNode*)pObjNode->Left(), pRscTop, diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx index 422ed80c489f..39006d22fa63 100644 --- a/rsc/source/misc/rsclst.cxx +++ b/rsc/source/misc/rsclst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ REResourceList :: REResourceList( REResourceList* pParentList, { pParent = pParentList; aClassName = rClassName; - aRscId = rResourceID; + aRscId = rResourceID; bVisible = bVis; } diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index bea83c62113a..5628e2091620 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ /************************************************************************* |* -|* ERRTYPE::operator = ; +|* ERRTYPE::operator = ; |* -|* Beschreibung -|* Ersterstellung MM 25.09.91 -|* Letzte Aenderung MM 25.09.91 +|* Beschreibung +|* Ersterstellung MM 25.09.91 +|* Letzte Aenderung MM 25.09.91 |* *************************************************************************/ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) @@ -60,11 +60,11 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) /************************************************************************* |* -|* RscError::StdOut(); +|* RscError::StdOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) @@ -80,11 +80,11 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) /************************************************************************* |* -|* RscError::StdErr(); +|* RscError::StdErr(); |* -|* Beschreibung -|* Ersterstellung PL 11/07/2001 -|* Letzte Aenderung PL 11/07/2001 +|* Beschreibung +|* Ersterstellung PL 11/07/2001 +|* Letzte Aenderung PL 11/07/2001 |* *************************************************************************/ void RscError::StdErr( const char * pStr ) @@ -97,11 +97,11 @@ void RscError::StdErr( const char * pStr ) /************************************************************************* |* -|* RscError::LstOut(); +|* RscError::LstOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::LstOut( const char * pStr ){ @@ -111,11 +111,11 @@ void RscError::LstOut( const char * pStr ){ /************************************************************************* |* -|* RscError::StdLstOut(); +|* RscError::StdLstOut(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::StdLstOut( const char * pStr ){ @@ -125,11 +125,11 @@ void RscError::StdLstOut( const char * pStr ){ /************************************************************************* |* -|* RscError::StdLstErr(); +|* RscError::StdLstErr(); |* -|* Beschreibung -|* Ersterstellung PL 11/07/2001 -|* Letzte Aenderung PL 11/07/2001 +|* Beschreibung +|* Ersterstellung PL 11/07/2001 +|* Letzte Aenderung PL 11/07/2001 |* *************************************************************************/ void RscError::StdLstErr( const char * pStr ){ @@ -139,11 +139,11 @@ void RscError::StdLstErr( const char * pStr ){ /************************************************************************* |* -|* RscError::WriteError(); +|* RscError::WriteError(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) @@ -203,7 +203,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) case ERR_USAGE: StdLstOut( "Copyright (C) 2000, 2010 Oracle and/or its affiliates.\n" ); { - char buf[40]; + char buf[40]; StdLstOut( "DataVersion: " ); sprintf( buf, "%d.%d\n\n", @@ -408,11 +408,11 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) /************************************************************************* |* -|* RscErrorFormat() +|* RscErrorFormat() |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, @@ -470,11 +470,11 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, /************************************************************************* |* -|* RscError::Error() +|* RscError::Error() |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, @@ -493,11 +493,11 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, /************************************************************************* |* -|* RscError::FatalError(); +|* RscError::FatalError(); |* -|* Beschreibung -|* Ersterstellung MM 06.05.91 -|* Letzte Aenderung MM 06.05.91 +|* Beschreibung +|* Ersterstellung MM 06.05.91 +|* Letzte Aenderung MM 06.05.91 |* *************************************************************************/ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 326120c3d085..263a409e750d 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include "precompiled_rsc.hxx" /****************** I N C L U D E S **************************************/ // C and C++ Includes. -#include <ctype.h> // isdigit(), isalpha() +#include <ctype.h> // isdigit(), isalpha() #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -52,11 +52,11 @@ using namespace rtl; /************************************************************************* |* -|* RscTypCont :: RscTypCont +|* RscTypCont :: RscTypCont |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ RscTypCont :: RscTypCont( RscError * pErrHdl, @@ -145,7 +145,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang ) aCountry = aLang.getToken( 0, '-', nIndex ); if( nIndex != -1 ) aVariant = aLang.copy( nIndex ); - + bool bAppendEnUsFallback = ! (rNewLang.EqualsIgnoreCaseAscii( "en-US" ) || rNewLang.EqualsIgnoreCaseAscii( "x-no-translate" ) ); @@ -159,7 +159,7 @@ ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang ) { aLangFallbacks.push_back(getLangIdAndShortenLocale( this, aLg, aCountry, aVariant ) ); } while( aLg.getLength() ); - + if( bAppendEnUsFallback ) { aLg = "en"; @@ -183,11 +183,11 @@ Atom RscTypCont::AddLanguage( const char* pLang ) /************************************************************************* |* -|* RscTypCont :: ~RscTypCont +|* RscTypCont :: ~RscTypCont |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ){ @@ -232,7 +232,7 @@ void Pre_dtorTree( RscTop * pRscTop ){ } RscTypCont :: ~RscTypCont(){ - RscTop * pRscTmp; + RscTop * pRscTmp; RscSysEntry * pSysEntry; // Alle Unterbaeume loeschen @@ -283,7 +283,7 @@ void RscTypCont::ClearSysNames() //======================================================================= RscTop * RscTypCont::SearchType( Atom nId ) -/* [Beschreibung] +/* [Beschreibung] Sucht eine Basistyp nId; */ @@ -291,9 +291,9 @@ RscTop * RscTypCont::SearchType( Atom nId ) if( nId == InvalidAtom ) return NULL; -#define ELSE_IF( a ) \ - else if( a.GetId() == nId ) \ - return &a; \ +#define ELSE_IF( a ) \ + else if( a.GetId() == nId ) \ + return &a; \ if( aBool.GetId() == nId ) return &aBool; @@ -329,11 +329,11 @@ RscTop * RscTypCont::SearchType( Atom nId ) /************************************************************************* |* -|* RscTypCont :: Search +|* RscTypCont :: Search |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ RscTop * RscTypCont :: Search( Atom nRT ){ @@ -342,7 +342,7 @@ RscTop * RscTypCont :: Search( Atom nRT ){ CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){ ObjNode *pObjNode; - RscTop *pRscTop; + RscTop *pRscTop; if( NULL != (pRscTop = Search( nRT )) ){ if( NULL != (pObjNode = pRscTop->GetObjNode( rId )) ){ @@ -354,16 +354,16 @@ CLASS_DATA RscTypCont :: Search( Atom nRT, const RscId & rId ){ /************************************************************************* |* -|* RscTypCont :: Delete() +|* RscTypCont :: Delete() |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 +|* Beschreibung +|* Ersterstellung MM 10.07.91 +|* Letzte Aenderung MM 10.07.91 |* *************************************************************************/ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){ - ObjNode * pObjNode; - RscTop * pRscTop; + ObjNode * pObjNode; + RscTop * pRscTop; if( NULL != (pRscTop = Search( nRT )) ){ if( NULL != (pObjNode = pRscTop->GetObjNode()) ){ @@ -387,18 +387,18 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){ /************************************************************************* |* -|* RscTypCont :: PutSysName() +|* RscTypCont :: PutSysName() |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 +|* 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, BOOL bFirst ) { - RscSysEntry * pSysEntry; - BOOL bId1 = FALSE; + RscSysEntry * pSysEntry; + BOOL bId1 = FALSE; pSysEntry = aSysLst.First(); while( pSysEntry ) @@ -435,11 +435,11 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, /************************************************************************* |* -|* RscTypCont :: WriteInc +|* RscTypCont :: WriteInc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 21.06.90 -|* Letzte Aenderung MM 21.06.90 +|* Beschreibung RES.DOC +|* Ersterstellung MM 21.06.90 +|* Letzte Aenderung MM 21.06.90 |* *************************************************************************/ void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey ) @@ -462,8 +462,8 @@ void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey ) } else { - RscDepend * pDep; - RscFile * pFile; + RscDepend * pDep; + RscFile * pFile; pFName = aFileTab.Get( lFileKey ); if( pFName ) @@ -489,11 +489,11 @@ void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey ) /************************************************************************* |* -|* RscTypCont :: Methoden die ueber all Knoten laufen +|* RscTypCont :: Methoden die ueber all Knoten laufen |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ @@ -501,11 +501,11 @@ class RscEnumerateObj { friend class RscEnumerateRef; private: - ERRTYPE aError; // Enthaelt den ersten Fehler + ERRTYPE aError; // Enthaelt den ersten Fehler RscTypCont* pTypCont; - FILE * fOutput; // AusgabeDatei - ULONG lFileKey; // Welche src-Datei - RscTop * pClass; + FILE * fOutput; // AusgabeDatei + ULONG lFileKey; // Welche src-Datei + RscTop * pClass; DECL_LINK( CallBackWriteRc, ObjNode * ); DECL_LINK( CallBackWriteSrc, ObjNode * ); @@ -543,16 +543,16 @@ public: /************************************************************************* |* -|* RscEnumerateObj :: CallBackWriteRc +|* RscEnumerateObj :: CallBackWriteRc |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) { - RscWriteRc aMem( pTypCont->GetByteOrder() ); + RscWriteRc aMem( pTypCont->GetByteOrder() ); aError = pClass->WriteRcHeader( RSCINST( pClass, pObjNode->GetRscObj() ), aMem, pTypCont, @@ -566,11 +566,11 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) /************************************************************************* |* -|* RscEnumerateObj :: CallBackWriteSrc +|* RscEnumerateObj :: CallBackWriteSrc |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) @@ -587,11 +587,11 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) /************************************************************************* |* -|* RscEnumerateObj :: CallBackWriteCxx +|* RscEnumerateObj :: CallBackWriteCxx |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) @@ -606,11 +606,11 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) /************************************************************************* |* -|* RscEnumerateObj :: CallBackWriteHxx +|* RscEnumerateObj :: CallBackWriteHxx |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) @@ -625,21 +625,21 @@ IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) /************************************************************************* |* -|* RscEnumerateObj :: WriteRcFile +|* RscEnumerateObj :: WriteRcFile |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* 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 /* struct RSHEADER_TYPE{ - sal_uInt32 nId; // Identifier der Resource - sal_uInt32 nRT; // Resource Typ - sal_uInt32 nGlobOff; // Globaler Offset - sal_uInt32 nLocalOff; // Lokaler Offset + sal_uInt32 nId; // Identifier der Resource + sal_uInt32 nRT; // Resource Typ + sal_uInt32 nGlobOff; // Globaler Offset + sal_uInt32 nLocalOff; // Lokaler Offset } aHeader; */ @@ -679,7 +679,7 @@ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){ class RscEnumerateRef { private: - RscTop * pRoot; + RscTop * pRoot; DECL_LINK( CallBackWriteRc, RscTop * ); DECL_LINK( CallBackWriteSrc, RscTop * ); @@ -695,7 +695,7 @@ public: { aEnumObj.pTypCont = pTC; aEnumObj.fOutput = fOutput; - pRoot = pR; + pRoot = pR; } ERRTYPE WriteRc() { @@ -731,13 +731,13 @@ public: return aEnumObj.aError; } - void WriteSyntax() + void WriteSyntax() { pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteSyntax ) ); } - void WriteRcCtor() + void WriteRcCtor() { pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteRcCtor ) ); @@ -746,11 +746,11 @@ public: /************************************************************************* |* -|* RscRscEnumerateRef :: CallBack... +|* RscRscEnumerateRef :: CallBack... |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef ) @@ -794,17 +794,17 @@ IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef ) /************************************************************************* |* -|* RscTypCont :: WriteRc +|* RscTypCont :: WriteRc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 22.07.91 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 22.07.91 |* *************************************************************************/ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) { - ERRTYPE aError; + ERRTYPE aError; RscEnumerateRef aEnumRef( this, pRoot, rContext.fOutput ); aIdTranslator.clear(); @@ -817,23 +817,23 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) RscWriteRc aMem( nByteOrder ); aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE ); aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput ); - + return aError; } /************************************************************************* |* -|* RscTypCont :: WriteSrc +|* RscTypCont :: WriteSrc |* -|* Beschreibung RES.DOC -|* Ersterstellung MM 22.03.90 -|* Letzte Aenderung MM 27.06.90 +|* Beschreibung RES.DOC +|* Ersterstellung MM 22.03.90 +|* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey, CharSet /*nCharSet*/, BOOL bName ) { - RscFile * pFName; + RscFile * pFName; RscEnumerateRef aEnumRef( this, pRoot, fOutput ); unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf }; @@ -881,11 +881,11 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey, /************************************************************************* |* -|* RscTypCont :: WriteHxx +|* RscTypCont :: WriteHxx |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 +|* Beschreibung +|* Ersterstellung MM 30.05.91 +|* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) @@ -926,11 +926,11 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) fprintf( fOutput, "#include <svtools/svmedit.hxx>\n" ); RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - ERRTYPE aError; + ERRTYPE aError; if( NOFILE_INDEX == nFileKey ) { - RscFile * pFName; + RscFile * pFName; pFName = aFileTab.First(); while( pFName ) @@ -947,18 +947,18 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) /************************************************************************* |* -|* RscTypCont :: WriteCxx +|* RscTypCont :: WriteCxx |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 +|* Beschreibung +|* Ersterstellung MM 30.05.91 +|* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey, const ByteString & rHxxName ) { RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - ERRTYPE aError; + ERRTYPE aError; fprintf( fOutput, "#include <string.h>\n" ); WriteInc( fOutput, nFileKey ); if( rHxxName.Len() ) @@ -967,7 +967,7 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey, if( NOFILE_INDEX == nFileKey ) { - RscFile * pFName; + RscFile * pFName; pFName = aFileTab.First(); while( pFName ) @@ -984,11 +984,11 @@ ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey, /************************************************************************* |* -|* RscTypCont :: WriteSyntax +|* RscTypCont :: WriteSyntax |* -|* Beschreibung -|* Ersterstellung MM 30.05.91 -|* Letzte Aenderung MM 30.05.91 +|* Beschreibung +|* Ersterstellung MM 30.05.91 +|* Letzte Aenderung MM 30.05.91 |* *************************************************************************/ void RscTypCont::WriteSyntax( FILE * fOutput ) @@ -1011,11 +1011,11 @@ void RscTypCont::WriteRcCtor /************************************************************************* |* -|* RscTypCont :: Delete() +|* RscTypCont :: Delete() |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ class RscDel @@ -1050,11 +1050,11 @@ void RscTypCont :: Delete( ULONG lFileKey ){ /************************************************************************* |* -|* RscTypCont :: MakeConsistent() +|* RscTypCont :: MakeConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 +|* Beschreibung +|* Ersterstellung MM 23.09.91 +|* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop, diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 9931392f4508..f8829f1aab9c 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,9 +73,9 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal ) /****************** C O D E **********************************************/ /************************************************************************* -|* RscTypCont::InitLangType() +|* RscTypCont::InitLangType() |* -|* Beschreibung +|* Beschreibung *************************************************************************/ typedef std::hash_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; @@ -93,13 +93,13 @@ void RscLangEnum::Init( RscNameTable& rNames ) { SetConstant( rNames.Put( "SYSTEM", CONSTNAME, (long)LANGUAGE_SYSTEM ), LANGUAGE_SYSTEM ); SetConstant( rNames.Put( "DONTKNOW", CONSTNAME, LANGUAGE_DONTKNOW ), LANGUAGE_DONTKNOW ); - + sal_Int32 nIndex = 0; mnLangId = 0x400; // stay away from selfdefined... char csep = '-'; const MsLangId::IsoLangEntry* pLangEntry; ByteString aCountry, aLang; - + while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW )) { #if OSL_DEBUG_LEVEL > 2 @@ -174,7 +174,7 @@ void RscLangEnum::Init( RscNameTable& rNames ) nTokenCounter++; } } - + SetConstant( rNames.Put( "LANGUAGE_USER1", CONSTNAME, LANGUAGE_USER1 ), LANGUAGE_USER1 ); SetConstant( rNames.Put( "LANGUAGE_USER2", CONSTNAME, LANGUAGE_USER2 ), LANGUAGE_USER2 ); SetConstant( rNames.Put( "LANGUAGE_USER3", CONSTNAME, LANGUAGE_USER3 ), LANGUAGE_USER3 ); @@ -214,11 +214,11 @@ RscEnum * RscTypCont::InitLangType() /************************************************************************* |* -|* RscTypCont::InitFieldUnitsType() +|* RscTypCont::InitFieldUnitsType() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 +|* Beschreibung +|* Ersterstellung MM 22.03.91 +|* Letzte Aenderung MM 27.06.91 |* *************************************************************************/ RscEnum * RscTypCont::InitFieldUnitsType() @@ -248,11 +248,11 @@ RscEnum * RscTypCont::InitFieldUnitsType() /************************************************************************* |* -|* RscTypCont::InitTimeFieldFormat() +|* RscTypCont::InitTimeFieldFormat() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 +|* Beschreibung +|* Ersterstellung MM 22.03.91 +|* Letzte Aenderung MM 27.06.91 |* *************************************************************************/ RscEnum * RscTypCont::InitTimeFieldFormat() @@ -270,11 +270,11 @@ RscEnum * RscTypCont::InitTimeFieldFormat() /************************************************************************* |* -|* RscTypCont::InitColor() +|* RscTypCont::InitColor() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscEnum * RscTypCont::InitColor(){ @@ -303,11 +303,11 @@ RscEnum * RscTypCont::InitColor(){ /************************************************************************* |* -|* RscTypCont::InitMapUnit() +|* RscTypCont::InitMapUnit() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscEnum * RscTypCont::InitMapUnit(){ @@ -333,11 +333,11 @@ RscEnum * RscTypCont::InitMapUnit(){ /************************************************************************* |* -|* RscTypCont::InitKey() +|* RscTypCont::InitKey() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscEnum * RscTypCont::InitKey(){ @@ -457,11 +457,11 @@ RscEnum * RscTypCont::InitKey(){ /************************************************************************* |* -|* RscTypCont::InitTriState() +|* RscTypCont::InitTriState() |* -|* Beschreibung -|* Ersterstellung MM 26.11.91 -|* Letzte Aenderung MM 26.11.91 +|* Beschreibung +|* Ersterstellung MM 26.11.91 +|* Letzte Aenderung MM 26.11.91 |* *************************************************************************/ RscEnum * RscTypCont::InitTriState(){ @@ -477,11 +477,11 @@ RscEnum * RscTypCont::InitTriState(){ /************************************************************************* |* -|* RscTypCont::InitMessButtons() +|* RscTypCont::InitMessButtons() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscEnum * RscTypCont::InitMessButtons() @@ -499,11 +499,11 @@ RscEnum * RscTypCont::InitMessButtons() /************************************************************************* |* -|* RscTypCont::InitMessDefButton() +|* RscTypCont::InitMessDefButton() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscEnum * RscTypCont::InitMessDefButton(){ @@ -522,17 +522,17 @@ RscEnum * RscTypCont::InitMessDefButton(){ /************************************************************************* |* -|* RscTypCont::InitGeometry() +|* RscTypCont::InitGeometry() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscTupel * RscTypCont::InitGeometry() { - RscTop * pTupel; - Atom nId; + RscTop * pTupel; + Atom nId; // Clientvariablen einfuegen pTupel = new RscTupel( pHS->getID( "TupelDeltaSystem" ), @@ -551,11 +551,11 @@ RscTupel * RscTypCont::InitGeometry() /************************************************************************* |* -|* RscTypCont::InitLangGeometry() +|* RscTypCont::InitLangGeometry() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo ) @@ -565,11 +565,11 @@ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo ) /************************************************************************* |* -|* RscTypCont::InitStringList() +|* RscTypCont::InitStringList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscCont * RscTypCont::InitStringList() @@ -584,11 +584,11 @@ RscCont * RscTypCont::InitStringList() /************************************************************************* |* -|* RscTypCont::InitLangStringList() +|* RscTypCont::InitLangStringList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) @@ -599,17 +599,17 @@ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) /************************************************************************* |* -|* RscTypCont::InitStringTupel() +|* RscTypCont::InitStringTupel() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscTupel * RscTypCont::InitStringTupel() { - RscTop * pTupel; - Atom nId; + RscTop * pTupel; + Atom nId; // Clientvariablen einfuegen pTupel = new RscTupel( pHS->getID( "CharsTupel" ), RSC_NOTYPE, NULL ); @@ -623,17 +623,17 @@ RscTupel * RscTypCont::InitStringTupel() /************************************************************************* |* -|* RscTypCont::InitStringLongTupel() +|* RscTypCont::InitStringLongTupel() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ RscTupel * RscTypCont::InitStringLongTupel() { - RscTop * pTupel; - Atom nId; + RscTop * pTupel; + Atom nId; // Clientvariablen einfuegen pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE, NULL ); @@ -647,11 +647,11 @@ RscTupel * RscTypCont::InitStringLongTupel() /************************************************************************* |* -|* RscTypCont::InitStringTupelList() +|* RscTypCont::InitStringTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) @@ -666,11 +666,11 @@ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) /************************************************************************* |* -|* RscTypCont::InitStringLongTupelList() +|* RscTypCont::InitStringLongTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) @@ -685,11 +685,11 @@ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) /************************************************************************* |* -|* RscTypCont::InitLangStringTupelList() +|* RscTypCont::InitLangStringTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst ) @@ -700,11 +700,11 @@ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst ) /************************************************************************* |* -|* RscTypCont::InitLangStringLongTupelList() +|* RscTypCont::InitLangStringLongTupelList() |* -|* Beschreibung -|* Ersterstellung MM 24.05.91 -|* Letzte Aenderung MM 24.05.91 +|* Beschreibung +|* Ersterstellung MM 24.05.91 +|* Letzte Aenderung MM 24.05.91 |* *************************************************************************/ RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst ) diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 97046f60fb85..eb4e8b5940d9 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ #include <yyrscyacc.hxx> /************************************************************************* -|* RscTypCont::InsWinBit() +|* RscTypCont::InsWinBit() *************************************************************************/ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, Atom nVal ) @@ -64,17 +64,17 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, VAR_NODATAINST, 0, nWinBitVarId ); } -#define INS_WINBIT( pClass, WinBit ) \ +#define INS_WINBIT( pClass, WinBit ) \ InsWinBit( pClass, #WinBit, n##WinBit##Id ); /************************************************************************* -|* RscTypCont::InitClassMgr() +|* RscTypCont::InitClassMgr() *************************************************************************/ RscTop * RscTypCont::InitClassMgr() { - RscTop * pClassMgr; - RscBaseCont * pClass; - Atom nId; + RscTop * pClassMgr; + RscBaseCont * pClass; + Atom nId; aBaseLst.Insert( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ), @@ -87,7 +87,7 @@ RscTop * RscTypCont::InitClassMgr() // Variablen anlegen { - RscContWriteSrc * pCont; + RscContWriteSrc * pCont; // Variablen anlegen aBaseLst.Insert( @@ -107,11 +107,11 @@ RscTop * RscTypCont::InitClassMgr() } /************************************************************************* -|* RscTypCont::InitClassString() +|* RscTypCont::InitClassString() *************************************************************************/ RscTop * RscTypCont::InitClassString( RscTop * pSuper ){ - Atom nId; - RscTop * pClassString; + Atom nId; + RscTop * pClassString; nId = pHS->getID( "String" ); pClassString = new RscClass( nId, RSC_STRING, pSuper ); @@ -125,11 +125,11 @@ RscTop * RscTypCont::InitClassString( RscTop * pSuper ){ } /************************************************************************* -|* RscTypCont::InitClassBitmap() +|* RscTypCont::InitClassBitmap() *************************************************************************/ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){ - Atom nId; - RscTop * pClassBitmap; + Atom nId; + RscTop * pClassBitmap; nId = pHS->getID( "Bitmap" ); pClassBitmap = new RscSysDepend( nId, RSC_BITMAP, pSuper ); @@ -145,11 +145,11 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){ } /************************************************************************* -|* RscTypCont::InitClassColor() +|* RscTypCont::InitClassColor() *************************************************************************/ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){ - Atom nId; - RscTop * pClassColor; + Atom nId; + RscTop * pClassColor; // Klasse anlegen nId = pHS->getID( "Color" ); @@ -171,13 +171,13 @@ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){ } /************************************************************************* -|* RscTypCont::InitClassImage() +|* RscTypCont::InitClassImage() *************************************************************************/ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassColor ) { - Atom nId; - RscTop * pClassImage; + Atom nId; + RscTop * pClassImage; // Klasse anlegen nId = pHS->getID( "Image" ); @@ -198,13 +198,13 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, } /************************************************************************* -|* RscTypCont::InitClassImageList() +|* RscTypCont::InitClassImageList() *************************************************************************/ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitmap*/, RscTop * pClassColor, RscCont * pStrLst ) { - Atom nId; - RscTop * pClassImageList; + Atom nId; + RscTop * pClassImageList; // Klasse anlegen nId = pHS->getID( "ImageList" ); @@ -218,14 +218,14 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma nId = aNmTb.Put( "MaskColor", VARNAME ); pClassImageList->SetVariable( nId, pClassColor, NULL, VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR ); - + RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE ); pCont->SetTypeClass( &aIdUShort ); aBaseLst.Insert( pCont, LIST_APPEND ); nId = aNmTb.Put( "IdList", VARNAME ); pClassImageList->SetVariable( nId, pCont, NULL, 0, RSC_IMAGELIST_IDLIST ); - + nId = aNmTb.Put( "FileList", VARNAME ); pClassImageList->SetVariable( nId, pStrLst ); @@ -236,13 +236,13 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma } /************************************************************************* -|* RscTypCont::InitClassWindow() +|* RscTypCont::InitClassWindow() *************************************************************************/ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ) { - Atom nId; - RscTop * pClassWindow; + Atom nId; + RscTop * pClassWindow; // Klasse anlegen nId = pHS->getID( "Window" ); @@ -252,9 +252,9 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, // Variablen anlegen { - RscFlag * pFlag; + RscFlag * pFlag; RscClient * pClient; - Atom nVarId, nDisableId, nOutputSizeId; + Atom nVarId, nDisableId, nOutputSizeId; aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagWndExtra" ), RSC_NOTYPE ), @@ -313,7 +313,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nRsc_WIDTH = nId = aNmTb.Put( "_Width", VARNAME ); pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_WIDTH ); nRsc_HEIGHT = nId = aNmTb.Put( "_Height", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_HEIGHT ); + pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_HEIGHT ); nRsc_DELTALANG = nId = aNmTb.Put( "DeltaLang", VARNAME ); pClassWindow->SetVariable( nId, pLangGeo, NULL, VAR_NORC | VAR_NOENUM); @@ -350,12 +350,12 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, } /************************************************************************* -|* RscTypCont::InitClassSystemWindow() +|* RscTypCont::InitClassSystemWindow() *************************************************************************/ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper ) { - Atom nId; - RscTop * pClassSystemWindow; + Atom nId; + RscTop * pClassSystemWindow; // Klasse anlegen nId = pHS->getID( "SystemWindow" ); @@ -375,12 +375,12 @@ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassWorkWindow() +|* RscTypCont::InitClassWorkWindow() *************************************************************************/ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) { - Atom nId; - RscTop * pClassWorkWindow; + Atom nId; + RscTop * pClassWorkWindow; // Klasse anlegen nId = pHS->getID( "WorkWindow" ); @@ -391,7 +391,7 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) // Variablen anlegen { - Atom nVarId; + Atom nVarId; RscEnum * pShow; aBaseLst.Insert( pShow = new RscEnum( pHS->getID( "EnumShowState" ), @@ -412,12 +412,12 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassDialogBox() +|* RscTypCont::InitClassDialogBox() *************************************************************************/ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper ) { - Atom nId; - RscTop * pClassDialog; + Atom nId; + RscTop * pClassDialog; // Klasse anlegen nId = pHS->getID( "ModalDialog" ); @@ -431,12 +431,12 @@ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassModelessDialog() +|* RscTypCont::InitClassModelessDialog() *************************************************************************/ RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper ) { - Atom nId; - RscTop * pClassDialog; + Atom nId; + RscTop * pClassDialog; // Klasse anlegen nId = pHS->getID( "ModelessDialog" ); @@ -448,12 +448,12 @@ RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassControl() +|* RscTypCont::InitClassControl() *************************************************************************/ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) { - Atom nId; - RscTop * pClassControl; + Atom nId; + RscTop * pClassControl; // Klasse anlegen nId = pHS->getID( "Control" ); @@ -468,12 +468,12 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassCheckBox() +|* RscTypCont::InitClassCheckBox() *************************************************************************/ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) { - Atom nId; - RscTop * pClassCheckBox; + Atom nId; + RscTop * pClassCheckBox; // Klasse anlegen nId = pHS->getID( "CheckBox" ); @@ -486,7 +486,7 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) INS_WINBIT( pClassCheckBox, Top ) INS_WINBIT( pClassCheckBox, VCenter ) INS_WINBIT( pClassCheckBox, Bottom ) - + nId = aNmTb.Put( "Check", VARNAME ); pClassCheckBox->SetVariable( nId, &aBool ); @@ -494,12 +494,12 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassPushButton() +|* RscTypCont::InitClassPushButton() *************************************************************************/ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) { - Atom nId; - RscTop * pClassPushButton; + Atom nId; + RscTop * pClassPushButton; // Klasse anlegen nId = pHS->getID( "PushButton" ); @@ -516,13 +516,13 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassTriStateBox() +|* RscTypCont::InitClassTriStateBox() *************************************************************************/ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState ) { - Atom nId; - RscTop * pClassTriStateBox; + Atom nId; + RscTop * pClassTriStateBox; nId = pHS->getID( "TriStateBox" ); pClassTriStateBox = new RscClass( nId, RSC_TRISTATEBOX, pSuper ); @@ -539,13 +539,13 @@ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassMenuButton() +|* RscTypCont::InitClassMenuButton() *************************************************************************/ RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper, RscTop * pClassMenu ) { - Atom nId; - RscTop * pClassMenuButton; + Atom nId; + RscTop * pClassMenuButton; nId = pHS->getID( "MenuButton" ); pClassMenuButton = new RscClass( nId, RSC_MENUBUTTON, pSuper ); @@ -562,14 +562,14 @@ RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper, /************************************************************************* -|* RscTypCont::InitClassImageButton() +|* RscTypCont::InitClassImageButton() *************************************************************************/ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, RscTop * pClassImage, RscEnum * pTriState ) { - Atom nId; - RscTop * pClassImageButton; + Atom nId; + RscTop * pClassImageButton; // Klasse anlegen nId = pHS->getID( "ImageButton" ); @@ -585,7 +585,7 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, } // Variablen anlegen { - Atom nVarId; + Atom nVarId; RscEnum * pSymbol; aBaseLst.Insert( pSymbol = new RscEnum( pHS->getID( "EnumSymbolButton" ), @@ -633,15 +633,15 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassEdit() +|* RscTypCont::InitClassEdit() *************************************************************************/ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) { - Atom nId; - RscTop * pClassEdit; + Atom nId; + RscTop * pClassEdit; // Klasse anlegen - nId = pHS->getID( "Edit" ); + nId = pHS->getID( "Edit" ); pClassEdit = new RscClass( nId, RSC_EDIT, pSuper ); pClassEdit->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aNmTb.Put( nId, CLASSNAME, pClassEdit ); @@ -659,12 +659,12 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassMultiLineedit() +|* RscTypCont::InitClassMultiLineedit() *************************************************************************/ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper ) { - Atom nId; - RscTop * pClassMultiLineEdit; + Atom nId; + RscTop * pClassMultiLineEdit; // Klasse anlegen nId = pHS->getID( "MultiLineEdit" ); @@ -682,12 +682,12 @@ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassScrollBar() +|* RscTypCont::InitClassScrollBar() *************************************************************************/ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) { - Atom nId; - RscTop * pClassScrollBar; + Atom nId; + RscTop * pClassScrollBar; // Klasse anlegen nId = pHS->getID( "ScrollBar" ); @@ -699,11 +699,11 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) nId = aNmTb.Put( "MinPos", VARNAME ); pClassScrollBar->SetVariable( nId, &aShort ); { - RSCINST aDfltI; + RSCINST aDfltI; aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); aDfltI.pClass->SetNumber( aDfltI, 100 ); -// aDfltI.pClass->MakeDefault( aDfltI ); +// aDfltI.pClass->MakeDefault( aDfltI ); nId = aNmTb.Put( "MaxPos", VARNAME ); pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); @@ -711,21 +711,21 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) nId = aNmTb.Put( "ThumbPos", VARNAME ); pClassScrollBar->SetVariable( nId, &aShort ); { - RSCINST aDfltI; + RSCINST aDfltI; aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); aDfltI.pClass->SetNumber( aDfltI, 1 ); -// aDfltI.pClass->MakeDefault( aDfltI ); +// aDfltI.pClass->MakeDefault( aDfltI ); nId = aNmTb.Put( "PageSize", VARNAME); pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); } { - RSCINST aDfltI; + RSCINST aDfltI; aDfltI = aShort.Create( NULL, RSCINST(), FALSE ); aDfltI.pClass->SetNumber( aDfltI, 1 ); -// aDfltI.pClass->MakeDefault( aDfltI ); +// aDfltI.pClass->MakeDefault( aDfltI ); nId = aNmTb.Put( "LineSize", VARNAME ); pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); } @@ -740,12 +740,12 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassListBox() +|* RscTypCont::InitClassListBox() *************************************************************************/ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) { - Atom nId; - RscTop * pClassListBox; + Atom nId; + RscTop * pClassListBox; // Klasse anlegen nId = pHS->getID( "ListBox" ); @@ -775,12 +775,12 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) } /************************************************************************* -|* RscTypCont::InitClassMultiListBox() +|* RscTypCont::InitClassMultiListBox() *************************************************************************/ RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper ) { - Atom nId; - RscTop * pClassMultiListBox; + Atom nId; + RscTop * pClassMultiListBox; // Klasse anlegen nId = pHS->getID( "MultiListBox" ); @@ -794,12 +794,12 @@ RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassComboBox() +|* RscTypCont::InitClassComboBox() *************************************************************************/ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) { - Atom nId; - RscTop * pClassComboBox; + Atom nId; + RscTop * pClassComboBox; // Klasse anlegen nId = pHS->getID( "ComboBox" ); @@ -823,12 +823,12 @@ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) } /************************************************************************* -|* RscTypCont::InitClassFixedText() +|* RscTypCont::InitClassFixedText() *************************************************************************/ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) { - Atom nId; - RscTop * pClassFixedText; + Atom nId; + RscTop * pClassFixedText; // Klasse anlegen nId = pHS->getID( "FixedText" ); @@ -851,12 +851,12 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassFixedBitmap() +|* RscTypCont::InitClassFixedBitmap() *************************************************************************/ RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap ) { - Atom nId; - RscTop * pClassFixedBitmap; + Atom nId; + RscTop * pClassFixedBitmap; // Klasse anlegen nId = pHS->getID( "FixedBitmap" ); @@ -874,12 +874,12 @@ RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitma } /************************************************************************* -|* RscTypCont::InitClassFixedImage() +|* RscTypCont::InitClassFixedImage() *************************************************************************/ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ) { - Atom nId; - RscTop * pClassFixedImage; + Atom nId; + RscTop * pClassFixedImage; // Klasse anlegen nId = pHS->getID( "FixedImage" ); @@ -895,12 +895,12 @@ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage } /************************************************************************* -|* RscTypCont::InitClassImageRadioButton() +|* RscTypCont::InitClassImageRadioButton() *************************************************************************/ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) { - Atom nId; - RscTop * pClassRadioButton; + Atom nId; + RscTop * pClassRadioButton; // Klasse anlegen nId = pHS->getID( "RadioButton" ); @@ -913,7 +913,7 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) INS_WINBIT( pClassRadioButton, Top ) INS_WINBIT( pClassRadioButton, VCenter ) INS_WINBIT( pClassRadioButton, Bottom ) - + nId = aNmTb.Put( "Check", VARNAME ); pClassRadioButton->SetVariable( nId, &aBool ); @@ -921,12 +921,12 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassImageRadioButton() +|* RscTypCont::InitClassImageRadioButton() *************************************************************************/ RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage ) { - Atom nId; - RscTop * pClassImageRadioButton; + Atom nId; + RscTop * pClassImageRadioButton; // Klasse anlegen nId = pHS->getID( "ImageRadioButton" ); @@ -943,12 +943,12 @@ RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClass } /************************************************************************* -|* RscTypCont::InitClassKeyCode() +|* RscTypCont::InitClassKeyCode() *************************************************************************/ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { - Atom nId; - RscTop * pClassKeyCode; + Atom nId; + RscTop * pClassKeyCode; // Klasse anlegen nId = pHS->getID( "KeyCode" ); @@ -960,9 +960,9 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) pClassKeyCode->SetVariable( nId, pKey ); { - RscFlag * pFlag; + RscFlag * pFlag; RscClient * pClient; - Atom nVarId, nShiftId, nMod1Id, nMod2Id; + Atom nVarId, nShiftId, nMod1Id, nMod2Id; aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ), RSC_NOTYPE ), @@ -1008,7 +1008,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) VAR_NODATAINST, 0, nVarId ); } { - Atom nVarId; + Atom nVarId; RscEnum * pKeyFunc; aBaseLst.Insert( pKeyFunc = new RscEnum( pHS->getID( "EnumKeyFunc" ), @@ -1043,13 +1043,13 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) } /************************************************************************* -|* RscTypCont::InitClassAccelItem() +|* RscTypCont::InitClassAccelItem() *************************************************************************/ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, RscTop * pClassKeyCode ) { - Atom nId; - RscTop * pClassAccelItem; + Atom nId; + RscTop * pClassAccelItem; // Klasse anlegen nId = pHS->getID( "AcceleratorItem" ); @@ -1069,12 +1069,12 @@ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassAccelm() +|* RscTypCont::InitClassAccelm() *************************************************************************/ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) { - Atom nId; - RscTop * pClassAccel; + Atom nId; + RscTop * pClassAccel; // Klasse anlegen nId = pHS->getID( "Accelerator" ); @@ -1101,14 +1101,14 @@ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) } /************************************************************************* -|* RscTypCont::InitClassMenuItem() +|* RscTypCont::InitClassMenuItem() *************************************************************************/ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassKeyCode ) { - Atom nId; - RscTop * pClassMenuItem; + Atom nId; + RscTop * pClassMenuItem; // Klasse anlegen nId = pHS->getID( "MenuItem" ); @@ -1123,10 +1123,10 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, pClassMenuItem->SetVariable( nId, &aIdNoZeroUShort, NULL, 0, RSC_MENUITEM_ID ); { - RscFlag * pFlag; + RscFlag * pFlag; RscClient * pClient; - Atom nVarId, nAutoCheckId, nRadioCheckId; - Atom nCheckableId, nAboutId, nHelpId; + Atom nVarId, nAutoCheckId, nRadioCheckId; + Atom nCheckableId, nAboutId, nHelpId; aBaseLst.Insert( pFlag = new RscFlag( pHS->getID( "FlagMenuState" ), RSC_NOTYPE ), @@ -1221,13 +1221,13 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassMenu() +|* RscTypCont::InitClassMenu() *************************************************************************/ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, RscTop * pClassMenuItem ) { - Atom nId; - RscTop * pClassMenu; + Atom nId; + RscTop * pClassMenu; // Klasse anlegen nId = pHS->getID( "Menu" ); @@ -1256,14 +1256,14 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassMessageBox() +|* RscTypCont::InitClassMessageBox() *************************************************************************/ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, RscEnum * pMessButtons, RscEnum * pMessDefButton ) { - Atom nId; - RscTop * pClassMessBox; + Atom nId; + RscTop * pClassMessBox; // Klasse anlegen nId = pHS->getID( "MessBox" ); @@ -1291,12 +1291,12 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassSplitter() +|* RscTypCont::InitClassSplitter() *************************************************************************/ RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper ) { - Atom nId; - RscTop * pClassSplitter; + Atom nId; + RscTop * pClassSplitter; // Klasse anlegen nId = pHS->getID( "Splitter" ); @@ -1312,12 +1312,12 @@ RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassSplitWindow() +|* RscTypCont::InitClassSplitWindow() *************************************************************************/ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) { - Atom nId; - RscTop * pClassSplitWindow; + Atom nId; + RscTop * pClassSplitWindow; // Klasse anlegen nId = pHS->getID( "SplitWindow" ); @@ -1333,12 +1333,12 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassTime() +|* RscTypCont::InitClassTime() *************************************************************************/ RscTop * RscTypCont::InitClassTime( RscTop * pSuper ) { - Atom nId; - RscTop * pClassTime; + Atom nId; + RscTop * pClassTime; // Klasse anlegen nId = pHS->getID( "Time" ); @@ -1349,7 +1349,7 @@ RscTop * RscTypCont::InitClassTime( RscTop * pSuper ) // Variablen anlegen nId = aNmTb.Put( "Hour", VARNAME ); - pClassTime->SetVariable( nId, &a0to23Short, NULL, 0, TIME_HOUR ); + pClassTime->SetVariable( nId, &a0to23Short, NULL, 0, TIME_HOUR ); nId = aNmTb.Put( "Minute", VARNAME ); pClassTime->SetVariable( nId, &a0to59Short, NULL, 0, TIME_MINUTE ); @@ -1364,12 +1364,12 @@ RscTop * RscTypCont::InitClassTime( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassDate() +|* RscTypCont::InitClassDate() *************************************************************************/ RscTop * RscTypCont::InitClassDate( RscTop * pSuper ) { - Atom nId; - RscTop * pClassDate; + Atom nId; + RscTop * pClassDate; // Klasse anlegen nId = pHS->getID( "Date" ); @@ -1392,12 +1392,12 @@ RscTop * RscTypCont::InitClassDate( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassPatternFormatter() +|* RscTypCont::InitClassPatternFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper ) { - Atom nId; - RscTop * pClassPattern; + Atom nId; + RscTop * pClassPattern; // Klasse anlegen nId = pHS->getID( "PatternFormatter" ); @@ -1419,12 +1419,12 @@ RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassNumericFormatter() +|* RscTypCont::InitClassNumericFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) { - Atom nId; - RscTop * pClassNumeric; + Atom nId; + RscTop * pClassNumeric; // Klasse anlegen nId = pHS->getID( "NumericFormatter" ); @@ -1455,13 +1455,13 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassMetricFormatter() +|* RscTypCont::InitClassMetricFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, RscEnum * pFieldUnits ) { - Atom nId; - RscTop * pClassMetric; + Atom nId; + RscTop * pClassMetric; // Klasse anlegen nId = pHS->getID( "MetricFormatter" ); @@ -1480,15 +1480,15 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassCurrencyFormatter() +|* RscTypCont::InitClassCurrencyFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassCurrencyFormatter ( RscTop * pSuper, RscEnum * /* pFieldUnits */) { - Atom nId; - RscTop * pClassCurrency; + Atom nId; + RscTop * pClassCurrency; // Klasse anlegen nId = pHS->getID( "CurrencyFormatter" ); @@ -1499,13 +1499,13 @@ RscTop * RscTypCont::InitClassCurrencyFormatter } /************************************************************************* -|* RscTypCont::InitClassDateFormatter() +|* RscTypCont::InitClassDateFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate ) { - Atom nId; - RscTop * pClassDateF; + Atom nId; + RscTop * pClassDateF; // Klasse anlegen nId = pHS->getID( "DateFormatter" ); @@ -1533,14 +1533,14 @@ RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassTimeFormatter() +|* RscTypCont::InitClassTimeFormatter() *************************************************************************/ RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper, RscTop * pClassTime, RscEnum * pTimeFieldFormat ) { - Atom nId; - RscTop * pClassTimeF; + Atom nId; + RscTop * pClassTimeF; // Klasse anlegen nId = pHS->getID( "TimeFormatter" ); @@ -1571,12 +1571,12 @@ RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassSpinField() +|* RscTypCont::InitClassSpinField() *************************************************************************/ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) { - Atom nId; - RscTop * pClassSpinField; + Atom nId; + RscTop * pClassSpinField; // Klasse anlegen nId = pHS->getID( "SpinField" ); @@ -1592,12 +1592,12 @@ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassPatternField() +|* RscTypCont::InitClassPatternField() *************************************************************************/ RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper ) { - Atom nId; - RscTop * pClassPatternField; + Atom nId; + RscTop * pClassPatternField; // Klasse anlegen nId = pHS->getID( "PatternField" ); @@ -1610,12 +1610,12 @@ RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassNumericField() +|* RscTypCont::InitClassNumericField() *************************************************************************/ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper ) { - Atom nId; - RscTop * pClassNumericField; + Atom nId; + RscTop * pClassNumericField; // Klasse anlegen nId = pHS->getID( "NumericField" ); @@ -1638,12 +1638,12 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassMetricField() +|* RscTypCont::InitClassMetricField() *************************************************************************/ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) { - Atom nId; - RscTop * pClassMetricField; + Atom nId; + RscTop * pClassMetricField; // Klasse anlegen nId = pHS->getID( "MetricField" ); @@ -1667,7 +1667,7 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassCurrencyField() +|* RscTypCont::InitClassCurrencyField() *************************************************************************/ RscTop * RscTypCont::InitClassCurrencyField ( @@ -1676,8 +1676,8 @@ RscTop * RscTypCont::InitClassCurrencyField RscTop * pSuper ) { - Atom nId; - RscTop * pClassCurrencyField; + Atom nId; + RscTop * pClassCurrencyField; // Klasse anlegen nId = pHS->getID( pClassName ); @@ -1701,12 +1701,12 @@ RscTop * RscTypCont::InitClassCurrencyField } /************************************************************************* -|* RscTypCont::InitClassDateField() +|* RscTypCont::InitClassDateField() *************************************************************************/ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate ) { - Atom nId; - RscTop * pClassDateField; + Atom nId; + RscTop * pClassDateField; // Klasse anlegen nId = pHS->getID( "DateField" ); @@ -1725,12 +1725,12 @@ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate ) } /************************************************************************* -|* RscTypCont::InitClassTimeField() +|* RscTypCont::InitClassTimeField() *************************************************************************/ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ) { - Atom nId; - RscTop * pClassTimeField; + Atom nId; + RscTop * pClassTimeField; // Klasse anlegen nId = pHS->getID( "TimeField" ); @@ -1749,12 +1749,12 @@ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ) } /************************************************************************* -|* RscTypCont::InitClassPatternBox() +|* RscTypCont::InitClassPatternBox() *************************************************************************/ RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper ) { - Atom nId; - RscTop * pClassPatternBox; + Atom nId; + RscTop * pClassPatternBox; // Klasse anlegen nId = pHS->getID( "PatternBox" ); @@ -1767,12 +1767,12 @@ RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassNumericBox() +|* RscTypCont::InitClassNumericBox() *************************************************************************/ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) { - Atom nId; - RscTop * pClassNumericBox; + Atom nId; + RscTop * pClassNumericBox; // Klasse anlegen nId = pHS->getID( "NumericBox" ); @@ -1787,12 +1787,12 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassMetricBox() +|* RscTypCont::InitClassMetricBox() *************************************************************************/ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper ) { - Atom nId; - RscTop * pClassMetricBox; + Atom nId; + RscTop * pClassMetricBox; // Klasse anlegen nId = pHS->getID( "MetricBox" ); @@ -1807,7 +1807,7 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassCurrencyBox() +|* RscTypCont::InitClassCurrencyBox() *************************************************************************/ RscTop * RscTypCont::InitClassCurrencyBox ( @@ -1816,8 +1816,8 @@ RscTop * RscTypCont::InitClassCurrencyBox RscTop * pSuper ) { - Atom nId; - RscTop * pClassCurrencyBox; + Atom nId; + RscTop * pClassCurrencyBox; // Klasse anlegen nId = pHS->getID( pClassName ); @@ -1832,13 +1832,13 @@ RscTop * RscTypCont::InitClassCurrencyBox } /************************************************************************* -|* RscTypCont::InitClassDateBox() +|* RscTypCont::InitClassDateBox() *************************************************************************/ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper, RscTop * /*pClassDate*/ ) { - Atom nId; - RscTop * pClassDateBox; + Atom nId; + RscTop * pClassDateBox; // Klasse anlegen nId = pHS->getID( "DateBox" ); @@ -1853,13 +1853,13 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassTimeBox() +|* RscTypCont::InitClassTimeBox() *************************************************************************/ RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper, RscTop * /*pClassTime*/ ) { - Atom nId; - RscTop * pClassTimeBox; + Atom nId; + RscTop * pClassTimeBox; // Klasse anlegen nId = pHS->getID( "TimeBox" ); @@ -1874,13 +1874,13 @@ RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassDockWindow() +|* RscTypCont::InitClassDockWindow() *************************************************************************/ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { - Atom nId; - RscTop * pClassDockWindow; + Atom nId; + RscTop * pClassDockWindow; // Klasse anlegen nId = pHS->getID( "DockingWindow" ); @@ -1891,7 +1891,7 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, // Variablen anlegen nId = aNmTb.Put( "_FloatingPosMapMode", VARNAME ); pClassDockWindow->SetVariable( nId, pMapUnit, NULL, 0, - RSC_DOCKINGWINDOW_XYMAPMODE ); + RSC_DOCKINGWINDOW_XYMAPMODE ); nId = aNmTb.Put( "_FloatingPosX", VARNAME ); pClassDockWindow->SetVariable( nId, &aShort, NULL, 0, RSC_DOCKINGWINDOW_X ); @@ -1914,15 +1914,15 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassToolBoxItem() +|* RscTypCont::InitClassToolBoxItem() *************************************************************************/ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, RscEnum * pTriState ) { - Atom nId; - RscTop * pClassToolBoxItem; + Atom nId; + RscTop * pClassToolBoxItem; // Klasse anlegen nId = pHS->getID( "ToolBoxItem" ); @@ -1947,12 +1947,12 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, // Variable einfuegen nId = aNmTb.Put( "Type", VARNAME ); pClassToolBoxItem->SetVariable( nId, pEnum, NULL, 0, - RSC_TOOLBOXITEM_TYPE ); + RSC_TOOLBOXITEM_TYPE ); } { - RscFlag * pFlag; + RscFlag * pFlag; RscClient * pClient; - Atom l_nVarId, l_nAutoCheckId, l_nRadioCheckId, l_nCheckableId, l_nLeftId, l_nAutoSizeId, l_nDropDownId; + 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 ), @@ -2017,7 +2017,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, } nId = aNmTb.Put( "HelpID", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0, - RSC_TOOLBOXITEM_HELPID ); + RSC_TOOLBOXITEM_HELPID ); nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0, RSC_TOOLBOXITEM_TEXT ); @@ -2051,14 +2051,14 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassToolBox() +|* RscTypCont::InitClassToolBox() *************************************************************************/ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem, RscTop * pClassImageList ) { - Atom nId; - RscTop * pClassToolBox; + Atom nId; + RscTop * pClassToolBox; // Klasse anlegen nId = pHS->getID( "ToolBox" ); @@ -2103,7 +2103,7 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, RSC_TOOLBOX_LINECOUNT ); nId = aNmTb.Put( "FloatingLines", VARNAME ); pClassToolBox->SetVariable( nId, &aUShort, NULL, 0, - RSC_TOOLBOX_FLOATLINES ); + RSC_TOOLBOX_FLOATLINES ); nId = aNmTb.Put( "Customize", VARNAME ); pClassToolBox->SetVariable( nId, &aBool, NULL, 0, RSC_TOOLBOX_CUSTOMIZE ); @@ -2139,12 +2139,12 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassStatusBar() +|* RscTypCont::InitClassStatusBar() *************************************************************************/ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper ) { - Atom nId; - RscTop * pClassStatusBar; + Atom nId; + RscTop * pClassStatusBar; // Klasse anlegen nId = pHS->getID( "StatusBar" ); @@ -2160,12 +2160,12 @@ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper ) } /************************************************************************* -|* RscTypCont::InitClassMoreButton() +|* RscTypCont::InitClassMoreButton() *************************************************************************/ RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit ) { - Atom nId; - RscTop * pClassMoreButton; + Atom nId; + RscTop * pClassMoreButton; // Klasse anlegen nId = pHS->getID( "MoreButton" ); @@ -2188,13 +2188,13 @@ RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit ) } /************************************************************************* -|* RscTypCont::InitClassFloatingWindow() +|* RscTypCont::InitClassFloatingWindow() *************************************************************************/ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { - Atom nId; - RscTop * pClassFloatingWindow; + Atom nId; + RscTop * pClassFloatingWindow; // Klasse anlegen nId = pHS->getID( "FloatingWindow" ); @@ -2225,13 +2225,13 @@ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassTabControlItem() +|* RscTypCont::InitClassTabControlItem() *************************************************************************/ RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper, RscTop * /*pClassTabPage*/ ) { - Atom nId; - RscTop * pClassTabControlItem; + Atom nId; + RscTop * pClassTabControlItem; // Klasse anlegen nId = pHS->getID( "PageItem" ); @@ -2253,13 +2253,13 @@ RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassTabControl() +|* RscTypCont::InitClassTabControl() *************************************************************************/ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper, RscTop * pClassTabControlItem ) { - Atom nId; - RscTop * pClassTabControl; + Atom nId; + RscTop * pClassTabControl; // Klasse anlegen nId = pHS->getID( "TabControl" ); @@ -2287,15 +2287,15 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassSfxFamilyStyleItem() +|* RscTypCont::InitClassSfxFamilyStyleItem() *************************************************************************/ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, RscArray * pStrLst ) { - Atom nId; - RscTop * pClassSfxFamilyStyleItem; + Atom nId; + RscTop * pClassSfxFamilyStyleItem; // Klasse anlegen nId = pHS->getID( "SfxStyleFamilyItem" ); @@ -2337,13 +2337,13 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassSfxTemplateDialogm() +|* RscTypCont::InitClassSfxTemplateDialogm() *************************************************************************/ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, RscTop * pClassFamilyStyleItem ) { - Atom nId; - RscTop * pClassSfxTemplateDialog; + Atom nId; + RscTop * pClassSfxTemplateDialog; // Klasse anlegen nId = pHS->getID( "SfxStyleFamilies" ); @@ -2367,12 +2367,12 @@ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, } /************************************************************************* -|* RscTypCont::InitClassSfxSlotInfo() +|* RscTypCont::InitClassSfxSlotInfo() *************************************************************************/ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) { - Atom nId; - RscTop * pClassSfxSlotInfo; + Atom nId; + RscTop * pClassSfxSlotInfo; // Klasse anlegen nId = pHS->getID( "SfxSlotInfo" ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 12ca4d692e21..72a1f6889086 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #include <yyrscyacc.hxx> /****************** M a c r o s ******************************************/ -#define INS_WINBIT( pClass, WinBit ) \ +#define INS_WINBIT( pClass, WinBit ) \ InsWinBit( pClass, #WinBit, n##WinBit##Id ); /****************** C O D E **********************************************/ @@ -83,117 +83,117 @@ void NameToVerCtrl( RSCINST & aVersion, RscTop * pClass, /************************************************************************* |* -|* RscTypCont::Init() +|* RscTypCont::Init() |* -|* Beschreibung -|* Ersterstellung MM 22.03.91 -|* Letzte Aenderung MM 27.06.91 +|* Beschreibung +|* Ersterstellung MM 22.03.91 +|* Letzte Aenderung MM 27.06.91 |* *************************************************************************/ void RscTypCont::Init() { - RscEnum * pFieldUnits; - RscEnum * pTimeFieldFormat; - RscEnum * pColor; - RscEnum * pMapUnit; - RscEnum * pKey; - RscEnum * pTriState; - RscEnum * pMessButtons; - RscEnum * pMessDefButton; - RscTupel * pGeometry; - RscArray * pLangGeometry; - RscCont * pStringList; - RscArray * pLangStringList; - RscTupel * pStringTupel; - RscTupel * pStringLongTupel; - RscCont * pStringTupelList; - RscCont * pStringLongTupelList; - RscArray * pLangStringTupelList; - RscArray * pLangStringLongTupelList; - - RscTop * pClassMgr; - RscTop * pClassString; - RscTop * pClassStringArray; - RscTop * pClassBitmap; - RscTop * pClassColor; - RscTop * pClassImage; - RscTop * pClassImageList; - RscTop * pClassWindow; - RscTop * pClassSystemWindow; - RscTop * pClassWorkWindow; - RscTop * pClassDialog; - RscTop * pClassModalDialog; - RscTop * pClassModelessDialog; - RscTop * pClassControl; - RscTop * pClassButton; - RscTop * pClassCheckBox; - RscTop * pClassPushButton; - RscTop * pClassOKButton; - RscTop * pClassCancelButton; - RscTop * pClassHelpButton; - RscTop * pClassRadioButton; - RscTop * pClassImageRadioButton; - RscTop * pClassImageButton; - RscTop * pClassTriStateBox; - RscTop * pClassEdit; - RscTop * pClassMultiLineEdit; - RscTop * pClassScrollBar; - RscTop * pClassListBox; - RscTop * pClassMultiListBox; - RscTop * pClassComboBox; - RscTop * pClassFixedText; - RscTop * pClassFixedBitmap; - RscTop * pClassFixedImage; - RscTop * pClassGroupBox; - RscTop * pClassKeyCode; - RscTop * pLangClassKeyCode; - RscTop * pClassAccelItem; - RscTop * pClassAccel; - RscTop * pClassMenuItem; - RscTop * pClassMenu; - RscTop * pClassMenuButton; - RscTop * pClassMessBox; - RscTop * pClassInfoBox; - RscTop * pClassWarningBox; - RscTop * pClassErrorBox; - RscTop * pClassQueryBox; - RscTop * pClassSplitter; - RscTop * pClassSplitWindow; - RscTop * pClassSpinButton; - RscTop * pClassTime; - RscTop * pClassDate; - RscTop * pClassSpinField; - RscTop * pClassPatternField; - RscTop * pClassNumericField; - RscTop * pClassMetricField; - RscTop * pClassCurrencyField; - RscTop * pClassLongCurrencyField; - RscTop * pClassDateField; - RscTop * pClassTimeField; - RscTop * pClassPatternBox; - RscTop * pClassNumericBox; - RscTop * pClassMetricBox; - RscTop * pClassCurrencyBox; - RscTop * pClassLongCurrencyBox; - RscTop * pClassDateBox; - RscTop * pClassTimeBox; - RscTop * pClassDockingWindow; - RscTop * pClassToolBoxItem; - RscTop * pClassToolBox; - RscTop * pClassStatusBar; - RscTop * pClassMoreButton; - RscTop * pClassFloatingWindow; - RscTop * pClassTabPage; - RscTop * pClassTabDialog; - RscTop * pClassTabControlItem; - RscTop * pClassTabControl; - RscTop * pClassFixedLine; - RscTop * pClassScrollBarBox; - RscTop * pClassSfxStyleFamilyItem; - RscTop * pClassSfxTemplateDialog; - RscTop * pClassSfxSlotInfo; - - Atom nId; + RscEnum * pFieldUnits; + RscEnum * pTimeFieldFormat; + RscEnum * pColor; + RscEnum * pMapUnit; + RscEnum * pKey; + RscEnum * pTriState; + RscEnum * pMessButtons; + RscEnum * pMessDefButton; + RscTupel * pGeometry; + RscArray * pLangGeometry; + RscCont * pStringList; + RscArray * pLangStringList; + RscTupel * pStringTupel; + RscTupel * pStringLongTupel; + RscCont * pStringTupelList; + RscCont * pStringLongTupelList; + RscArray * pLangStringTupelList; + RscArray * pLangStringLongTupelList; + + RscTop * pClassMgr; + RscTop * pClassString; + RscTop * pClassStringArray; + RscTop * pClassBitmap; + RscTop * pClassColor; + RscTop * pClassImage; + RscTop * pClassImageList; + RscTop * pClassWindow; + RscTop * pClassSystemWindow; + RscTop * pClassWorkWindow; + RscTop * pClassDialog; + RscTop * pClassModalDialog; + RscTop * pClassModelessDialog; + RscTop * pClassControl; + RscTop * pClassButton; + RscTop * pClassCheckBox; + RscTop * pClassPushButton; + RscTop * pClassOKButton; + RscTop * pClassCancelButton; + RscTop * pClassHelpButton; + RscTop * pClassRadioButton; + RscTop * pClassImageRadioButton; + RscTop * pClassImageButton; + RscTop * pClassTriStateBox; + RscTop * pClassEdit; + RscTop * pClassMultiLineEdit; + RscTop * pClassScrollBar; + RscTop * pClassListBox; + RscTop * pClassMultiListBox; + RscTop * pClassComboBox; + RscTop * pClassFixedText; + RscTop * pClassFixedBitmap; + RscTop * pClassFixedImage; + RscTop * pClassGroupBox; + RscTop * pClassKeyCode; + RscTop * pLangClassKeyCode; + RscTop * pClassAccelItem; + RscTop * pClassAccel; + RscTop * pClassMenuItem; + RscTop * pClassMenu; + RscTop * pClassMenuButton; + RscTop * pClassMessBox; + RscTop * pClassInfoBox; + RscTop * pClassWarningBox; + RscTop * pClassErrorBox; + RscTop * pClassQueryBox; + RscTop * pClassSplitter; + RscTop * pClassSplitWindow; + RscTop * pClassSpinButton; + RscTop * pClassTime; + RscTop * pClassDate; + RscTop * pClassSpinField; + RscTop * pClassPatternField; + RscTop * pClassNumericField; + RscTop * pClassMetricField; + RscTop * pClassCurrencyField; + RscTop * pClassLongCurrencyField; + RscTop * pClassDateField; + RscTop * pClassTimeField; + RscTop * pClassPatternBox; + RscTop * pClassNumericBox; + RscTop * pClassMetricBox; + RscTop * pClassCurrencyBox; + RscTop * pClassLongCurrencyBox; + RscTop * pClassDateBox; + RscTop * pClassTimeBox; + RscTop * pClassDockingWindow; + RscTop * pClassToolBoxItem; + RscTop * pClassToolBox; + RscTop * pClassStatusBar; + RscTop * pClassMoreButton; + RscTop * pClassFloatingWindow; + RscTop * pClassTabPage; + RscTop * pClassTabDialog; + RscTop * pClassTabControlItem; + RscTop * pClassTabControl; + RscTop * pClassFixedLine; + RscTop * pClassScrollBarBox; + RscTop * pClassSfxStyleFamilyItem; + RscTop * pClassSfxTemplateDialog; + RscTop * pClassSfxSlotInfo; + + Atom nId; aNmTb.SetSort( FALSE ); { @@ -224,7 +224,7 @@ void RscTypCont::Init() aNmTb.Put( "ZoomInOutputSize", INZOOMOUTPUTSIZE,(long)0 ); aNmTb.Put( "FloatingPos", FLOATINGPOS, (long)0 ); } - /********** B A S I S T Y P E N ************************************/ + /********** B A S I S T Y P E N ************************************/ { /********** S H O R T ************************************************/ aShort.SetRange( -32768, 32767 ); @@ -263,119 +263,119 @@ void RscTypCont::Init() nWinBitVarId = aNmTb.Put( "_WinBits", VARNAME ); // Windows - nBorderId = pHS->getID( "WB_BORDER" ); + nBorderId = pHS->getID( "WB_BORDER" ); aWinBits.SetConstant( nBorderId, sal::static_int_cast<INT32>(WB_BORDER) ); - nHideId = pHS->getID( "WB_HIDE" ); + nHideId = pHS->getID( "WB_HIDE" ); aWinBits.SetConstant( nHideId, sal::static_int_cast<INT32>(WB_HIDE) ); nClipChildrenId = pHS->getID( "WB_CLIPCHILDREN" ); aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<INT32>(WB_CLIPCHILDREN) ); - nSizeableId = pHS->getID( "WB_SIZEABLE" ); + nSizeableId = pHS->getID( "WB_SIZEABLE" ); aWinBits.SetConstant( nSizeableId, sal::static_int_cast<INT32>(WB_SIZEABLE) ); - nMoveableId = pHS->getID( "WB_MOVEABLE" ); + nMoveableId = pHS->getID( "WB_MOVEABLE" ); aWinBits.SetConstant( nMoveableId, sal::static_int_cast<INT32>(WB_MOVEABLE) ); - nMinimizeId = pHS->getID( "WB_MINABLE" ); + nMinimizeId = pHS->getID( "WB_MINABLE" ); aWinBits.SetConstant( nMinimizeId, 0 /*WB_MINABLE*/ ); - nMaximizeId = pHS->getID( "WB_MAXABLE" ); + nMaximizeId = pHS->getID( "WB_MAXABLE" ); aWinBits.SetConstant( nMaximizeId, 0 /*WB_MAXABLE*/ ); - nCloseableId = pHS->getID( "WB_CLOSEABLE" ); + nCloseableId = pHS->getID( "WB_CLOSEABLE" ); aWinBits.SetConstant( nCloseableId, sal::static_int_cast<INT32>(WB_CLOSEABLE) ); - nAppId = pHS->getID( "WB_APP" ); + nAppId = pHS->getID( "WB_APP" ); aWinBits.SetConstant( nAppId, sal::static_int_cast<INT32>(WB_APP) ); - nTabstopId = pHS->getID( "WB_TABSTOP" ); + nTabstopId = pHS->getID( "WB_TABSTOP" ); aWinBits.SetConstant( nTabstopId, sal::static_int_cast<INT32>(WB_TABSTOP) ); - nGroupId = pHS->getID( "WB_GROUP" ); + nGroupId = pHS->getID( "WB_GROUP" ); aWinBits.SetConstant( nGroupId, sal::static_int_cast<INT32>(WB_GROUP) ); - nSysmodalId = pHS->getID( "WB_SYSMODAL" ); + nSysmodalId = pHS->getID( "WB_SYSMODAL" ); aWinBits.SetConstant( nSysmodalId, 0 /*WB_SYSMODAL*/ ); } { - nLeftId = pHS->getID( "WB_LEFT" ); + nLeftId = pHS->getID( "WB_LEFT" ); aWinBits.SetConstant( nLeftId, sal::static_int_cast<INT32>(WB_LEFT) ); - nCenterId = pHS->getID( "WB_CENTER" ); + nCenterId = pHS->getID( "WB_CENTER" ); aWinBits.SetConstant( nCenterId, sal::static_int_cast<INT32>(WB_CENTER) ); - nRightId = pHS->getID( "WB_RIGHT" ); + nRightId = pHS->getID( "WB_RIGHT" ); aWinBits.SetConstant( nRightId, sal::static_int_cast<INT32>(WB_RIGHT) ); - nTopId = pHS->getID( "WB_TOP" ); + nTopId = pHS->getID( "WB_TOP" ); aWinBits.SetConstant( nTopId, sal::static_int_cast<INT32>(WB_TOP) ); - nVCenterId = pHS->getID( "WB_VCENTER" ); + nVCenterId = pHS->getID( "WB_VCENTER" ); aWinBits.SetConstant( nVCenterId, sal::static_int_cast<INT32>(WB_VCENTER) ); - nBottomId = pHS->getID( "WB_BOTTOM" ); + nBottomId = pHS->getID( "WB_BOTTOM" ); aWinBits.SetConstant( nBottomId, sal::static_int_cast<INT32>(WB_BOTTOM) ); - nHScrollId = pHS->getID( "WB_HSCROLL" ); + nHScrollId = pHS->getID( "WB_HSCROLL" ); aWinBits.SetConstant( nHScrollId, sal::static_int_cast<INT32>(WB_HSCROLL) ); - nVScrollId = pHS->getID( "WB_VSCROLL" ); + nVScrollId = pHS->getID( "WB_VSCROLL" ); aWinBits.SetConstant( nVScrollId, sal::static_int_cast<INT32>(WB_VSCROLL) ); - nSortId = pHS->getID( "WB_SORT" ); + nSortId = pHS->getID( "WB_SORT" ); aWinBits.SetConstant( nSortId, sal::static_int_cast<INT32>(WB_SORT) ); - nDefaultId = pHS->getID( "WB_DEFBUTTON" ); + nDefaultId = pHS->getID( "WB_DEFBUTTON" ); aWinBits.SetConstant( nDefaultId, sal::static_int_cast<INT32>(WB_DEFBUTTON) ); - nRepeatId = pHS->getID( "WB_REPEAT" ); + nRepeatId = pHS->getID( "WB_REPEAT" ); aWinBits.SetConstant( nRepeatId, sal::static_int_cast<INT32>(WB_REPEAT) ); - nSVLookId = pHS->getID( "WB_SVLOOK" ); + nSVLookId = pHS->getID( "WB_SVLOOK" ); aWinBits.SetConstant( nSVLookId, sal::static_int_cast<INT32>(WB_3DLOOK) ); - nDropDownId = pHS->getID( "WB_DROPDOWN" ); + nDropDownId = pHS->getID( "WB_DROPDOWN" ); aWinBits.SetConstant( nDropDownId, sal::static_int_cast<INT32>(WB_DROPDOWN) ); - nPassWordId = pHS->getID( "WB_PASSWORD" ); + nPassWordId = pHS->getID( "WB_PASSWORD" ); aWinBits.SetConstant( nPassWordId, sal::static_int_cast<INT32>(WB_PASSWORD) ); - nReadOnlyId = pHS->getID( "WB_READONLY" ); + nReadOnlyId = pHS->getID( "WB_READONLY" ); aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<INT32>(WB_READONLY) ); - nAutoSizeId = pHS->getID( "WB_AUTOSIZE" ); + nAutoSizeId = pHS->getID( "WB_AUTOSIZE" ); aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<INT32>(WB_AUTOSIZE) ); - nSpinId = pHS->getID( "WB_SPIN" ); + nSpinId = pHS->getID( "WB_SPIN" ); aWinBits.SetConstant( nSpinId, sal::static_int_cast<INT32>(WB_SPIN) ); - nTabControlId = pHS->getID( "WB_DIALOGCONTROL" ); + nTabControlId = pHS->getID( "WB_DIALOGCONTROL" ); aWinBits.SetConstant( nTabControlId, sal::static_int_cast<INT32>(WB_DIALOGCONTROL) ); - nSimpleModeId = pHS->getID( "WB_SIMPLEMODE" ); + nSimpleModeId = pHS->getID( "WB_SIMPLEMODE" ); aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<INT32>(WB_SIMPLEMODE) ); - nDragId = pHS->getID( "WB_DRAG" ); + nDragId = pHS->getID( "WB_DRAG" ); aWinBits.SetConstant( nDragId, sal::static_int_cast<INT32>(WB_DRAG) ); - nScrollId = pHS->getID( "WB_SCROLL" ); + nScrollId = pHS->getID( "WB_SCROLL" ); aWinBits.SetConstant( nScrollId, sal::static_int_cast<INT32>(WB_SCROLL) ); - nZoomableId = pHS->getID( "WB_ZOOMABLE" ); + nZoomableId = pHS->getID( "WB_ZOOMABLE" ); aWinBits.SetConstant( nZoomableId, sal::static_int_cast<INT32>(WB_ROLLABLE) ); nHideWhenDeactivateId = pHS->getID( "WB_HIDEWHENDEACTIVATE" ); aWinBits.SetConstant( nHideWhenDeactivateId, 0 /*WB_HIDEWHENDEACTIVATE*/ ); - nAutoHScrollId = pHS->getID( "WB_AUTOHSCROLL" ); + nAutoHScrollId = pHS->getID( "WB_AUTOHSCROLL" ); aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<INT32>(WB_AUTOHSCROLL) ); - nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" ); + nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" ); aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<INT32>(WB_AUTOVSCROLL) ); - nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" ); + nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" ); aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ ); - nWordBreakId = pHS->getID( "WB_WORDBREAK" ); + nWordBreakId = pHS->getID( "WB_WORDBREAK" ); aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<INT32>(WB_WORDBREAK) ); - nLeftLabelId = pHS->getID( "WB_LEFTLABEL" ); + nLeftLabelId = pHS->getID( "WB_LEFTLABEL" ); aWinBits.SetConstant( nLeftLabelId, 0 /*WB_LEFTLABEL*/ ); - nHasLinesId = pHS->getID( "WB_HASLINES" ); + nHasLinesId = pHS->getID( "WB_HASLINES" ); aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<INT32>(WB_HASLINES) ); - nHasButtonsId = pHS->getID( "WB_HASBUTTONS" ); + nHasButtonsId = pHS->getID( "WB_HASBUTTONS" ); aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<INT32>(WB_HASBUTTONS) ); - nRectStyleId = pHS->getID( "WB_RECTSTYLE" ); + nRectStyleId = pHS->getID( "WB_RECTSTYLE" ); aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<INT32>(WB_RECTSTYLE) ); - nLineSpacingId = pHS->getID( "WB_LINESPACING" ); + nLineSpacingId = pHS->getID( "WB_LINESPACING" ); aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<INT32>(WB_LINESPACING) ); - nSmallStyleId = pHS->getID( "WB_SMALLSTYLE" ); + nSmallStyleId = pHS->getID( "WB_SMALLSTYLE" ); aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<INT32>(WB_SMALLSTYLE) ); - nEnableResizingId = pHS->getID( "WB_ENABLERESIZING" ); + nEnableResizingId = pHS->getID( "WB_ENABLERESIZING" ); aWinBits.SetConstant( nEnableResizingId, 0 /*WB_ENABLERESIZING*/ ); - nDockableId = pHS->getID( "WB_DOCKABLE" ); + nDockableId = pHS->getID( "WB_DOCKABLE" ); aWinBits.SetConstant( nDockableId, sal::static_int_cast<INT32>(WB_DOCKABLE) ); - nScaleId = pHS->getID( "WB_SCALE" ); + nScaleId = pHS->getID( "WB_SCALE" ); aWinBits.SetConstant( nScaleId, sal::static_int_cast<INT32>(WB_SCALE) ); - nIgnoreTabId = pHS->getID( "WB_IGNORETAB" ); + nIgnoreTabId = pHS->getID( "WB_IGNORETAB" ); aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<INT32>(WB_IGNORETAB) ); - nNoSplitDrawId = pHS->getID( "WB_NOSPLITDRAW" ); + nNoSplitDrawId = pHS->getID( "WB_NOSPLITDRAW" ); aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<INT32>(WB_NOSPLITDRAW) ); - nTopImageId = pHS->getID( "WB_TOPIMAGE" ); + nTopImageId = pHS->getID( "WB_TOPIMAGE" ); aWinBits.SetConstant( nTopImageId, sal::static_int_cast<INT32>(WB_TOPIMAGE) ); - nNoLabelId = pHS->getID( "WB_NOLABEL" ); + nNoLabelId = pHS->getID( "WB_NOLABEL" ); aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) ); - nVertId = pHS->getID( "WB_VERT" ); + nVertId = pHS->getID( "WB_VERT" ); aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) ); - nSingleLineId = pHS->getID( "WB_SINGLELINE" ); + nSingleLineId = pHS->getID( "WB_SINGLELINE" ); aWinBits.SetConstant( nSingleLineId, sal::static_int_cast<INT32>(WB_SINGLELINE) ); nSysWinId = pHS->getID( "WB_SYSTEMWINDOW" ); aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) ); - nStdPopupId = pHS->getID( "WB_STDPOPUP" ); + nStdPopupId = pHS->getID( "WB_STDPOPUP" ); aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<INT32>(WB_STDPOPUP) ); } { @@ -383,14 +383,14 @@ void RscTypCont::Init() 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( 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( pGeometry = InitGeometry(), LIST_APPEND ); aBaseLst.Insert( pLangGeometry = InitLangGeometry( pGeometry ), LIST_APPEND ); aBaseLst.Insert( pStringList = InitStringList(), LIST_APPEND ); @@ -907,7 +907,7 @@ void RscTypCont::Init() pClassFixedLine->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); INS_WINBIT(pClassFixedLine,Vert) - + aNmTb.Put( nId, CLASSNAME, pClassFixedLine ); pRoot->Insert( pClassFixedLine ); diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 8ed7855bb247..e15f2e256eb7 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index ae7c9ad9dfdb..da6d97a20084 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,13 +64,13 @@ const char* StringContainer::putString( const char* pString ) } /*************************************************************************/ -int c; -BOOL bLastInclude;// War letztes Symbol INCLUDE -RscFileInst* pFI; -RscTypCont* pTC; +int c; +BOOL bLastInclude;// War letztes Symbol INCLUDE +RscFileInst* pFI; +RscTypCont* pTC; RscExpression * pExp; struct KeyVal { - int nKeyWord; + int nKeyWord; YYSTYPE aYYSType; } aKeyVal[ 1 ]; BOOL bTargetDefined; @@ -80,8 +80,8 @@ StringContainer* pStringContainer = NULL; /****************** C O D E **********************************************/ UINT32 GetNumber(){ - UINT32 l = 0; - UINT32 nLog = 10; + UINT32 l = 0; + UINT32 nLog = 10; if( '0' == c ){ c = pFI->GetFastChar(); @@ -117,10 +117,10 @@ UINT32 GetNumber(){ } int MakeToken( YYSTYPE * pTokenVal ){ - int c1; - char * pStr; + int c1; + char * pStr; - while( TRUE ){ // Kommentare und Leerzeichen ueberlesen + while( TRUE ){ // Kommentare und Leerzeichen ueberlesen while( isspace( c ) ) c = pFI->GetFastChar(); if( '/' == c ){ @@ -204,7 +204,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ } if( isalpha (c) || (c == '_') ){ - Atom nHashId; + Atom nHashId; OStringBuffer aBuf( 256 ); while( isalnum (c) || (c == '_') || (c == '-') ) @@ -216,12 +216,12 @@ int MakeToken( YYSTYPE * pTokenVal ){ nHashId = pHS->getID( aBuf.getStr(), true ); if( InvalidAtom != nHashId ) { - KEY_STRUCT aKey; - + KEY_STRUCT aKey; + // Suche nach dem Schluesselwort if( pTC->aNmTb.Get( nHashId, &aKey ) ) { - + // Schluesselwort gefunden switch( aKey.nTyp ) { @@ -243,7 +243,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ default: pTokenVal->value = aKey.yylval; }; - + return( aKey.nTyp ); } else @@ -252,16 +252,16 @@ int MakeToken( YYSTYPE * pTokenVal ){ return( SYMBOL ); } } - else{ // Symbol + else{ // Symbol RscDefine * pDef; - + pDef = pTC->aFileTab.FindDef( aBuf.getStr() ); if( pDef ){ pTokenVal->defineele = pDef; - + return( RSCDEFINE ); } - + pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() )); return( SYMBOL ); } @@ -327,10 +327,10 @@ void yyerror( char* pMessage ) /****************** parser start function ********************************/ void InitParser( RscFileInst * pFileInst ) { - pTC = pFileInst->pTypCont; // Datenkontainer setzten + pTC = pFileInst->pTypCont; // Datenkontainer setzten pFI = pFileInst; pStringContainer = new StringContainer(); - pExp = NULL; //fuer MacroParser + pExp = NULL; //fuer MacroParser bTargetDefined = FALSE; // Anfangszeichen initialisieren @@ -349,19 +349,19 @@ void EndParser(){ if( pExp ) delete pExp; - pTC = NULL; - pFI = NULL; - pExp = NULL; + pTC = NULL; + pFI = NULL; + pExp = NULL; } void IncludeParser( RscFileInst * pFileInst ) { - int nToken; // Wert des Tokens - YYSTYPE aYYSType; // Daten des Tokens - RscFile * pFName; // Filestruktur - ULONG lKey; // Fileschluessel - RscTypCont * pTypCon = pFileInst->pTypCont; + int nToken; // Wert des Tokens + YYSTYPE aYYSType; // Daten des Tokens + RscFile * pFName; // Filestruktur + ULONG lKey; // Fileschluessel + RscTypCont * pTypCon = pFileInst->pTypCont; pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() ); InitParser( pFileInst ); @@ -409,7 +409,7 @@ ERRTYPE parser( RscFileInst * pFileInst ) RscExpression * MacroParser( RscFileInst & rFileInst ) { - ERRTYPE aError; + ERRTYPE aError; RscExpression * pExpression; InitParser( &rFileInst ); diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx index 06b2cb4d27ed..510a13eb3a1d 100644 --- a/rsc/source/parser/rsclex.hxx +++ b/rsc/source/parser/rsclex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ // a buffer for unique strings class StringContainer { - std::hash_set< rtl::OString, rtl::OStringHash > m_aStrings; + std::hash_set< rtl::OString, rtl::OStringHash > m_aStrings; public: StringContainer() {} ~StringContainer() {} @@ -78,9 +78,9 @@ class ObjectStack { const RSCINST & Top () { return pRoot->aInst; } BOOL IsEmpty() { return( pRoot == NULL ); } - void IncTupelRec() { pRoot->nTupelRec++; } - void DecTupelRec() { pRoot->nTupelRec--; } - sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; } + void IncTupelRec() { pRoot->nTupelRec++; } + void DecTupelRec() { pRoot->nTupelRec--; } + sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; } void Push( RSCINST aInst ) { Node* pTmp; @@ -126,6 +126,6 @@ extern RscTypCont* pTC; extern RscFileInst * pFI; extern RscExpression * pExp; extern ObjectStack S; -extern StringContainer* pStringContainer; +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 61573b84c5a2..445d381c885c 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ /****************** C O D E **********************************************/ /************************************************************************* |* -|* RscFileInst::Init() +|* RscFileInst::Init() |* -|* Beschreibung -|* Ersterstellung MM 05.11.91 -|* Letzte Aenderung MM 17.02.93 +|* Beschreibung +|* Ersterstellung MM 05.11.91 +|* Letzte Aenderung MM 17.02.93 |* *************************************************************************/ void RscFileInst::Init() @@ -58,11 +58,11 @@ void RscFileInst::Init() /************************************************************************* |* -|* RscFileInst::RscFileInst() +|* RscFileInst::RscFileInst() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 +|* Beschreibung +|* Ersterstellung MM 06.06.91 +|* Letzte Aenderung MM 06.06.91 |* *************************************************************************/ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, @@ -77,33 +77,33 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, //Status: Zeiger am Ende des Lesepuffers nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX; - pInput = (char *)rtl_allocateMemory( nInputBufLen ); + pInput = (char *)rtl_allocateMemory( nInputBufLen ); } RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc, ULONG lFIndex, const ByteString& rBuf ) { - pTypCont = pTC; + pTypCont = pTC; Init(); - lFileIndex = lFIndex; - lSrcIndex = lIndexSrc; - fInputFile = NULL; - nInputPos = 0; + lFileIndex = lFIndex; + lSrcIndex = lIndexSrc; + fInputFile = NULL; + nInputPos = 0; nInputEndPos = rBuf.Len(); // Muss groesser sein wegen Eingabeende bei nInputBufLen < nInputEndPos nInputBufLen = nInputEndPos +1; - pInput = (char *)rtl_allocateMemory( nInputBufLen +100 ); + pInput = (char *)rtl_allocateMemory( nInputBufLen +100 ); memcpy( pInput, rBuf.GetBuffer(), nInputEndPos ); } /************************************************************************* |* -|* RscFileInst::~RscFileInst() +|* RscFileInst::~RscFileInst() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 +|* Beschreibung +|* Ersterstellung MM 06.06.91 +|* Letzte Aenderung MM 06.06.91 |* *************************************************************************/ RscFileInst::~RscFileInst(){ @@ -115,11 +115,11 @@ RscFileInst::~RscFileInst(){ /************************************************************************* |* -|* RscFileInst::GetChar() +|* RscFileInst::GetChar() |* -|* Beschreibung -|* Ersterstellung MM 01.06.91 -|* Letzte Aenderung MM 09.08.91 +|* Beschreibung +|* Ersterstellung MM 01.06.91 +|* Letzte Aenderung MM 09.08.91 |* *************************************************************************/ int RscFileInst::GetChar() @@ -141,11 +141,11 @@ int RscFileInst::GetChar() /************************************************************************* |* -|* RscFileInst::GetNewLine() +|* RscFileInst::GetNewLine() |* -|* Beschreibung -|* Ersterstellung MM 06.06.91 -|* Letzte Aenderung MM 06.06.91 +|* Beschreibung +|* Ersterstellung MM 06.06.91 +|* Letzte Aenderung MM 06.06.91 |* *************************************************************************/ void RscFileInst::GetNewLine() @@ -222,11 +222,11 @@ END: /************************************************************************* |* -|* RscFileInst::SetError() +|* RscFileInst::SetError() |* -|* Beschreibung -|* Ersterstellung MM 05.11.91 -|* Letzte Aenderung MM 05.11.91 +|* Beschreibung +|* Ersterstellung MM 05.11.91 +|* Letzte Aenderung MM 05.11.91 |* *************************************************************************/ void RscFileInst::SetError( ERRTYPE aError ) @@ -234,8 +234,8 @@ void RscFileInst::SetError( ERRTYPE aError ) if( aError.IsOk() ) { aFirstError = aError; - nErrorLine = GetLineNo(); - nErrorPos = GetScanPos() -1; + nErrorLine = GetLineNo(); + nErrorPos = GetScanPos() -1; }; }; diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx index e899570e85ed..dad66013d35c 100644 --- a/rsc/source/parser/rscyacc.cxx +++ b/rsc/source/parser/rscyacc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ #include "rsclex.hxx" /************** V a r i a b l e n ****************************************/ -ObjectStack S; -RscTop * pCurClass; -sal_uInt32 nCurMask; -char szErrBuf[ 100 ]; +ObjectStack S; +RscTop * pCurClass; +sal_uInt32 nCurMask; +char szErrBuf[ 100 ]; /************** H i l f s F u n k t i o n e n ****************************/ RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName ) @@ -112,7 +112,7 @@ void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr RscId MakeRscId( RscExpType aExpType ) { if( !aExpType.IsNothing() ){ - INT32 lValue; + INT32 lValue; if( !aExpType.Evaluate( &lValue ) ) pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() ); @@ -248,16 +248,16 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) /************** Y a c c C o d e ****************************************/ //#define YYDEBUG 1 -#define TYPE_Atom 0 -#define TYPE_RESID 1 +#define TYPE_Atom 0 +#define TYPE_RESID 1 #ifdef UNX -#define YYMAXDEPTH 2000 +#define YYMAXDEPTH 2000 #else #ifdef W30 -#define YYMAXDEPTH 300 +#define YYMAXDEPTH 300 #else -#define YYMAXDEPTH 800 +#define YYMAXDEPTH 800 #endif #endif diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index ff2ebce8c1ab..7564b9cb05f2 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,13 +35,13 @@ #include <rscrsc.hxx> #include <rscdb.hxx> -/*************** G l o b a l e V a r i a b l e n **********************/ +/*************** G l o b a l e V a r i a b l e n **********************/ static RscCompiler * pRscCompiler = NULL; /****************************************************************/ -/* */ -/* Function : ExitProgram() */ -/* */ -/* Description : Gibt die Temporaeren Dateien frei. */ +/* */ +/* Function : ExitProgram() */ +/* */ +/* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ #if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) void ExitProgram( void ){ @@ -82,10 +82,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { fprintf( stderr, "debugging %s\n", argv[0] ); #endif - ERRTYPE aError; + ERRTYPE aError; InitRscCompiler(); - RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) ); + RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) ); #ifdef MTW RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl ); #else diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index ab4278027967..0517af73b0f7 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,9 @@ /*************** C O D E ************************************************/ /****************************************************************/ -/* */ -/* Function : fuer Ansi kompatibilitaet */ -/* */ +/* */ +/* Function : fuer Ansi kompatibilitaet */ +/* */ /****************************************************************/ #ifdef UNX #define P_WAIT 0 @@ -86,9 +86,9 @@ #endif /************************************************************************* -|* CallPrePro() +|* CallPrePro() |* -|* Beschreibung +|* Beschreibung *************************************************************************/ static BOOL CallPrePro( const ByteString& rPrePro, const ByteString& rInput, @@ -96,12 +96,12 @@ static BOOL CallPrePro( const ByteString& rPrePro, RscPtrPtr * pCmdLine, BOOL bResponse ) { - RscPtrPtr aNewCmdL; // Kommandozeile - RscPtrPtr aRespCmdL; // Kommandozeile - RscPtrPtr * pCmdL = &aNewCmdL; - int i, nExit; - FILE* fRspFile = NULL; - ByteString aRspFileName; + RscPtrPtr aNewCmdL; // Kommandozeile + RscPtrPtr aRespCmdL; // Kommandozeile + RscPtrPtr * pCmdL = &aNewCmdL; + int i, nExit; + FILE* fRspFile = NULL; + ByteString aRspFileName; if( bResponse ) { @@ -201,19 +201,19 @@ static BOOL CallPrePro( const ByteString& rPrePro, /************************************************************************* -|* CallRsc2 +|* CallRsc2 |* -|* Beschreibung +|* Beschreibung *************************************************************************/ static BOOL CallRsc2( ByteString aRsc2Name, RscStrList * pInputList, ByteString aSrsName, RscPtrPtr * pCmdLine ) { - int i, nExit; - ByteString* pString; - ByteString aRspFileName; // Response-Datei - FILE * fRspFile; // Response-Datei + int i, nExit; + ByteString* pString; + ByteString aRspFileName; // Response-Datei + FILE * fRspFile; // Response-Datei aRspFileName = ::GetTmpFileName(); fRspFile = fopen( aRspFileName.GetBuffer(), "w" ); @@ -276,7 +276,7 @@ static BOOL CallRsc2( ByteString aRsc2Name, fclose( fRspFile ); }; - RscPtrPtr aNewCmdL; // Kommandozeile + RscPtrPtr aNewCmdL; // Kommandozeile aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) ); ByteString aTmpStr( '@' ); aTmpStr += aRspFileName; @@ -317,33 +317,33 @@ static BOOL CallRsc2( ByteString aRsc2Name, /************************************************************************* |* -|* main() +|* main() |* -|* Beschreibung -|* Ersterstellung MM 05.09.91 -|* Letzte Aenderung MM 05.09.91 +|* Beschreibung +|* Ersterstellung MM 05.09.91 +|* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - BOOL bPrePro = TRUE; - BOOL bResFile = TRUE; - BOOL bHelp = FALSE; - BOOL bError = FALSE; - BOOL bResponse = FALSE; - ByteString aSolarbin(getenv("SOLARBINDIR")); - ByteString aDelim("/"); - ByteString aPrePro; //( aSolarbin + aDelim + ByteString("rscpp")); - ByteString aRsc2Name; //( aSolarbin + aDelim + ByteString("rsc2")); - ByteString aSrsName; - ByteString aResName; - RscStrList aInputList; - RscStrList aTmpList; - char * pStr; - char ** ppStr; - RscPtrPtr aCmdLine; // Kommandozeile - sal_uInt32 i; - ByteString* pString; + BOOL bPrePro = TRUE; + BOOL bResFile = TRUE; + BOOL bHelp = FALSE; + BOOL bError = FALSE; + BOOL bResponse = FALSE; + ByteString aSolarbin(getenv("SOLARBINDIR")); + ByteString aDelim("/"); + ByteString aPrePro; //( aSolarbin + aDelim + ByteString("rscpp")); + ByteString aRsc2Name; //( aSolarbin + aDelim + ByteString("rsc2")); + ByteString aSrsName; + ByteString aResName; + RscStrList aInputList; + RscStrList aTmpList; + char * pStr; + char ** ppStr; + RscPtrPtr aCmdLine; // Kommandozeile + sal_uInt32 i; + ByteString* pString; aPrePro = aSolarbin; aPrePro += aDelim; @@ -415,7 +415,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( aInputList.Count() ) { - /* build the output file names */ + /* build the output file names */ if( ! aResName.Len() ) aResName = OutputFile( *aInputList.First(), "res" ); if( ! bSetSrs ) diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index 4bd3db7b9aae..7d0c7a8b655e 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,26 +38,26 @@ #include <rscall.h> #include <rsckey.hxx> -Atom nRsc_XYMAPMODEId = InvalidAtom; -Atom nRsc_WHMAPMODEId = InvalidAtom; -Atom nRsc_X = InvalidAtom; -Atom nRsc_Y = InvalidAtom; -Atom nRsc_WIDTH = InvalidAtom; -Atom nRsc_HEIGHT = InvalidAtom; -Atom nRsc_DELTALANG = InvalidAtom; -Atom nRsc_DELTASYSTEM = InvalidAtom; -Atom nRsc_EXTRADATA = InvalidAtom; +Atom nRsc_XYMAPMODEId = InvalidAtom; +Atom nRsc_WHMAPMODEId = InvalidAtom; +Atom nRsc_X = InvalidAtom; +Atom nRsc_Y = InvalidAtom; +Atom nRsc_WIDTH = InvalidAtom; +Atom nRsc_HEIGHT = InvalidAtom; +Atom nRsc_DELTALANG = InvalidAtom; +Atom nRsc_DELTASYSTEM = InvalidAtom; +Atom nRsc_EXTRADATA = InvalidAtom; void InitRscCompiler() { - pStdParType = new ByteString( "( const ResId & rResId, BOOL" ); - pStdPar1 = new ByteString( '(' ); - pStdPar2 = new ByteString( '(' ); + pStdParType = new ByteString( "( const ResId & rResId, BOOL" ); + pStdPar1 = new ByteString( '(' ); + pStdPar2 = new ByteString( '(' ); - pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" ); - pWinPar1 = new ByteString( "( pParent," ); - pWinPar2 = new ByteString( "( this," ); - nRefDeep = 10; + pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" ); + pWinPar1 = new ByteString( "( pParent," ); + pWinPar2 = new ByteString( "( this," ); + nRefDeep = 10; nRsc_XYMAPMODEId = InvalidAtom; nRsc_WHMAPMODEId = InvalidAtom; pHS = new AtomContainer(); diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 3d0cba38da1d..793c3b0bae6b 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 8aed3865fda1..4fe41f43ebaa 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,11 +47,11 @@ /****************** R s c C l a s s **************************************/ /************************************************************************* |* -|* RscClass::RscClass() +|* RscClass::RscClass() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) @@ -65,16 +65,16 @@ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) /************************************************************************* |* -|* RscClass::Pre_dtor() +|* RscClass::Pre_dtor() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ void RscClass::Pre_dtor() { - sal_uInt32 i; + sal_uInt32 i; RscTop::Pre_dtor(); @@ -93,11 +93,11 @@ void RscClass::Pre_dtor() /************************************************************************* |* -|* RscClass::~RscClass() +|* RscClass::~RscClass() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RscClass::~RscClass() @@ -108,11 +108,11 @@ RscClass::~RscClass() /************************************************************************* |* -|* RscClass::GetClassType() +|* RscClass::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RSCCLASS_TYPE RscClass::GetClassType() const @@ -122,11 +122,11 @@ RSCCLASS_TYPE RscClass::GetClassType() const /************************************************************************* |* -|* RscClass::GetInstData() +|* RscClass::GetInstData() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ RSCINST RscClass::GetInstData @@ -176,9 +176,9 @@ RSCINST RscClass::GetInstData /************************************************************************* |* -|* RscClass::GetInstDflt() +|* RscClass::GetInstDflt() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) @@ -191,11 +191,11 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) /************************************************************************* |* -|* RscClass::SetVarDflt() +|* RscClass::SetVarDflt() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 22.07.91 +|* Beschreibung +|* Ersterstellung MM 22.07.91 +|* Letzte Aenderung MM 22.07.91 |* *************************************************************************/ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet ) @@ -211,24 +211,24 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet ) /************************************************************************* |* -|* RscClass::IsDflt() +|* RscClass::IsDflt() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 08.01.92 +|* Beschreibung +|* Ersterstellung MM 22.07.91 +|* Letzte Aenderung MM 08.01.92 |* *************************************************************************/ BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) { - RscClassInst * pClass; - BOOL bRet; + RscClassInst * pClass; + BOOL bRet; pClass = (RscClassInst *)(pData + nSuperSize ); if( pClass->nVarDflt & ((ULONG)1 << nEle) ) bRet = TRUE; else bRet = FALSE; -/* { +/* { //Variablenname ist Default RSCINST aTmpI; @@ -242,11 +242,11 @@ BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) /************************************************************************* |* -|* RscClass::Create() +|* RscClass::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCINST RscClass::Create @@ -256,8 +256,8 @@ RSCINST RscClass::Create BOOL bOwnClass ) { - sal_uInt32 i; - CLASS_DATA * ppData; + sal_uInt32 i; + CLASS_DATA * ppData; RSCINST aInst; RSCINST aMemInst, aDfltI; @@ -315,14 +315,14 @@ RSCINST RscClass::Create /************************************************************************* |* -|* RscClass::Destroy() +|* RscClass::Destroy() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::Destroy( const RSCINST & rInst ) { - sal_uInt32 i; + sal_uInt32 i; RscTop::Destroy( rInst ); @@ -349,9 +349,9 @@ void RscClass::Destroy( const RSCINST & rInst ) /************************************************************************* |* -|* RscClass::SetVariable() +|* RscClass::SetVariable() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ ERRTYPE RscClass::SetVariable @@ -373,11 +373,11 @@ ERRTYPE RscClass::SetVariable rtl_allocateMemory( ((nEntries +1) * sizeof( VARTYPE_STRUCT )) ); - pVarTypeList[ nEntries ].nVarName = nVarName; - pVarTypeList[ nEntries ].nMask = nMask; - pVarTypeList[ nEntries ].pClass = pClass; - pVarTypeList[ nEntries ].nOffset = nSize; - pVarTypeList[ nEntries ].nDataBaseName = nDataBaseName; + pVarTypeList[ nEntries ].nVarName = nVarName; + pVarTypeList[ nEntries ].nMask = nMask; + pVarTypeList[ nEntries ].pClass = pClass; + pVarTypeList[ nEntries ].nOffset = nSize; + pVarTypeList[ nEntries ].nDataBaseName = nDataBaseName; if( pDflt ) pVarTypeList[ nEntries ].pDefault = pDflt->pData; else @@ -411,9 +411,9 @@ ERRTYPE RscClass::SetVariable /************************************************************************* |* -|* RscClass::EnumVariable() +|* RscClass::EnumVariable() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) @@ -431,9 +431,9 @@ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) /************************************************************************* |* -|* RscClass::GetVariable() +|* RscClass::GetVariable() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RSCINST RscClass::GetVariable @@ -445,7 +445,7 @@ RSCINST RscClass::GetVariable RscTop * pCreateClass ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aTmpI; while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) @@ -493,7 +493,7 @@ RSCINST RscClass::GetVariable } else { - CLASS_DATA * ppData + CLASS_DATA * ppData = (CLASS_DATA *)(rInst.pData + pVarTypeList[ i ].nOffset); aTmpI = aTmpI.pClass->Create( NULL, aDefInst ); *ppData = aTmpI.pData; @@ -511,9 +511,9 @@ RSCINST RscClass::GetVariable /************************************************************************* |* -|* RscClass::GetCopyVar() +|* RscClass::GetCopyVar() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RSCINST RscClass::GetCopyVar @@ -522,7 +522,7 @@ RSCINST RscClass::GetCopyVar Atom nVarName ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aVarI; while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) @@ -555,16 +555,16 @@ RSCINST RscClass::GetCopyVar /************************************************************************* |* -|* RscClass::IsConsistent() +|* RscClass::IsConsistent() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aTmpI; - BOOL bRet; + BOOL bRet; bRet = RscTop::IsConsistent( rInst, pList ); @@ -585,16 +585,16 @@ BOOL RscClass::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) /************************************************************************* |* -|* RscClass::SetToDefault() +|* RscClass::SetToDefault() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::SetToDefault( const RSCINST & rInst ) { - sal_uInt32 i; + sal_uInt32 i; RSCINST aTmpI; - RscClassInst * pClass; + RscClassInst * pClass; pClass = (RscClassInst *)(rInst.pData + nSuperSize ); @@ -616,14 +616,14 @@ void RscClass::SetToDefault( const RSCINST & rInst ) /************************************************************************* |* -|* RscClass::IsDefault() +|* RscClass::IsDefault() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ BOOL RscClass::IsDefault( const RSCINST & rInst ) { - sal_uInt32 i; + sal_uInt32 i; RSCINST aTmpI; for( i = 0; i < nEntries; i++ ) @@ -640,14 +640,14 @@ BOOL RscClass::IsDefault( const RSCINST & rInst ) /************************************************************************* |* -|* RscClass::GetDefault() +|* RscClass::GetDefault() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RSCINST RscClass::GetDefault( Atom nVarId ) { - sal_uInt32 i; + sal_uInt32 i; i = 0; while( i < nEntries && pVarTypeList[ i ].nVarName != nVarId ) @@ -666,9 +666,9 @@ RSCINST RscClass::GetDefault( Atom nVarId ) /************************************************************************* |* -|* RscClass::IsValueDflt() +|* RscClass::IsValueDflt() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) @@ -693,14 +693,14 @@ BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) /************************************************************************* |* -|* RscClass::IsValueDefault() +|* RscClass::IsValueDefault() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aTmpI; RSCINST aDfltI; @@ -735,14 +735,14 @@ BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) /************************************************************************* |* -|* RscClass::SetDefault() +|* RscClass::SetDefault() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aTmpI; while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) @@ -766,9 +766,9 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) /************************************************************************* |* -|* RscClass::WriteSrc() +|* RscClass::WriteSrc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::WriteSrc @@ -780,7 +780,7 @@ void RscClass::WriteSrc const char * pVarName ) { - sal_uInt32 i = 0, n = 0; + sal_uInt32 i = 0, n = 0; RSCINST aTmpI; RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); @@ -793,7 +793,7 @@ void RscClass::WriteSrc if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName || nRsc_WHMAPMODEId == pVarTypeList[ i ].nVarName ) { - if( !IsDflt( rInst.pData, i ) //MapUnit + if( !IsDflt( rInst.pData, i ) //MapUnit || !IsDflt( rInst.pData, i+1 ) //X, Width || !IsDflt( rInst.pData, i+2 ) )//Y, Height {// ein Wert ist nicht Default @@ -854,9 +854,9 @@ void RscClass::WriteSrc /************************************************************************* |* -|* RscClass::WriteInstRc() +|* RscClass::WriteInstRc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ INT32 RscClass::GetCorrectValues @@ -898,7 +898,7 @@ ERRTYPE RscClass::WriteInstRc sal_uInt32 i = 0; ERRTYPE aError; RSCINST aTmpI; - sal_uInt32 nMaskOff = 0;// Offset um Maskenfeld zu addressieren + sal_uInt32 nMaskOff = 0;// Offset um Maskenfeld zu addressieren // Wenn eine Variable Maskierung hat, dann Maskenfeld for( i = 0; i < nEntries; i++ ) @@ -981,9 +981,9 @@ ERRTYPE RscClass::WriteInstRc /************************************************************************* |* -|* RscClass::WriteRc() +|* RscClass::WriteRc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ ERRTYPE RscClass::WriteRc @@ -1006,9 +1006,9 @@ ERRTYPE RscClass::WriteRc /************************************************************************* |* -|* RscClass::WriteSyntax() +|* RscClass::WriteSyntax() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscClass::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) @@ -1095,9 +1095,9 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) /************************************************************************* |* -|* RscSysDepend::RscSysDepend() +|* RscSysDepend::RscSysDepend() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) @@ -1106,17 +1106,17 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) /************************************************************************* |* -|* RscSysDepend::WriteRc() +|* RscSysDepend::WriteRc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra, BOOL bFirst ) { - sal_uInt32 nId = 0xFFFFFFFF; - ERRTYPE aError; - RSCINST aFileName; + sal_uInt32 nId = 0xFFFFFFFF; + ERRTYPE aError; + RSCINST aFileName; //Instanz mit dem Dateinamen "FILENAME" holen aFileName = RscClass::GetCopyVar( rInst, pHS->getID( "FILE", true ) ); @@ -1147,15 +1147,15 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem /************************************************************************* |* -|* RscSysDepend::WriteRc() +|* RscSysDepend::WriteRc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra ) { - ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); + ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); if( this == rInst.pClass ) // nur wenn es eigen Klasse ist @@ -1165,9 +1165,9 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscFirstSysDepend::RscFirstSysDepend() +|* RscFirstSysDepend::RscFirstSysDepend() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId, @@ -1177,9 +1177,9 @@ RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId, /************************************************************************* |* -|* RscFirstSysDepend::WriteRc() +|* RscFirstSysDepend::WriteRc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, @@ -1192,9 +1192,9 @@ ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscTupel::RscTupel() +|* RscTupel::RscTupel() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) @@ -1203,9 +1203,9 @@ RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) /************************************************************************* |* -|* RscTupel::GetTupelVar() +|* RscTupel::GetTupelVar() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, @@ -1221,16 +1221,16 @@ RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, /************************************************************************* |* -|* RscTupel::WriteSrc() +|* RscTupel::WriteSrc() |* -|* Beschreibung +|* Beschreibung |* *************************************************************************/ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aTmpI; RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx index 48de99eaba4d..d63336c12061 100644 --- a/rsc/source/res/rscclobj.cxx +++ b/rsc/source/res/rscclobj.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index 7a2bb986539a..011e08e4ed0e 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -409,7 +409,7 @@ ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, return( ERR_OK ); } -RscLangEnum::RscLangEnum() +RscLangEnum::RscLangEnum() : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ), mnLangId( 0x400 ) { diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index b1e2e7fde4af..27e94aebc994 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ /****************** E N T R Y S T R U C T ********************************/ /************************************************************************* |* -|* ENTRYSTRUCT::Destroy() +|* ENTRYSTRUCT::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 06.08.91 -|* Letzte Aenderung MM 06.08.91 +|* Beschreibung +|* Ersterstellung MM 06.08.91 +|* Letzte Aenderung MM 06.08.91 |* *************************************************************************/ void ENTRY_STRUCT::Destroy() @@ -63,11 +63,11 @@ void ENTRY_STRUCT::Destroy() /****************** R s c B a s e C o n t ********************************/ /************************************************************************* |* -|* RscBaseCont::RscBaseCont() +|* RscBaseCont::RscBaseCont() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, @@ -84,11 +84,11 @@ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, /************************************************************************* |* -|* RscBaseCont::~RscBaseCont() +|* RscBaseCont::~RscBaseCont() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RscBaseCont::~RscBaseCont() @@ -97,11 +97,11 @@ RscBaseCont::~RscBaseCont() /************************************************************************* |* -|* RscBaseCont::GetClassType() +|* RscBaseCont::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ RSCCLASS_TYPE RscBaseCont::GetClassType() const @@ -111,16 +111,16 @@ RSCCLASS_TYPE RscBaseCont::GetClassType() const /************************************************************************* |* -|* DestroyElements() +|* DestroyElements() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; if( pClassData->nEntries ){ for( i = 0; i < pClassData->nEntries; i++ ){ @@ -134,17 +134,17 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) /************************************************************************* |* -|* RscBaseCont::Create() +|* RscBaseCont::Create() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RSCINST aInst; RscBaseContInst * pClassData; @@ -165,8 +165,8 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, pClassData->bDflt = TRUE; if( bOwnClass ){ - RscBaseContInst * pDfltClassData; - RSCINST aDfltI; + RscBaseContInst * pDfltClassData; + RSCINST aDfltI; pDfltClassData = (RscBaseContInst *)(rDflt.pData + nOffInstData); @@ -191,11 +191,11 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, /************************************************************************* |* -|* RscBaseCont::Destroy() +|* RscBaseCont::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 25.05.91 -|* Letzte Aenderung MM 25.05.91 +|* Beschreibung +|* Ersterstellung MM 25.05.91 +|* Letzte Aenderung MM 25.05.91 |* *************************************************************************/ void RscBaseCont::Destroy( const RSCINST & rInst ){ @@ -209,17 +209,17 @@ void RscBaseCont::Destroy( const RSCINST & rInst ){ /************************************************************************* |* -|* RscBaseCont::SearchEle() +|* RscBaseCont::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 +|* 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 ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -240,11 +240,11 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName /************************************************************************* |* -|* RscBaseCont::SearchEle() +|* RscBaseCont::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 +|* Beschreibung +|* Ersterstellung MM 17.05.91 +|* Letzte Aenderung MM 17.05.91 |* *************************************************************************/ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, @@ -255,11 +255,11 @@ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, /************************************************************************* |* -|* RscBaseCont::GetElement() +|* RscBaseCont::GetElement() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, @@ -267,8 +267,8 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, const RSCINST & rCreateInst, RSCINST * pGetInst ) { RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; + RSCINST aTmpI; + ERRTYPE aError; if( !bNoId && !rEleName.IsId() ) aError = WRN_CONT_NOID; @@ -337,11 +337,11 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, /************************************************************************* |* -|* RscBaseCont::GetCount() +|* RscBaseCont::GetCount() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ @@ -353,11 +353,11 @@ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ /************************************************************************* |* -|* RscBaseCont::GetPosEle() +|* RscBaseCont::GetPosEle() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ @@ -372,11 +372,11 @@ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ /************************************************************************* |* -|* RscBaseCont::MovePosEle() +|* RscBaseCont::MovePosEle() |* -|* Beschreibung -|* Ersterstellung MM 23.10.91 -|* Letzte Aenderung MM 23.10.91 +|* Beschreibung +|* Ersterstellung MM 23.10.91 +|* Letzte Aenderung MM 23.10.91 |* *************************************************************************/ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, @@ -389,8 +389,8 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) ){ ENTRY_STRUCT aEntry; - int nInc = 1; - sal_uInt32 i = 0; + int nInc = 1; + sal_uInt32 i = 0; // Quelle Merken aEntry = pClassData->pEntries[ nSourcePos ]; @@ -411,18 +411,18 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, /************************************************************************* |* -|* RscBaseCont::SetPosRscId() +|* RscBaseCont::SetPosRscId() |* -|* Beschreibung -|* Ersterstellung MM 30.09.91 -|* Letzte Aenderung MM 30.09.91 +|* Beschreibung +|* Ersterstellung MM 30.09.91 +|* Letzte Aenderung MM 30.09.91 |* *************************************************************************/ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, const RscId & rId ){ RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; + RSCINST aTmpI; + ERRTYPE aError; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -442,22 +442,22 @@ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, /************************************************************************* |* -|* RscBaseCont::GetInfoEle() +|* RscBaseCont::GetInfoEle() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; - SUBINFO_STRUCT aInfo; + SUBINFO_STRUCT aInfo; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); if( nPos < pClassData->nEntries ){ - aInfo.aId = pClassData->pEntries[ nPos ].aName; - aInfo.nPos = nPos; + aInfo.aId = pClassData->pEntries[ nPos ].aName; + aInfo.nPos = nPos; aInfo.pClass = pClassData->pEntries[ nPos ].aInst.pClass; } return( aInfo ); @@ -465,11 +465,11 @@ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) /************************************************************************* |* -|* RscBaseCont::SetString() +|* RscBaseCont::SetString() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 +|* Beschreibung +|* Ersterstellung MM 29.04.91 +|* Letzte Aenderung MM 29.04.91 |* *************************************************************************/ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) @@ -477,7 +477,7 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - char *pTmpStr; + char *pTmpStr; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -507,18 +507,18 @@ else /************************************************************************* |* -|* RscBaseCont::SetNumber() +|* RscBaseCont::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, INT32 lValue ){ RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - INT32 lNumber; + INT32 lNumber; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -556,7 +556,7 @@ ERRTYPE RscBaseCont::SetBool RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - BOOL bBool; + BOOL bBool; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -596,7 +596,7 @@ ERRTYPE RscBaseCont::SetConst RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - Atom nConst; + Atom nConst; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -626,18 +626,18 @@ else /************************************************************************* |* -|* RscBaseCont::SetRef() +|* RscBaseCont::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 02.12.91 -|* Letzte Aenderung MM 02.12.91 +|* Beschreibung +|* Ersterstellung MM 02.12.91 +|* Letzte Aenderung MM 02.12.91 |* *************************************************************************/ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){ RscBaseContInst * pClassData; RSCINST aTmpI; ERRTYPE aError; - RscId aId; + RscId aId; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -667,17 +667,17 @@ else /************************************************************************* |* -|* RscBaseCont::IsConsistent() +|* RscBaseCont::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 +|* Beschreibung +|* Ersterstellung MM 23.09.91 +|* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; - BOOL bRet; + BOOL bRet; bRet = RscTop::IsConsistent( rInst, pList ); @@ -701,7 +701,7 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ bRet = FALSE; if( pList ) pList->Insert( new RscInconsistent( - pClassData->pEntries[ i ].aName, + pClassData->pEntries[ i ].aName, pClassData->pEntries[ i +1 ].aName ) ); }; } @@ -715,16 +715,16 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst, RscInconsList * pList ){ /************************************************************************* |* -|* RscBaseCont::SetToDefault() +|* RscBaseCont::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ void RscBaseCont::SetToDefault( const RSCINST & rInst ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -740,15 +740,15 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst ) /************************************************************************* |* -|* RscBaseCont::IsDefault() +|* RscBaseCont::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){ - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -769,11 +769,11 @@ BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){ /************************************************************************* |* -|* RscBaseCont::IsValueDefault() +|* RscBaseCont::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 15.01.92 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) @@ -793,17 +793,17 @@ BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) /************************************************************************* |* -|* RscBaseCont::Delete() +|* RscBaseCont::Delete() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -822,16 +822,16 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, /************************************************************************* |* -|* RscBaseCont::DeletePos() +|* RscBaseCont::DeletePos() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ - RscBaseContInst * pClassData; - sal_uInt32 i = 0; + RscBaseContInst * pClassData; + sal_uInt32 i = 0; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -849,18 +849,18 @@ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ /************************************************************************* |* -|* RscBaseCont::ContWriteSrc() +|* RscBaseCont::ContWriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* 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, const char * pVarName ) { - sal_uInt32 i = 0, t = 0; + sal_uInt32 i = 0, t = 0; RscBaseContInst * pClassData; pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); @@ -879,19 +879,19 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscBaseCont::ContWriteRc() +|* RscBaseCont::ContWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* 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, BOOL bExtra ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; - ERRTYPE aError; + ERRTYPE aError; if( bExtra || bNoId ) { // Nur Subresourcen schreiben, wenn bExtra == TRUE @@ -941,11 +941,11 @@ void RscBaseCont::ContWriteRcAccess /************************************************************************* |* -|* RscBaseCont::WriteSrc() +|* RscBaseCont::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -958,17 +958,17 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscBaseCont::WriteRc() +|* RscBaseCont::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* 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, BOOL bExtra ) { - ERRTYPE aError; + ERRTYPE aError; aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep, bExtra ); if( aError.IsOk() ) @@ -979,19 +979,19 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscBaseCont::WriteHxx() +|* RscBaseCont::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* 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 ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; - ERRTYPE aError; + ERRTYPE aError; aError = RscTop::WriteHxx( rInst, fOutput, pTC, rRscId ); @@ -1014,19 +1014,19 @@ ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscBaseCont::WriteCxx() +|* RscBaseCont::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* 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 ) { - sal_uInt32 i = 0; + sal_uInt32 i = 0; RscBaseContInst * pClassData; - ERRTYPE aError; + ERRTYPE aError; aError = RscTop::WriteCxx( rInst, fOutput, pTC, rRscId ); @@ -1050,11 +1050,11 @@ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput, /*************** R s c C o n t W r i t e S r c ***************************/ /************************************************************************* |* -|* RscContWriteSrc::RscContWriteSrc() +|* RscContWriteSrc::RscContWriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, @@ -1064,18 +1064,18 @@ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, /************************************************************************* |* -|* RscContWriteSrc::WriteSrc() +|* RscContWriteSrc::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* 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, const char * pVarName ) { - sal_uInt32 i; + sal_uInt32 i; RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); @@ -1094,11 +1094,11 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, /*************** R s c C o n t *******************************************/ /************************************************************************* |* -|* RscCont::RscCont() +|* RscCont::RscCont() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent ) @@ -1107,11 +1107,11 @@ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent ) /************************************************************************* |* -|* RscCont::WriteRc() +|* RscCont::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, @@ -1145,11 +1145,11 @@ void RscCont::WriteRcAccess /************************************************************************* |* -|* RscContExtraData::RscContExtraData() +|* RscContExtraData::RscContExtraData() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, @@ -1159,11 +1159,11 @@ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, /************************************************************************* |* -|* RscContExtraData::WriteRc() +|* RscContExtraData::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.05.91 -|* Letzte Aenderung MM 08.05.91 +|* Beschreibung +|* Ersterstellung MM 08.05.91 +|* Letzte Aenderung MM 08.05.91 |* *************************************************************************/ ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index b5c3f496b563..ea39a159fdce 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -384,7 +384,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, BOOL ) { - INT32 lVal = 0; + INT32 lVal = 0; sal_uInt32 i = 0, Flag = 0, nIndex = 0; Flag = 1; diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 676d7b27bec2..c159aa69b69f 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ /****************** R s c M g r ******************************************/ /************************************************************************* |* -|* RscMgr::RscMgr() +|* RscMgr::RscMgr() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) @@ -58,11 +58,11 @@ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) /************************************************************************* |* -|* RscMgr::Size() +|* RscMgr::Size() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ sal_uInt32 RscMgr::Size() @@ -72,11 +72,11 @@ sal_uInt32 RscMgr::Size() /************************************************************************* |* -|* RscMgr::Create() +|* RscMgr::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){ @@ -107,11 +107,11 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ) /************************************************************************* |* -|* RscMgr::Destroy() +|* RscMgr::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 21.06.91 -|* Letzte Aenderung MM 21.06.91 +|* Beschreibung +|* Ersterstellung MM 21.06.91 +|* Letzte Aenderung MM 21.06.91 |* *************************************************************************/ void RscMgr::Destroy( const RSCINST & rInst ){ @@ -125,11 +125,11 @@ void RscMgr::Destroy( const RSCINST & rInst ){ /************************************************************************* |* -|* RscMgr::SetToDefault() +|* RscMgr::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ void RscMgr::SetToDefault( const RSCINST & rInst ) @@ -144,11 +144,11 @@ void RscMgr::SetToDefault( const RSCINST & rInst ) /************************************************************************* |* -|* RscMgr::IsDefault() +|* RscMgr::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ BOOL RscMgr::IsDefault( const RSCINST & rInst ){ @@ -163,11 +163,11 @@ BOOL RscMgr::IsDefault( const RSCINST & rInst ){ /************************************************************************* |* -|* RscMgr::IsValueDefault() +|* RscMgr::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 12.06.91 -|* Letzte Aenderung MM 12.06.91 +|* Beschreibung +|* Ersterstellung MM 12.06.91 +|* Letzte Aenderung MM 12.06.91 |* *************************************************************************/ BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ @@ -192,11 +192,11 @@ BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ /************************************************************************* |* -|* RscMgr::WriteSrcHeader() +|* RscMgr::WriteSrcHeader() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, @@ -204,7 +204,7 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, const RscId & rId, const char * pVarName ) { RscMgrInst * pClassData; - sal_uInt32 i; + sal_uInt32 i; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); @@ -232,11 +232,11 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscMgr::WriteSrc() +|* RscMgr::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, @@ -246,20 +246,20 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, /************************************************************************* |* -|* RscMgr::WriteRcHeader() +|* RscMgr::WriteRcHeader() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* 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, sal_uInt32 nDeep, BOOL bExtra ) { - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = NULL; + RscMgrInst * pClassData; + ERRTYPE aError; + ObjNode * pObjNode = NULL; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); @@ -286,8 +286,8 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, { if( pObjNode ) { - RSCINST aRefI; - RscTop * pTmpRefClass = rInst.pClass->GetRefClass(); + RSCINST aRefI; + RscTop * pTmpRefClass = rInst.pClass->GetRefClass(); aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); if( pTmpRefClass == rInst.pClass ) @@ -305,8 +305,8 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, } else { - sal_uInt32 nOldSize; - sal_uInt32 nLocalSize; + sal_uInt32 nOldSize; + sal_uInt32 nLocalSize; nOldSize = rMem.IncSize( 16 /*sizeof( RSHEADER_TYPE )*/ ); @@ -324,10 +324,10 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, /* // Definition der Struktur, aus denen die Resource aufgebaut ist struct RSHEADER_TYPE{ - RESOURCE_TYPE nRT; // Resource Typ - sal_uInt32 nRT; // Resource Typ - sal_uInt32 nGlobOff; // Globaler Offset - sal_uInt32 nLocalOff; // Lokaler Offset + RESOURCE_TYPE nRT; // Resource Typ + sal_uInt32 nRT; // Resource Typ + sal_uInt32 nGlobOff; // Globaler Offset + sal_uInt32 nLocalOff; // Lokaler Offset }; */ sal_uInt32 nID = rId; @@ -343,11 +343,11 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscMgr::WriteRc() +|* RscMgr::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 26.04.91 -|* Letzte Aenderung MM 26.04.91 +|* Beschreibung +|* Ersterstellung MM 26.04.91 +|* Letzte Aenderung MM 26.04.91 |* *************************************************************************/ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, @@ -397,19 +397,19 @@ static ByteString MakeName( RscTypCont * pTypCon, RscTop * pClass, /************************************************************************* |* -|* RscMgr::WriteHxxHeader() +|* RscMgr::WriteHxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* 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 ) { - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = NULL; + RscMgrInst * pClassData; + ERRTYPE aError; + ObjNode * pObjNode = NULL; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); @@ -418,7 +418,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); + ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); aMsg += ' '; aMsg += pClassData->aRefId.GetName(); aError = WRN_MGR_REFNOTFOUND; @@ -428,7 +428,7 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, if( pObjNode ) { - RSCINST aRefI; + RSCINST aRefI; aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); aError = aRefI.pClass->WriteHxxHeader( aRefI, fOutput, pTC, @@ -466,11 +466,11 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscMgr::WriteHxx() +|* RscMgr::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput, @@ -485,19 +485,19 @@ ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscClass::WriteCxxHeader() +|* RscClass::WriteCxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* 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 ) { - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = NULL; + RscMgrInst * pClassData; + ERRTYPE aError; + ObjNode * pObjNode = NULL; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); @@ -506,7 +506,7 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); + ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); aMsg += ' '; aMsg += pClassData->aRefId.GetName(); aError = WRN_MGR_REFNOTFOUND; @@ -516,7 +516,7 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, if( pObjNode ) { - RSCINST aRefI; + RSCINST aRefI; aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); aError = aRefI.pClass->WriteCxxHeader( aRefI, fOutput, pTC, @@ -567,11 +567,11 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscClass::WriteCxx() +|* RscClass::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, @@ -587,16 +587,16 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscArray::IsConsistent() +|* RscArray::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 +|* Beschreibung +|* Ersterstellung MM 23.09.91 +|* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { - BOOL bRet; + BOOL bRet; RscMgrInst * pClassData; bRet = RscClass::IsConsistent( rInst, pList ); @@ -619,11 +619,11 @@ BOOL RscMgr::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) /************************************************************************* |* -|* RscMgr::GetRef() +|* RscMgr::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 +|* Beschreibung +|* Ersterstellung MM 15.05.91 +|* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ @@ -636,20 +636,20 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ /************************************************************************* |* -|* RscMgr::IsToDeep() +|* RscMgr::IsToDeep() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 +|* Beschreibung +|* Ersterstellung MM 15.05.91 +|* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) { - RscMgrInst * pClassData; - RscId aOldId, aId; - ERRTYPE aError; - RSCINST aTmpI = rInst; - ObjNode * pObjNode; + RscMgrInst * pClassData; + RscId aOldId, aId; + ERRTYPE aError; + RSCINST aTmpI = rInst; + ObjNode * pObjNode; pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); @@ -672,7 +672,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) if( nDeep >= nRefDeep ) { pClassData->aRefId = aOldId; - aError = ERR_REFTODEEP; + aError = ERR_REFTODEEP; } return( aError ); @@ -680,19 +680,19 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) /************************************************************************* |* -|* RscMgr::SetRef() +|* RscMgr::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 +|* 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; + RscMgrInst * pClassData; + RscId aOldId, aId; + ERRTYPE aError; + RSCINST aTmpI = rInst; if( rRefId.IsId() && ((rRefId.GetNumber() < 1) || (rRefId.GetNumber() > 0x7FFF)) ) diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 38c38455e99a..5ee347bb0f68 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ /****************** R s c R a n g e **************************************/ /************************************************************************* |* -|* RscRange::RscRange() +|* RscRange::RscRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) @@ -62,11 +62,11 @@ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscRange::GetClassType() +|* RscRange::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCCLASS_TYPE RscRange::GetClassType() const @@ -76,11 +76,11 @@ RSCCLASS_TYPE RscRange::GetClassType() const /************************************************************************* |* -|* RscRange::SetRange() +|* RscRange::SetRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum ) @@ -101,11 +101,11 @@ ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum ) /************************************************************************* |* -|* RscRange::IsValueDefault() +|* RscRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.02.92 -|* Letzte Aenderung MM 15.02.92 +|* Beschreibung +|* Ersterstellung MM 15.02.92 +|* Letzte Aenderung MM 15.02.92 |* *************************************************************************/ BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) @@ -124,11 +124,11 @@ BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) /************************************************************************* |* -|* RscRange::SetNumber() +|* RscRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue ) @@ -142,11 +142,11 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue ) /************************************************************************* |* -|* RscRange::GetNumber() +|* RscRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 22.04.91 -|* Letzte Aenderung MM 22.04.91 +|* Beschreibung +|* Ersterstellung MM 22.04.91 +|* Letzte Aenderung MM 22.04.91 |* *************************************************************************/ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN ) @@ -157,11 +157,11 @@ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN ) /************************************************************************* |* -|* RscRange::Create() +|* RscRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, @@ -196,11 +196,11 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, /************************************************************************* |* -|* RscRange::WriteSrc() +|* RscRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -211,11 +211,11 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscRange::WriteRc() +|* RscRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, @@ -256,11 +256,11 @@ void RscRange::WriteRcAccess /****************** R s c L o n g R a n g e ******************************/ /************************************************************************* |* -|* RscLongRange::RscLongRange() +|* RscLongRange::RscLongRange() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) @@ -272,11 +272,11 @@ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscLongRange::GetClassType() +|* RscLongRange::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ RSCCLASS_TYPE RscLongRange::GetClassType() const @@ -286,11 +286,11 @@ RSCCLASS_TYPE RscLongRange::GetClassType() const /************************************************************************* |* -|* RscLongRange::SetRange() +|* RscLongRange::SetRange() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum ) @@ -311,11 +311,11 @@ ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum ) /************************************************************************* |* -|* RscLongRange::IsValueDefault() +|* RscLongRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.02.92 -|* Letzte Aenderung MM 15.02.92 +|* Beschreibung +|* Ersterstellung MM 15.02.92 +|* Letzte Aenderung MM 15.02.92 |* *************************************************************************/ BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) @@ -330,11 +330,11 @@ BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) /************************************************************************* |* -|* RscLongRange::SetNumber() +|* RscLongRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue ) @@ -349,11 +349,11 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue ) /************************************************************************* |* -|* RscLongRange::GetNumber() +|* RscLongRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 22.04.91 -|* Letzte Aenderung MM 22.04.91 +|* Beschreibung +|* Ersterstellung MM 22.04.91 +|* Letzte Aenderung MM 22.04.91 |* *************************************************************************/ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN ) @@ -365,11 +365,11 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN ) /************************************************************************* |* -|* RscLongRange::Create() +|* RscLongRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, @@ -392,7 +392,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) ); else { - INT32 lDflt; + INT32 lDflt; if( 0L >= nMin && 0L <= nMax ) lDflt = 0; else @@ -407,11 +407,11 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, /************************************************************************* |* -|* RscLongRange::WriteSrc() +|* RscLongRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.07.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.07.94 |* *************************************************************************/ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -424,11 +424,11 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscLongRange::WriteRc() +|* RscLongRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 18.07.94 -|* Letzte Aenderung MM 18.04.94 +|* Beschreibung +|* Ersterstellung MM 18.07.94 +|* Letzte Aenderung MM 18.04.94 |* *************************************************************************/ ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, @@ -457,9 +457,9 @@ void RscLongRange::WriteRcAccess /****************** R s c L o n g E n u m R a n g e *********************/ /************************************************************************* -|* RscLongEnumRange::RscLongEnumRange() +|* RscLongEnumRange::RscLongEnumRange() |* -|* Beschreibung +|* Beschreibung *************************************************************************/ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId ) : RscLongRange( nId, nTypeId ) @@ -467,9 +467,9 @@ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId ) } /************************************************************************* -|* RscLongEnumRange::SetConst() +|* RscLongEnumRange::SetConst() |* -|* Beschreibung +|* Beschreibung *************************************************************************/ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, INT32 nValue ) @@ -480,11 +480,11 @@ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, /****************** R s c I d R a n g e **********************************/ /************************************************************************* |* -|* RscIdRange::RscIdRange() +|* RscIdRange::RscIdRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) @@ -496,11 +496,11 @@ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscIdRange::RscIdRange() +|* RscIdRange::RscIdRange() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCCLASS_TYPE RscIdRange::GetClassType() const @@ -510,11 +510,11 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const /************************************************************************* |* -|* RscIdRange::Create() +|* RscIdRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 03.04.91 -|* Letzte Aenderung MM 03.04.91 +|* Beschreibung +|* Ersterstellung MM 03.04.91 +|* Letzte Aenderung MM 03.04.91 |* *************************************************************************/ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){ @@ -552,11 +552,11 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnCla /************************************************************************* |* -|* RscIdRange::Destroy() +|* RscIdRange::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ void RscIdRange :: Destroy( const RSCINST & rInst ){ @@ -565,11 +565,11 @@ void RscIdRange :: Destroy( const RSCINST & rInst ){ /************************************************************************* |* -|* RscIdRange::IsValueDefault() +|* RscIdRange::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.01.92 -|* Letzte Aenderung MM 15.01.92 +|* Beschreibung +|* Ersterstellung MM 15.01.92 +|* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ @@ -590,11 +590,11 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ /************************************************************************* |* -|* RscIdRange::SetNumber() +|* RscIdRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 25.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue ) @@ -609,11 +609,11 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue ) /************************************************************************* |* -|* RscIdRange::GetNumber() +|* RscIdRange::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 25.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){ @@ -623,11 +623,11 @@ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){ /************************************************************************* |* -|* RscIdRange::SetRef() +|* RscIdRange::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ @@ -647,11 +647,11 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ /************************************************************************* |* -|* RscIdRange::GetRef() +|* RscIdRange::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){ @@ -662,11 +662,11 @@ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){ /************************************************************************* |* -|* RscIdRange::WriteSrc() +|* RscIdRange::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -677,11 +677,11 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscIdRange::WriteRc() +|* RscIdRange::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 25.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 25.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, @@ -709,11 +709,11 @@ void RscIdRange::WriteRcAccess /************************************************************************* |* -|* RscIdRange::IsConsistent() +|* RscIdRange::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) @@ -732,11 +732,11 @@ BOOL RscIdRange::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) /****************** R s c B o o l ****************************************/ /************************************************************************* |* -|* RscBool::RscBool() +|* RscBool::RscBool() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 +|* Beschreibung +|* Ersterstellung MM 29.04.91 +|* Letzte Aenderung MM 29.04.91 |* *************************************************************************/ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId ) @@ -747,11 +747,11 @@ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscBool::GetClassType() +|* RscBool::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 +|* Beschreibung +|* Ersterstellung MM 29.04.91 +|* Letzte Aenderung MM 29.04.91 |* *************************************************************************/ RSCCLASS_TYPE RscBool::GetClassType() const @@ -761,11 +761,11 @@ RSCCLASS_TYPE RscBool::GetClassType() const /************************************************************************* |* -|* RscBool::WriteSrc() +|* RscBool::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 29.04.91 -|* Letzte Aenderung MM 29.04.91 +|* Beschreibung +|* Ersterstellung MM 29.04.91 +|* Letzte Aenderung MM 29.04.91 |* *************************************************************************/ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -796,11 +796,11 @@ void RscBool::WriteRcAccess /****************** R s c B r e a k R a n g e ****************************/ /************************************************************************* |* -|* RscBreakRange::SetNumber() +|* RscBreakRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 +|* Beschreibung +|* Ersterstellung MM 24.06.91 +|* Letzte Aenderung MM 24.06.91 |* *************************************************************************/ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) @@ -811,11 +811,11 @@ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscBreakRange::SetNumber() +|* RscBreakRange::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 +|* Beschreibung +|* Ersterstellung MM 24.06.91 +|* Letzte Aenderung MM 24.06.91 |* *************************************************************************/ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){ @@ -827,18 +827,18 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){ /************************************************************************* |* -|* RscBreakRange::Create() +|* RscBreakRange::Create() |* -|* Beschreibung -|* Ersterstellung MM 24.06.91 -|* Letzte Aenderung MM 24.06.91 +|* Beschreibung +|* Ersterstellung MM 24.06.91 +|* Letzte Aenderung MM 24.06.91 |* *************************************************************************/ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ) { RSCINST aInst; - INT32 l; + INT32 l; aInst = RscRange::Create( pInst, rDflt, bOwnClass ); diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index e830b89ec4e3..079a6b19f6bf 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ /****************** R s c S t r i n g ************************************/ /************************************************************************* |* -|* RscString::RscString() +|* RscString::RscString() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) @@ -62,11 +62,11 @@ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) /************************************************************************* |* -|* RscString::GetClassType() +|* RscString::GetClassType() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ RSCCLASS_TYPE RscString::GetClassType() const @@ -76,15 +76,15 @@ RSCCLASS_TYPE RscString::GetClassType() const /************************************************************************* |* -|* RscString::SetNumber() +|* RscString::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ - char * pTmp; + char * pTmp; ERRTYPE aError; if( aError.IsOk() ){ @@ -97,7 +97,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ } if( pStr ){ - sal_uInt32 nLen = strlen( pStr ) +1; + sal_uInt32 nLen = strlen( pStr ) +1; pTmp = (char *)rtl_allocateMemory( nLen ); memcpy( pTmp, pStr, nLen ); }; @@ -110,11 +110,11 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ /************************************************************************* |* -|* RscString::GetString() +|* RscString::GetString() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){ @@ -124,11 +124,11 @@ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){ /************************************************************************* |* -|* RscString::GetRef() +|* RscString::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 22.07.91 -|* Letzte Aenderung MM 22.07.91 +|* Beschreibung +|* Ersterstellung MM 22.07.91 +|* Letzte Aenderung MM 22.07.91 |* *************************************************************************/ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ @@ -138,11 +138,11 @@ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ /************************************************************************* |* -|* RscString::SetRef() +|* RscString::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 +|* Beschreibung +|* Ersterstellung MM 15.05.91 +|* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ @@ -158,11 +158,11 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ /************************************************************************* |* -|* RscString::Create() +|* RscString::Create() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, @@ -197,11 +197,11 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, /************************************************************************* |* -|* RscString::Destroy() +|* RscString::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 15.05.91 -|* Letzte Aenderung MM 15.05.91 +|* Beschreibung +|* Ersterstellung MM 15.05.91 +|* Letzte Aenderung MM 15.05.91 |* *************************************************************************/ void RscString::Destroy( const RSCINST & rInst ){ @@ -212,15 +212,15 @@ void RscString::Destroy( const RSCINST & rInst ){ /************************************************************************* |* -|* RscString::IsValueDefault() +|* RscString::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 15.01.92 -|* Letzte Aenderung MM 15.01.92 +|* Beschreibung +|* Ersterstellung MM 15.01.92 +|* Letzte Aenderung MM 15.01.92 |* *************************************************************************/ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ - RscStringInst * pData = (RscStringInst*)rInst.pData; + RscStringInst * pData = (RscStringInst*)rInst.pData; RscStringInst * pDefData = (RscStringInst*)pDef; if( pDef ){ @@ -264,11 +264,11 @@ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ /************************************************************************* |* -|* RscString::WriteSrc() +|* RscString::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 25.04.91 -|* Letzte Aenderung MM 25.04.91 +|* Beschreibung +|* Ersterstellung MM 25.04.91 +|* Letzte Aenderung MM 25.04.91 |* *************************************************************************/ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -284,8 +284,8 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscStringInst * pStrI = ((RscStringInst *)rInst.pData); if( pStrI->pStr ){ //char * pChangeTab = RscChar::GetChangeTab(); - sal_uInt32 n = 0; - sal_uInt32 nPos, nSlashPos; + sal_uInt32 n = 0; + sal_uInt32 nPos, nSlashPos; do { fputc( '\"', fOutput ); @@ -312,22 +312,22 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscString::WriteRc() +|* RscString::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* 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, BOOL bExtra ) { ERRTYPE aError; - ObjNode * pObjNode = NULL; + ObjNode * pObjNode = NULL; if( ((RscStringInst *)rInst.pData)->aRefId.IsId() ){ - RscId aId( ((RscStringInst *)rInst.pData)->aRefId ); + RscId aId( ((RscStringInst *)rInst.pData)->aRefId ); RSCINST aTmpI; aTmpI.pClass = pRefClass; @@ -349,7 +349,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, { if( pTC ) { - ByteString aMsg( pHS->getString( pRefClass->GetId() ).getStr() ); + ByteString aMsg( pHS->getString( pRefClass->GetId() ).getStr() ); aMsg += ' '; aMsg += aId.GetName(); aError = WRN_STR_REFNOTFOUND; @@ -366,7 +366,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, { if( pObjNode ) { - RSCINST aRefI; + RSCINST aRefI; aRefI = RSCINST( pRefClass, pObjNode->GetRscObj() ); aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep, bExtra ); diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 7b6ae4c06410..6f1e5e7c2949 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ /****************** R s c T o p ******************************************/ /************************************************************************* |* -|* RscTop::RscTop() +|* RscTop::RscTop() |* -|* Beschreibung -|* Ersterstellung MM 03.06.91 -|* Letzte Aenderung MM 03.06.91 +|* Beschreibung +|* Ersterstellung MM 03.06.91 +|* Letzte Aenderung MM 03.06.91 |* *************************************************************************/ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) @@ -61,11 +61,11 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) /************************************************************************* |* -|* RscTop::SetCallPar() +|* RscTop::SetCallPar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2, @@ -78,11 +78,11 @@ void RscTop::SetCallPar( const ByteString & rPar1, const ByteString & rPar2, /************************************************************************* |* -|* RscTop::GetDefault() +|* RscTop::GetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetDefault() @@ -94,11 +94,11 @@ RSCINST RscTop::GetDefault() /************************************************************************* |* -|* RscTop::Pre_dtor() +|* RscTop::Pre_dtor() |* -|* Beschreibung -|* Ersterstellung MM 19.06.91 -|* Letzte Aenderung MM 19.06.91 +|* Beschreibung +|* Ersterstellung MM 19.06.91 +|* Letzte Aenderung MM 19.06.91 |* *************************************************************************/ void RscTop :: Pre_dtor(){ @@ -111,24 +111,24 @@ void RscTop :: Pre_dtor(){ /************************************************************************* |* -|* RscTop::GetConstant() +|* RscTop::GetConstant() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -Atom RscTop :: GetConstant( sal_uInt32 ){ +Atom RscTop :: GetConstant( sal_uInt32 ){ return InvalidAtom; } /************************************************************************* |* -|* RscTop::GetIndexType() +|* RscTop::GetIndexType() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RscTop * RscTop::GetTypeClass() const @@ -141,11 +141,11 @@ RscTop * RscTop::GetTypeClass() const /************************************************************************* |* -|* RscTop::Size() +|* RscTop::Size() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ sal_uInt32 RscTop :: Size() @@ -158,11 +158,11 @@ sal_uInt32 RscTop :: Size() /************************************************************************* |* -|* RscTop::GetRef() +|* RscTop::GetRef() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ @@ -174,11 +174,11 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ /************************************************************************* |* -|* RscTop::InHierarchy() +|* RscTop::InHierarchy() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 +|* Beschreibung +|* Ersterstellung MM 17.05.91 +|* Letzte Aenderung MM 17.05.91 |* *************************************************************************/ BOOL RscTop::InHierarchy( RscTop * pClass ){ @@ -191,11 +191,11 @@ BOOL RscTop::InHierarchy( RscTop * pClass ){ /************************************************************************* |* -|* RscTop::SetVariable() +|* RscTop::SetVariable() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, @@ -212,11 +212,11 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, /************************************************************************* |* -|* RscTop::EnumVariable() +|* RscTop::EnumVariable() |* -|* Beschreibung -|* Ersterstellung MM 03.02.93 -|* Letzte Aenderung MM 03.02.93 +|* Beschreibung +|* Ersterstellung MM 03.02.93 +|* Letzte Aenderung MM 03.02.93 |* *************************************************************************/ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) @@ -227,11 +227,11 @@ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) /************************************************************************* |* -|* RscTop::GetVariable() +|* RscTop::GetVariable() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetVariable @@ -252,11 +252,11 @@ RSCINST RscTop::GetVariable /************************************************************************* |* -|* RscTop::GetCopyVar() +|* RscTop::GetCopyVar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) @@ -270,11 +270,11 @@ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) /************************************************************************* |* -|* RscTop::GetTupelVar() +|* RscTop::GetTupelVar() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, @@ -288,11 +288,11 @@ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, /************************************************************************* |* -|* RscTop::GetElement() +|* RscTop::GetElement() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, @@ -310,11 +310,11 @@ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, /************************************************************************* |* -|* RscTop::GetArrayEle() +|* RscTop::GetArrayEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetArrayEle @@ -333,11 +333,11 @@ ERRTYPE RscTop::GetArrayEle /************************************************************************* |* -|* RscTop::GetValueEle() +|* RscTop::GetValueEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetValueEle @@ -356,11 +356,11 @@ ERRTYPE RscTop::GetValueEle /************************************************************************* |* -|* RscTop::SearchEle() +|* RscTop::SearchEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, @@ -375,11 +375,11 @@ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, /************************************************************************* |* -|* RscTop::GetPosEle() +|* RscTop::GetPosEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ @@ -392,11 +392,11 @@ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ /************************************************************************* |* -|* RscTop::MovePosEle() +|* RscTop::MovePosEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, @@ -411,11 +411,11 @@ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, /************************************************************************* |* -|* RscTop::SetPosRscId() +|* RscTop::SetPosRscId() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, @@ -430,11 +430,11 @@ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, /************************************************************************* |* -|* RscTop::GetInfoEle() +|* RscTop::GetInfoEle() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ @@ -447,14 +447,14 @@ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ /************************************************************************* |* -|* RscTop::GetCount() +|* RscTop::GetCount() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ +sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ if( pSuperClass ) return pSuperClass->GetCount( rInst ); else @@ -463,11 +463,11 @@ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ /************************************************************************* |* -|* RscTop::SetNumber() +|* RscTop::SetNumber() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){ @@ -480,11 +480,11 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){ /************************************************************************* |* -|* RscTop::SetBool() +|* RscTop::SetBool() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){ @@ -497,11 +497,11 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){ /************************************************************************* |* -|* RscTop::SetConst() +|* RscTop::SetConst() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal ) @@ -514,11 +514,11 @@ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal ) /************************************************************************* |* -|* RscTop::SetNotConst() +|* RscTop::SetNotConst() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ @@ -531,11 +531,11 @@ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ /************************************************************************* |* -|* RscTop::SetString() +|* RscTop::SetString() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ @@ -548,11 +548,11 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ /************************************************************************* |* -|* RscTop::GetNumber() +|* RscTop::GetNumber() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){ @@ -565,11 +565,11 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){ /************************************************************************* |* -|* RscTop::GetBool() +|* RscTop::GetBool() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){ @@ -582,11 +582,11 @@ ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){ /************************************************************************* |* -|* RscTop::GetCont() +|* RscTop::GetCont() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ @@ -599,11 +599,11 @@ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ /************************************************************************* |* -|* RscTop::GetString() +|* RscTop::GetString() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ @@ -616,11 +616,11 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ /************************************************************************* |* -|* RscTop::Create() +|* RscTop::Create() |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.07.91 +|* Beschreibung +|* Ersterstellung MM 17.05.91 +|* Letzte Aenderung MM 17.07.91 |* *************************************************************************/ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRange ) @@ -637,28 +637,28 @@ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRang /************************************************************************* |* -|* RscTop::Destroy() +|* RscTop::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -void RscTop::Destroy( const RSCINST & rInst ){ +void RscTop::Destroy( const RSCINST & rInst ){ if( pSuperClass ) pSuperClass->Destroy( rInst ); } /************************************************************************* |* -|* RscTop::IsConsistent() +|* RscTop::IsConsistent() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsConsistent( const RSCINST & rInst, +BOOL RscTop::IsConsistent( const RSCINST & rInst, RscInconsList * pList ) { if( pSuperClass ) @@ -669,14 +669,14 @@ BOOL RscTop::IsConsistent( const RSCINST & rInst, /************************************************************************* |* -|* RscTop::SetToDefault() +|* RscTop::SetToDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -void RscTop::SetToDefault( const RSCINST & rInst ) +void RscTop::SetToDefault( const RSCINST & rInst ) { if( pSuperClass ) pSuperClass->SetToDefault( rInst ); @@ -684,14 +684,14 @@ void RscTop::SetToDefault( const RSCINST & rInst ) /************************************************************************* |* -|* RscTop::IsDefault() +|* RscTop::IsDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsDefault( const RSCINST & rInst ){ +BOOL RscTop::IsDefault( const RSCINST & rInst ){ if( pSuperClass ) return pSuperClass->IsDefault( rInst ); else @@ -700,14 +700,14 @@ BOOL RscTop::IsDefault( const RSCINST & rInst ){ /************************************************************************* |* -|* RscTop::IsValueDefault() +|* RscTop::IsValueDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -BOOL RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ +BOOL RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pSuperClass ) return pSuperClass->IsValueDefault( rInst, pDef ); else @@ -716,25 +716,25 @@ BOOL RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ /************************************************************************* |* -|* RscTop::SetDefault() +|* RscTop::SetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){ +void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){ if( pSuperClass ) pSuperClass->SetDefault( rInst, nVarId ); } /************************************************************************* |* -|* RscTop::GetDefault() +|* RscTop::GetDefault() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ RSCINST RscTop::GetDefault( Atom nVarId ){ @@ -747,14 +747,14 @@ RSCINST RscTop::GetDefault( Atom nVarId ){ /************************************************************************* |* -|* RscTop::Delete() +|* RscTop::Delete() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, +void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) { if( pSuperClass ) @@ -763,14 +763,14 @@ void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, /************************************************************************* |* -|* RscTop::DeletePos() +|* RscTop::DeletePos() |* -|* Beschreibung -|* Ersterstellung MM 29.10.91 -|* Letzte Aenderung MM 29.10.91 +|* Beschreibung +|* Ersterstellung MM 29.10.91 +|* Letzte Aenderung MM 29.10.91 |* *************************************************************************/ -void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) +void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) { if( pSuperClass ) pSuperClass->DeletePos( rInst, nPos ); @@ -778,11 +778,11 @@ void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) /************************************************************************* |* -|* RscTop::SetRef() +|* RscTop::SetRef() |* -|* Beschreibung -|* Ersterstellung MM 18.09.91 -|* Letzte Aenderung MM 18.09.91 +|* Beschreibung +|* Ersterstellung MM 18.09.91 +|* Letzte Aenderung MM 18.09.91 |* *************************************************************************/ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ @@ -794,11 +794,11 @@ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ /************************************************************************* |* -|* RscTop::WriteHxxHeader() +|* RscTop::WriteHxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, @@ -812,11 +812,11 @@ ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteHxx() +|* RscTop::WriteHxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput, @@ -829,11 +829,11 @@ ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteCxxHeader() +|* RscTop::WriteCxxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, @@ -847,11 +847,11 @@ ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteCxx() +|* RscTop::WriteCxx() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput, @@ -864,11 +864,11 @@ ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteSrcHeader() +|* RscTop::WriteSrcHeader() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, @@ -883,11 +883,11 @@ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteSrc() +|* RscTop::WriteSrc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, @@ -899,11 +899,11 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, /************************************************************************* |* -|* RscTop::WriteRcHeader() +|* RscTop::WriteRcHeader() |* -|* Beschreibung -|* Ersterstellung MM 12.04.91 -|* Letzte Aenderung MM 12.04.91 +|* Beschreibung +|* Ersterstellung MM 12.04.91 +|* Letzte Aenderung MM 12.04.91 |* *************************************************************************/ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, @@ -919,11 +919,11 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscTop::WriteRc() +|* RscTop::WriteRc() |* -|* Beschreibung -|* Ersterstellung MM 08.04.91 -|* Letzte Aenderung MM 08.04.91 +|* Beschreibung +|* Ersterstellung MM 08.04.91 +|* Letzte Aenderung MM 08.04.91 |* *************************************************************************/ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, @@ -938,11 +938,11 @@ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, /************************************************************************* |* -|* RscTop::WriteSyntaxHeader() +|* RscTop::WriteSyntaxHeader() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ) @@ -957,11 +957,11 @@ void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ) /************************************************************************* |* -|* RscTop::WriteSyntax() +|* RscTop::WriteSyntax() |* -|* Beschreibung -|* Ersterstellung MM 29.05.91 -|* Letzte Aenderung MM 29.05.91 +|* Beschreibung +|* Ersterstellung MM 29.05.91 +|* Letzte Aenderung MM 29.05.91 |* *************************************************************************/ void RscTop::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index b0bc9e0ef59d..a1c97e01266d 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_rsc.hxx" /****************************************************************/ -/* Include File */ +/* Include File */ /****************************************************************/ #include <stdlib.h> @@ -72,37 +72,37 @@ #include <rtl/tencinfo.h> #include <rtl/textenc.h> -#include <vector> +#include <vector> using namespace rtl; /*************** F o r w a r d s *****************************************/ -/*************** G l o b a l e V a r i a b l e n **********************/ -ByteString* pStdParType = NULL; -ByteString* pStdPar1 = NULL; -ByteString* pStdPar2 = NULL; -ByteString* pWinParType = NULL; -ByteString* pWinPar1 = NULL; -ByteString* pWinPar2 = NULL; -sal_uInt32 nRefDeep = 10; +/*************** G l o b a l e V a r i a b l e n **********************/ +ByteString* pStdParType = NULL; +ByteString* pStdPar1 = NULL; +ByteString* pStdPar2 = NULL; +ByteString* pWinParType = NULL; +ByteString* pWinPar1 = NULL; +ByteString* pWinPar2 = NULL; +sal_uInt32 nRefDeep = 10; AtomContainer* pHS = NULL; /*************** R s c C m d L i n e ************************************/ /************************************************************************* |* -|* RscCmdLine::Init() +|* RscCmdLine::Init() |* -|* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 +|* Beschreibung Kommandozeile interpretierten +|* Ersterstellung MM 03.05.91 +|* Letzte Aenderung MM 03.05.91 |* *************************************************************************/ void RscCmdLine::Init() { - nCommands = 0; - nByteOrder = RSC_BIGENDIAN; + nCommands = 0; + nByteOrder = RSC_BIGENDIAN; DirEntry aEntry; aPath = ByteString( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); //Immer im Aktuellen Pfad suchen @@ -112,11 +112,11 @@ void RscCmdLine::Init() /************************************************************************* |* -|* RscCmdLine::RscCmdLine() +|* RscCmdLine::RscCmdLine() |* -|* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung Kommandozeile interpretierten +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::RscCmdLine() @@ -126,21 +126,21 @@ RscCmdLine::RscCmdLine() /************************************************************************* |* -|* RscCmdLine::RscCmdLine() +|* RscCmdLine::RscCmdLine() |* -|* Beschreibung Kommandozeile interpretierten -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung Kommandozeile interpretierten +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) { - char * pStr; - char ** ppStr; - RscPtrPtr aCmdLine; // Kommandozeile - ByteString aString; - sal_uInt32 i; - BOOL bOutputSrsIsSet = FALSE; + char * pStr; + char ** ppStr; + RscPtrPtr aCmdLine; // Kommandozeile + ByteString aString; + sal_uInt32 i; + BOOL bOutputSrsIsSet = FALSE; Init(); // Defaults setzen @@ -148,7 +148,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) if( pStr ) pEH->FatalError( ERR_OPENFILE, RscId(), pStr ); - /* check the inputted switches */ + /* check the inputted switches */ ppStr = (char **)aCmdLine.GetBlock(); ppStr++; i = 1; @@ -196,10 +196,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) ; if( *pEqual ) { - const ByteString aSPath( pEqual + 1 ); - DirEntry aSDir( String( aSPath, RTL_TEXTENCODING_ASCII_US ) ); - - m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), + const ByteString aSPath( pEqual + 1 ); + DirEntry aSDir( String( aSPath, RTL_TEXTENCODING_ASCII_US ) ); + + m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), ByteString( aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ) ); } } @@ -239,14 +239,14 @@ 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 ) ); - + 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 ); } else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) @@ -336,16 +336,16 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) /************************************************************************* |* -|* RscCmdLine::~RscCmdLine() +|* RscCmdLine::~RscCmdLine() |* -|* Beschreibung dtor -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung dtor +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscCmdLine::~RscCmdLine() { - ByteString *pString; + ByteString *pString; while( NULL != (pString = aInputList.Remove( (ULONG)0 )) ) delete pString; @@ -355,7 +355,7 @@ RscCmdLine::~RscCmdLine() /************************************************************************* |* -|* RscCmdLine::substitutePaths() +|* RscCmdLine::substitutePaths() |* *************************************************************************/ @@ -391,21 +391,21 @@ OString RscCmdLine::substitutePaths( const OString& rIn ) /*************** R s c C o m p i l e r **********************************/ /****************************************************************/ -/* */ -/* RscCompiler :: RscCompiler(int argc, char **argv) */ -/* */ -/* Parameters : argc - number of parameters on command line */ -/* argv - arry of pointers to input parameters */ -/* */ -/* Description : main calling routine. Calls functions to */ -/* check and assign the input parameters. It then builds the */ -/* command line to call the Glockenspiel preprocessor */ +/* */ +/* RscCompiler :: RscCompiler(int argc, char **argv) */ +/* */ +/* Parameters : argc - number of parameters on command line */ +/* argv - arry of pointers to input parameters */ +/* */ +/* Description : main calling routine. Calls functions to */ +/* check and assign the input parameters. It then builds the */ +/* command line to call the Glockenspiel preprocessor */ /****************************************************************/ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont ) { - fListing = NULL; - fExitFile = NULL; + fListing = NULL; + fExitFile = NULL; //Kommandozeile setzen, TypContainer setzen pCL = pLine; @@ -421,11 +421,11 @@ RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont ) /************************************************************************* |* -|* RscCompiler :: RscCompiler() +|* RscCompiler :: RscCompiler() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 +|* Beschreibung +|* Ersterstellung MM 07.02.91 +|* Letzte Aenderung MM 07.02.91 |* *************************************************************************/ RscCompiler::~RscCompiler() @@ -460,18 +460,18 @@ RscCompiler::~RscCompiler() /************************************************************************* |* -|* RscCompiler::Start() +|* RscCompiler::Start() |* -|* Beschreibung Datei in Kommandozeile aendern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* 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; + ERRTYPE aError; + ByteString* pString; + RscFile* pFName; if( PRINTSYNTAX_FLAG & pCL->nCommands ) { @@ -544,11 +544,11 @@ printf( "khg\n" ); } /************************************************************************* |* -|* RscCmdLine::EndCompile() +|* RscCmdLine::EndCompile() |* -|* Beschreibung Datei in Kommandozeile aendern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung Datei in Kommandozeile aendern +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ void RscCompiler::EndCompile() @@ -560,11 +560,11 @@ void RscCompiler::EndCompile() pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputSrs.GetBuffer() ); // Zieldatei loeschen + unlink( pCL->aOutputSrs.GetBuffer() ); // Zieldatei loeschen if( !(pCL->nCommands & NOSYNTAX_FLAG) ) { - FILE * foutput; - RscFile * pFN; + FILE * foutput; + RscFile * pFN; if( NULL == (foutput = fopen( pCL->aOutputSrs.GetBuffer(), "w" )) ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputSrs.GetBuffer() ); @@ -594,7 +594,7 @@ void RscCompiler::EndCompile() pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputHxx.GetBuffer() ); // Zieldatei loeschen + unlink( pCL->aOutputHxx.GetBuffer() ); // Zieldatei loeschen Append( pCL->aOutputHxx, aTmpOutputHxx ); unlink( aTmpOutputHxx.GetBuffer() );// TempDatei loeschen aTmpOutputHxx = ByteString(); @@ -607,7 +607,7 @@ void RscCompiler::EndCompile() pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputCxx.GetBuffer() ); // Zieldatei loeschen + unlink( pCL->aOutputCxx.GetBuffer() ); // Zieldatei loeschen Append( pCL->aOutputCxx, aTmpOutputCxx ); unlink( aTmpOutputCxx.GetBuffer() );// TempDatei loeschen aTmpOutputCxx = ByteString(); @@ -620,7 +620,7 @@ void RscCompiler::EndCompile() pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputRcCtor.GetBuffer() ); // Zieldatei loeschen + unlink( pCL->aOutputRcCtor.GetBuffer() ); // Zieldatei loeschen Append( pCL->aOutputRcCtor, aTmpOutputRcCtor ); unlink( aTmpOutputRcCtor.GetBuffer() );// TempDatei loeschen aTmpOutputRcCtor = ByteString(); @@ -629,7 +629,7 @@ void RscCompiler::EndCompile() if( aTmpOutputSrc.Len() ) { // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputSrc.GetBuffer() ); // Zieldatei loeschen + unlink( pCL->aOutputSrc.GetBuffer() ); // Zieldatei loeschen Append( pCL->aOutputSrc, aTmpOutputSrc ); unlink( aTmpOutputSrc.GetBuffer() );// TempDatei loeschen aTmpOutputSrc = ByteString(); @@ -650,18 +650,18 @@ void RscCompiler::EndCompile() /************************************************************************* |* -|* RscCompiler::IncludeParser() +|* RscCompiler::IncludeParser() |* -|* Beschreibung -|* Ersterstellung MM 21.06.91 -|* Letzte Aenderung MM 21.06.91 +|* Beschreibung +|* Ersterstellung MM 21.06.91 +|* Letzte Aenderung MM 21.06.91 |* *************************************************************************/ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) { - FILE * finput; - RscFile * pFName; - ERRTYPE aError; + FILE * finput; + RscFile * pFName; + ERRTYPE aError; pFName = pTC->aFileTab.Get( lFileKey ); if( !pFName ) @@ -677,10 +677,10 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) } else { - RscFile * pFNTmp; - ByteString aPathName; - RscDepend * pDep; - RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); + RscFile * pFNTmp; + ByteString aPathName; + RscDepend * pDep; + RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); pFName->bScanned = TRUE; ::IncludeParser( &aFileInst ); @@ -718,20 +718,20 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) /************************************************************************* |* -|* RscCompiler :: ParseOneFile() +|* RscCompiler :: ParseOneFile() |* -|* Beschreibung -|* Ersterstellung MM 26.06.91 -|* Letzte Aenderung MM 26.06.91 +|* Beschreibung +|* Ersterstellung MM 26.06.91 +|* Letzte Aenderung MM 26.06.91 |* *************************************************************************/ -ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, +ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ) { - FILE * finput = NULL; - ERRTYPE aError; - RscFile * pFName; + FILE * finput = NULL; + ERRTYPE aError; + RscFile * pFName; pFName = pTC->aFileTab.Get( lFileKey ); if( !pFName ) @@ -754,20 +754,20 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, pFName->bLoaded = FALSE; //bei Fehler nicht geladenen else { - String aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US ); - DirEntry aTmpPath( aTmpName ), aSrsPath( String( pFName->aPathName.GetBuffer(), RTL_TEXTENCODING_ASCII_US ) ); - + String aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US ); + DirEntry aTmpPath( aTmpName ), aSrsPath( String( pFName->aPathName.GetBuffer(), RTL_TEXTENCODING_ASCII_US ) ); + aTmpPath.ToAbs(); aSrsPath.ToAbs(); - + if( pContext && pOutputFile ) PreprocessSrsFile( *pOutputFile, *pContext, aSrsPath, aTmpPath ); else aSrsPath.CopyTo( aTmpPath, FSYS_ACTION_COPYFILE ); - + ByteString aParseFile( aTmpPath.GetFull(), RTL_TEXTENCODING_ASCII_US ); finput = fopen( aParseFile.GetBuffer(), "r" ); - + if( !finput ) { pTC->pEH->Error( ERR_OPENFILE, NULL, RscId(), pFName->aPathName.GetBuffer() ); @@ -776,18 +776,18 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, else { RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); - + pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose ); pTC->pEH->StdOut( aParseFile.GetBuffer(), RscVerbosityVerbose ); pTC->pEH->StdOut( " ", RscVerbosityVerbose ); - + aError = ::parser( &aFileInst ); if( aError.IsError() ) pTC->Delete( lFileKey );//Resourceobjekte loeschen pTC->pEH->StdOut( "\n", RscVerbosityVerbose ); fclose( finput ); }; - + aTmpPath.Kill(); }; }; @@ -797,11 +797,11 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, /************************************************************************* |* -|* RscCompiler :: Link() +|* RscCompiler :: Link() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 +|* Beschreibung +|* Ersterstellung MM 07.02.91 +|* Letzte Aenderung MM 07.02.91 |* *************************************************************************/ @@ -816,9 +816,9 @@ static OString do_prefix( const char* pPrefix, const OUString& rFile ) ERRTYPE RscCompiler::Link() { - FILE * foutput; - ERRTYPE aError; - RscFile* pFName; + FILE * foutput; + ERRTYPE aError; + RscFile* pFName; #ifdef UNX #define PATHSEP '/' @@ -829,7 +829,7 @@ ERRTYPE RscCompiler::Link() if( !(pCL->nCommands & NOLINK_FLAG) ) { ::std::list<RscCmdLine::OutputFile>::const_iterator it; - + for( it = pCL->m_aOutputFiles.begin(); it != pCL->m_aOutputFiles.end(); ++it ) { // cleanup nodes @@ -842,7 +842,7 @@ ERRTYPE RscCompiler::Link() pFName->bLoaded = FALSE; } } - + // rc-Datei schreiben ByteString aDir( it->aOutputRc ); aDir.SetToken( aDir.GetTokenCount( PATHSEP )-1, PATHSEP, ByteString() ); @@ -858,7 +858,7 @@ ERRTYPE RscCompiler::Link() // work dir for absolute Urls OUString aCWD, aTmpUrl; osl_getProcessWorkingDir( &aCWD.pData ); - + // get two temp file urls OString aRcTmp, aSysListTmp, aSysList; OUString aSysPath, aUrlDir; @@ -891,7 +891,7 @@ ERRTYPE RscCompiler::Link() if( osl_getAbsoluteFileURL( aCWD.pData, aTmpUrl.pData, &aUrlDir.pData ) != osl_File_E_None ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aTmpUrl ) ); } - + if( osl_getSystemPathFromFileURL( aUrlDir.pData, &aSysPath.pData ) != osl_File_E_None ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aUrlDir ) ); @@ -944,8 +944,8 @@ ERRTYPE RscCompiler::Link() #endif pTC->SetSysSearchPath( aSysSearchPath ); - WriteRcContext aContext; - + WriteRcContext aContext; + aContext.fOutput = foutput; aContext.aOutputRc = it->aOutputRc; aContext.aOutputSysList = aSysListTmp; @@ -955,11 +955,11 @@ ERRTYPE RscCompiler::Link() if( aContext.aOutputSysList.getLength() ) { FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" ); - + if( !pSysListFile ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aContext.aOutputSysList.getStr() ); else - fclose( pSysListFile ); + fclose( pSysListFile ); } // parse files for specific language @@ -971,9 +971,9 @@ ERRTYPE RscCompiler::Link() pTC->aFileTab.Seek( pFName ); } }; - + aError = pTC->WriteRc( aContext ); - + fclose( foutput ); fExitFile = NULL; unlink( it->aOutputRc.GetBuffer() ); @@ -987,11 +987,11 @@ ERRTYPE RscCompiler::Link() } else { -#ifdef UNX +#ifdef UNX chmod( it->aOutputRc.GetBuffer(), S_IRWXU | S_IRWXG | S_IROTH ); #endif } - + unlink( aSysList.getStr() ); if( rename( aSysListTmp.getStr(), aSysList.getStr() ) ) { @@ -1003,7 +1003,7 @@ ERRTYPE RscCompiler::Link() } else { -#ifdef UNX +#ifdef UNX chmod( aSysList.getStr(), S_IRWXU | S_IRWXG | S_IROTH ); #endif } @@ -1096,12 +1096,12 @@ ERRTYPE RscCompiler::Link() } /********************************************************************/ -/* */ -/* Function : Append( ) */ -/* */ -/* Parameters : psw - pointer to a preprocessor switch */ -/* */ -/* Description : appends text files */ +/* */ +/* Function : Append( ) */ +/* */ +/* Parameters : psw - pointer to a preprocessor switch */ +/* */ +/* Description : appends text files */ /********************************************************************/ void RscCompiler::Append( const ByteString& rOutputSrs, const ByteString& rTmpFile ) @@ -1116,11 +1116,11 @@ void RscCompiler::Append( const ByteString& rOutputSrs, } /********************************************************************/ -/* */ -/* Function : GetTmpFileName() */ -/* */ -/* Description : Packt einen Dateinamen in Tmp-Dateiliste. */ -/* */ +/* */ +/* Function : GetTmpFileName() */ +/* */ +/* Description : Packt einen Dateinamen in Tmp-Dateiliste. */ +/* */ /********************************************************************/ ByteString RscCompiler::GetTmpFileName() { @@ -1132,17 +1132,17 @@ ByteString RscCompiler::GetTmpFileName() } /********************************************************************/ -/* */ -/* Function : BOOL openinput() */ -/* */ -/* Description : Check to see if the input file exists and can */ -/* be opened for reading. */ +/* */ +/* Function : BOOL openinput() */ +/* */ +/* Description : Check to see if the input file exists and can */ +/* be opened for reading. */ /********************************************************************/ void RscCompiler::OpenInput( const ByteString& rInput ) { FILE *fp; - /* try to open the input file */ + /* try to open the input file */ if( NULL == (fp = fopen( rInput.GetBuffer(), "r"))) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), rInput.GetBuffer() ); @@ -1151,22 +1151,22 @@ void RscCompiler::OpenInput( const ByteString& rInput ) /************************************************************************* |* -|* GetImageFilePath() +|* GetImageFilePath() |* |*************************************************************************/ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, - const ByteString& rBaseFileName, + const ByteString& rBaseFileName, ByteString& rImagePath, FILE* pSysListFile ) { - ::std::list< ByteString > aFileNames; - bool bFound = false; - - ByteString aFileName( rBaseFileName ); + ::std::list< ByteString > aFileNames; + bool bFound = false; + + ByteString aFileName( rBaseFileName ); aFileNames.push_back( aFileName += ".png" ); - + aFileName = rBaseFileName; aFileNames.push_back( aFileName += ".bmp" ); @@ -1175,26 +1175,26 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, while( ( aFileIter != aFileNames.end() ) && !bFound ) { ::std::list< ByteString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() ); - + while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound ) { - const DirEntry aPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) ); - DirEntry aRelPath( aPath ); - DirEntry aAbsPath( aRelPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ); - + const DirEntry aPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) ); + DirEntry aRelPath( aPath ); + DirEntry aAbsPath( aRelPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ); + aAbsPath.ToAbs(); const FileStat aFS( aAbsPath.GetFull() ); - + #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Searching image: %s\n", ByteString( aRelPath.GetFull(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() ); #endif if( aFS.IsKind( FSYS_KIND_FILE ) ) { - std::list< std::pair< OString, OString > >::const_iterator aReplIter( rContext.pCmdLine->m_aReplacements.begin() ); - String aStr( aRelPath.GetFull() ); - OString aRelPathStr( aStr.GetBuffer(), aStr.Len(), RTL_TEXTENCODING_ASCII_US ); - + std::list< std::pair< OString, OString > >::const_iterator aReplIter( rContext.pCmdLine->m_aReplacements.begin() ); + String aStr( aRelPath.GetFull() ); + OString aRelPathStr( aStr.GetBuffer(), aStr.Len(), RTL_TEXTENCODING_ASCII_US ); + while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound ) { ByteString aSearch( aReplIter->second ); @@ -1203,43 +1203,43 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, aSearchIn.ToLowerAscii(); if( aSearchIn.Search( aSearch ) == 0 ) { - sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength(); - const sal_Char* pChars = aRelPathStr.getStr(); - + sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength(); + const sal_Char* pChars = aRelPathStr.getStr(); + while( ( nCopyPos < nLength ) && ( pChars[ nCopyPos ] == '/' || pChars[ nCopyPos ] == '\\' || pChars[ nCopyPos ] == ':' ) ) { ++nCopyPos; } - + if( nCopyPos < nLength ) rImagePath = aRelPathStr.copy( nCopyPos ).replace( '\\', '/' ); - + bFound = true; } - + ++aReplIter; } - + if( bFound && pSysListFile ) { - DirEntry aSysPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) ); - String aSysPathFull( ( aSysPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ).GetFull() ); - OString aSysPathStr( aSysPathFull.GetBuffer(), aSysPathFull.Len(), RTL_TEXTENCODING_ASCII_US ); - + DirEntry aSysPath( String( *aDirIter, RTL_TEXTENCODING_ASCII_US ) ); + String aSysPathFull( ( aSysPath += DirEntry( String( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ).GetFull() ); + OString aSysPathStr( aSysPathFull.GetBuffer(), aSysPathFull.Len(), RTL_TEXTENCODING_ASCII_US ); + fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPathStr ).getStr() ); } - + #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "ImagePath to add: %s\n", rImagePath.GetBuffer() ); #endif } - + ++aDirIter; } - + ++aFileIter; } - + return bFound; } @@ -1247,60 +1247,60 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, - const DirEntry& rSrsInPath, + const DirEntry& rSrsInPath, const DirEntry& rSrsOutPath ) { - SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ ); - SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC ); + SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ ); + 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; + FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL; + bool bRet = true; if( !aIStm.GetError() && !aOStm.GetError() ) { ByteString aLine, aFilePath; - + while( aIStm.ReadLine( aLine ) ) { if( ( aLine.GetTokenCount( '=' ) == 2 ) && ( aLine.GetToken( 0, '=' ).Search( "File" ) != STRING_NOTFOUND ) ) { ByteString aBaseFileName( aLine.GetToken( 1, '"' ).GetToken( 0, '.' ) ); - + if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) ( ( aLine = "File = \"" ) += aFilePath ) += "\";"; else aMissingImages.push_back( aBaseFileName ); - + aOStm.WriteLine( aLine ); } else if( aLine.Search( "ImageList" ) != STRING_NOTFOUND ) { ::std::vector< ::std::pair< ByteString, sal_Int32 > > aEntryVector; - + aOStm.WriteLine( aLine ); - + if( aLine.Search( ';' ) == STRING_NOTFOUND ) { const sal_uInt32 nImgListStartPos = aIStm.Tell(); - + do { if( !aIStm.ReadLine( aLine ) ) break; } while( aLine.Search( "Prefix" ) == STRING_NOTFOUND ); - + const ByteString aPrefix( aLine.GetToken( 1, '"' ) ); aIStm.Seek( nImgListStartPos ); - + do { if (!aIStm.ReadLine( aLine ) ) break; } while( aLine.Search( "IdList" ) == STRING_NOTFOUND ); - + // scan all ids and collect images while( aLine.Search( '}' ) == STRING_NOTFOUND ) { @@ -1313,25 +1313,25 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if( aLine.IsNumericAscii() ) { - ByteString aBaseFileName( aPrefix ); - sal_Int32 nNumber = atoi( aLine.GetBuffer() ); + ByteString aBaseFileName( aPrefix ); + sal_Int32 nNumber = atoi( aLine.GetBuffer() ); if( nNumber < 10000 ) aBaseFileName += ByteString::CreateFromInt32( 0 ); - + if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) ) aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); else aMissingImages.push_back( aBaseFileName ); } } - + const sal_uInt32 nImgListEndPos = aIStm.Tell(); aIStm.Seek( nImgListStartPos ); while( aIStm.Tell() < nImgListEndPos ) { aIStm.ReadLine( aLine ); - + if( aLine.Search( "IdList" ) != STRING_NOTFOUND ) { while( aLine.Search( '}' ) == STRING_NOTFOUND ) @@ -1340,21 +1340,21 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, else aOStm.WriteLine( aLine ); } - + aOStm.WriteLine( "FileList = {" ); - + for( sal_uInt32 i = 0; i < aEntryVector.size(); ++i ) { ByteString aEntryString( "< \"" ); - + aEntryString += aEntryVector[ i ].first; aEntryString += "\"; "; aEntryString += ByteString::CreateFromInt32( aEntryVector[ i ].second ); aEntryString += "; >;"; - + aOStm.WriteLine( aEntryString ); } - + aOStm.WriteLine( "};" ); } else @@ -1366,22 +1366,22 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } else bRet = false; - + if( aMissingImages.size() > 0 ) { ByteString aImagesStr; - + for( sal_uInt32 i = 0; i < aMissingImages.size(); ++i ) { if( i ) aImagesStr += ' '; - + aImagesStr += aMissingImages[ i ]; } - + pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.GetBuffer() ); } - + if( pSysListFile ) fclose( pSysListFile ); } diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 8ec451ab9d3d..d25e83671a93 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ extern FILE *pCppOut; /* BP */ #if OSL_DEBUG_LEVEL > 1 extern FILE *pDefOut; /* ER */ #ifdef EVALDEFS -#define NEVALBUF 2048 +#define NEVALBUF 2048 #endif #endif /* limit for reading commandfiles */ -#define PARALIMIT 100 +#define PARALIMIT 100 #ifndef EOS /* @@ -62,20 +62,20 @@ extern FILE *pDefOut; /* ER */ #define TOK_SEP 0x1E /* Token concatenation delim. */ #define COM_SEP 0x1F /* Magic comment separator */ -#ifdef EBCDIC -#define HT 0x05 /* horizontal tab */ -#define NL 0x15 /* new line */ -#define CR 0x0D /* carriage return */ -#define DEL 0x07 +#ifdef EBCDIC +#define HT 0x05 /* horizontal tab */ +#define NL 0x15 /* new line */ +#define CR 0x0D /* carriage return */ +#define DEL 0x07 #else -#define HT 0x09 /* horizontal tab */ -#define NL 0x0A /* new line */ -#define CR 0x0D /* carriage return */ -#define DEL 0x7F +#define HT 0x09 /* horizontal tab */ +#define NL 0x0A /* new line */ +#define CR 0x0D /* carriage return */ +#define DEL 0x7F #endif -#ifdef SOLAR +#ifdef SOLAR #define MAC_PARM 0x01 /* Macro formals start here */ #else /* @@ -85,7 +85,7 @@ extern FILE *pDefOut; /* ER */ * value is reserved for string substitution. */ -#define MAC_PARM DEL /* Macro formals start here */ +#define MAC_PARM DEL /* Macro formals start here */ #if PAR_MAC >= 33 assertion fails -- PAR_MAC is not less than 33 #endif @@ -278,11 +278,11 @@ extern char *workp; /* Free space in work */ #if OSL_DEBUG_LEVEL > 1 extern int debug; /* Debug level */ /* ER dump & evaluate #define's */ -extern int bDumpDefs; /* TRUE if #define's dump req. */ -extern int bIsInEval; /* TRUE if #define dumping now */ +extern int bDumpDefs; /* TRUE if #define's dump req. */ +extern int bIsInEval; /* TRUE if #define dumping now */ #ifdef EVALDEFS -extern char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ -extern int nEvalOff; /* offset to free buffer pos */ +extern char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ +extern int nEvalOff; /* offset to free buffer pos */ #endif #endif extern int keepcomments; /* Don't remove comments if set */ diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index d02467a939b9..dce39fdbb0f1 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ FILE *pCppOut = NULL; FILE *pCppIn = NULL; #if OSL_DEBUG_LEVEL > 1 -FILE *pDefOut = NULL; /* ER evtl. #define's dump */ +FILE *pDefOut = NULL; /* ER evtl. #define's dump */ #endif #ifdef B200 @@ -70,9 +70,9 @@ FILEINFO *infile = NULL; /* Current input file */ int debug; /* TRUE if debugging now */ int bDumpDefs; /* TRUE if #define's dump req. */ #ifdef EVALDEFS -int bIsInEval; /* TRUE if #define eval now */ -char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ -int nEvalOff = 0; /* offset to free buffer pos */ +int bIsInEval; /* TRUE if #define eval now */ +char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ +int nEvalOff = 0; /* offset to free buffer pos */ #endif #endif /* @@ -349,7 +349,7 @@ nRunde++; default: exit(IO_ERROR); /* Can't happen */ } -/* if ( pfargv ) +/* if ( pfargv ) { for ( j=0;j++;j < PARALIMIT ) { diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c index ccc49a37ba8f..41aaa28366b8 100644 --- a/rsc/source/rscpp/cpp2.c +++ b/rsc/source/rscpp/cpp2.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 0eec69a50ba3..f81be48ab0f1 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c index 5a17a101cf0c..0f77a1900d02 100644 --- a/rsc/source/rscpp/cpp4.c +++ b/rsc/source/rscpp/cpp4.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index afe5a2fe7d3c..9b4484fbcc9c 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,16 +26,16 @@ * ************************************************************************/ -#include <stdio.h> -#include <ctype.h> -#include "cppdef.h" -#include "cpp.h" +#include <stdio.h> +#include <ctype.h> +#include "cppdef.h" +#include "cpp.h" /* * Evaluate an #if expression. */ -static char *opname[] = { /* For debug and error messages */ +static char *opname[] = { /* For debug and error messages */ "end of expression", "val", "id", "+", "-", "*", "/", "%", "<<", ">>", "&", "|", "^", @@ -47,133 +47,133 @@ static char *opname[] = { /* For debug and error messages */ /* * opdope[] has the operator precedence: * Bits - * 7 Unused (so the value is always positive) - * 6-2 Precedence (000x .. 017x) - * 1-0 Binary op. flags: - * 01 The binop flag should be set/cleared when this op is seen. - * 10 The new value of the binop flag. + * 7 Unused (so the value is always positive) + * 6-2 Precedence (000x .. 017x) + * 1-0 Binary op. flags: + * 01 The binop flag should be set/cleared when this op is seen. + * 10 The new value of the binop flag. * Note: Expected, New binop - * constant 0 1 Binop, end, or ) should follow constants - * End of line 1 0 End may not be preceeded by an operator - * binary 1 0 Binary op follows a value, value follows. - * unary 0 0 Unary op doesn't follow a value, value follows - * ( 0 0 Doesn't follow value, value or unop follows - * ) 1 1 Follows value. Op follows. + * constant 0 1 Binop, end, or ) should follow constants + * End of line 1 0 End may not be preceeded by an operator + * binary 1 0 Binary op follows a value, value follows. + * unary 0 0 Unary op doesn't follow a value, value follows + * ( 0 0 Doesn't follow value, value or unop follows + * ) 1 1 Follows value. Op follows. */ -static char opdope[OP_MAX] = { - 0001, /* End of expression */ - 0002, /* Digit */ - 0000, /* Letter (identifier) */ - 0141, 0141, 0151, 0151, 0151, /* ADD, SUB, MUL, DIV, MOD */ - 0131, 0131, 0101, 0071, 0071, /* ASL, ASR, AND, OR, XOR */ - 0111, 0111, 0121, 0121, 0121, 0121, /* EQ, NE, LT, LE, GE, GT */ - 0061, 0051, 0041, 0041, 0031, /* ANA, ORO, QUE, COL, CMA */ +static char opdope[OP_MAX] = { + 0001, /* End of expression */ + 0002, /* Digit */ + 0000, /* Letter (identifier) */ + 0141, 0141, 0151, 0151, 0151, /* ADD, SUB, MUL, DIV, MOD */ + 0131, 0131, 0101, 0071, 0071, /* ASL, ASR, AND, OR, XOR */ + 0111, 0111, 0121, 0121, 0121, 0121, /* EQ, NE, LT, LE, GE, GT */ + 0061, 0051, 0041, 0041, 0031, /* ANA, ORO, QUE, COL, CMA */ /* * Unary op's follow */ - 0160, 0160, 0160, 0160, /* NEG, PLU, COM, NOT */ - 0170, 0013, 0023, /* LPA, RPA, END */ + 0160, 0160, 0160, 0160, /* NEG, PLU, COM, NOT */ + 0170, 0013, 0023, /* LPA, RPA, END */ }; /* * OP_QUE and OP_RPA have alternate precedences: */ -#define OP_RPA_PREC 0013 -#define OP_QUE_PREC 0034 +#define OP_RPA_PREC 0013 +#define OP_QUE_PREC 0034 /* * S_ANDOR and S_QUEST signal "short-circuit" boolean evaluation, so that - * #if FOO != 0 && 10 / FOO ... + * #if FOO != 0 && 10 / FOO ... * doesn't generate an error message. They are stored in optab.skip. */ -#define S_ANDOR 2 -#define S_QUEST 1 +#define S_ANDOR 2 +#define S_QUEST 1 typedef struct optab { - char op; /* Operator */ - char prec; /* Its precedence */ - char skip; /* Short-circuit: TRUE to skip */ + char op; /* Operator */ + char prec; /* Its precedence */ + char skip; /* Short-circuit: TRUE to skip */ } OPTAB; -static int evalue; /* Current value from evallex() */ +static int evalue; /* Current value from evallex() */ -#ifdef nomacargs +#ifdef nomacargs FILE_LOCAL int isbinary(op) -register int op; +register int op; { return (op >= FIRST_BINOP && op <= LAST_BINOP); } FILE_LOCAL int isunary(op) -register int op; +register int op; { return (op >= FIRST_UNOP && op <= LAST_UNOP); } #else -#define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) -#define isunary(op) (op >= FIRST_UNOP && op <= LAST_UNOP) +#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. */ -#ifndef S_CHAR -#define S_CHAR (sizeof (char)) +#ifndef S_CHAR +#define S_CHAR (sizeof (char)) #endif -#ifndef S_SINT -#define S_SINT (sizeof (short int)) +#ifndef S_SINT +#define S_SINT (sizeof (short int)) #endif -#ifndef S_INT -#define S_INT (sizeof (int)) +#ifndef S_INT +#define S_INT (sizeof (int)) #endif -#ifndef S_LINT -#define S_LINT (sizeof (long int)) +#ifndef S_LINT +#define S_LINT (sizeof (long int)) #endif -#ifndef S_FLOAT -#define S_FLOAT (sizeof (float)) +#ifndef S_FLOAT +#define S_FLOAT (sizeof (float)) #endif -#ifndef S_DOUBLE -#define S_DOUBLE (sizeof (double)) +#ifndef S_DOUBLE +#define S_DOUBLE (sizeof (double)) #endif -#ifndef S_PCHAR -#define S_PCHAR (sizeof (char *)) +#ifndef S_PCHAR +#define S_PCHAR (sizeof (char *)) #endif -#ifndef S_PSINT -#define S_PSINT (sizeof (short int *)) +#ifndef S_PSINT +#define S_PSINT (sizeof (short int *)) #endif -#ifndef S_PINT -#define S_PINT (sizeof (int *)) +#ifndef S_PINT +#define S_PINT (sizeof (int *)) #endif -#ifndef S_PLINT -#define S_PLINT (sizeof (long int *)) +#ifndef S_PLINT +#define S_PLINT (sizeof (long int *)) #endif -#ifndef S_PFLOAT -#define S_PFLOAT (sizeof (float *)) +#ifndef S_PFLOAT +#define S_PFLOAT (sizeof (float *)) #endif -#ifndef S_PDOUBLE -#define S_PDOUBLE (sizeof (double *)) +#ifndef S_PDOUBLE +#define S_PDOUBLE (sizeof (double *)) #endif -#ifndef S_PFPTR -#define S_PFPTR (sizeof (int (*)())) +#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 */ + short type; /* This is the bit if */ + char *name; /* this is the token word */ } TYPES; static TYPES basic_types[] = { - { T_CHAR, "char", }, - { T_INT, "int", }, - { T_FLOAT, "float", }, - { T_DOUBLE, "double", }, - { T_SHORT, "short", }, - { T_LONG, "long", }, - { T_SIGNED, "signed", }, - { T_UNSIGNED, "unsigned", }, - { 0, NULL, }, /* Signal end */ + { T_CHAR, "char", }, + { T_INT, "int", }, + { T_FLOAT, "float", }, + { T_DOUBLE, "double", }, + { T_SHORT, "short", }, + { T_LONG, "long", }, + { T_SIGNED, "signed", }, + { T_UNSIGNED, "unsigned", }, + { 0, NULL, }, /* Signal end */ }; /* @@ -184,24 +184,24 @@ static short test_table[] = { T_FLOAT | T_DOUBLE | T_CHAR | T_INT, T_FLOAT | T_DOUBLE | T_SIGNED | T_UNSIGNED, T_LONG | T_SHORT | T_CHAR, - 0 /* end marker */ + 0 /* end marker */ }; /* * The order of this table is important -- it is also referenced by * the command line processor to allow run-time overriding of the * built-in size values. The order must not be changed: - * char, short, int, long, float, double (func pointer) + * char, short, int, long, float, double (func pointer) */ SIZES size_table[] = { - { T_CHAR, S_CHAR, S_PCHAR }, /* char */ - { T_SHORT, S_SINT, S_PSINT }, /* short int */ - { T_INT, S_INT, S_PINT }, /* int */ - { T_LONG, S_LINT, S_PLINT }, /* long */ - { T_FLOAT, S_FLOAT, S_PFLOAT }, /* float */ - { T_DOUBLE, S_DOUBLE, S_PDOUBLE }, /* double */ - { T_FPTR, 0, S_PFPTR }, /* int (*()) */ - { 0, 0, 0 }, /* End of table */ + { T_CHAR, S_CHAR, S_PCHAR }, /* char */ + { T_SHORT, S_SINT, S_PSINT }, /* short int */ + { T_INT, S_INT, S_PINT }, /* int */ + { T_LONG, S_LINT, S_PLINT }, /* long */ + { T_FLOAT, S_FLOAT, S_PFLOAT }, /* float */ + { T_DOUBLE, S_DOUBLE, S_PDOUBLE }, /* double */ + { T_FPTR, 0, S_PFPTR }, /* int (*()) */ + { 0, 0, 0 }, /* End of table */ }; @@ -218,49 +218,49 @@ eval() * Evaluate an expression. Straight-forward operator precedence. * This is called from control() on encountering an #if statement. * It calls the following routines: - * evallex Lexical analyser -- returns the type and value of - * the next input token. - * evaleval Evaluate the current operator, given the values on - * the value stack. Returns a pointer to the (new) - * value stack. + * evallex Lexical analyser -- returns the type and value of + * the next input token. + * evaleval Evaluate the current operator, given the values on + * the value stack. Returns a pointer to the (new) + * value stack. * For compatiblity with older cpp's, this return returns 1 (TRUE) * if a syntax error is detected. */ { - register int op; /* Current operator */ - register int *valp; /* -> value vector */ - register OPTAB *opp; /* Operator stack */ - int prec; /* Op precedence */ - int binop; /* Set if binary op. needed */ - int op1; /* Operand from stack */ - int skip; /* For short-circuit testing */ - int value[NEXP]; /* Value stack */ - OPTAB opstack[NEXP]; /* Operand stack */ + register int op; /* Current operator */ + register int *valp; /* -> value vector */ + register OPTAB *opp; /* Operator stack */ + int prec; /* Op precedence */ + int binop; /* Set if binary op. needed */ + int op1; /* Operand from stack */ + 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 */ - opp->prec = opdope[OP_END]; /* And its precedence */ - opp->skip = 0; /* Not skipping now */ + opp->op = OP_END; /* Mark bottom of stack */ + opp->prec = opdope[OP_END]; /* And its precedence */ + opp->skip = 0; /* Not skipping now */ binop = 0; -again: ; -#ifdef DEBUG_EVAL +again: ; +#ifdef DEBUG_EVAL fprintf( pCppOut, "In #if at again: skip = %d, binop = %d, line is: %s", opp->skip, binop, infile->bptr); #endif if ((op = evallex(opp->skip)) == OP_SUB && binop == 0) - op = OP_NEG; /* Unary minus */ + op = OP_NEG; /* Unary minus */ else if (op == OP_ADD && binop == 0) - op = OP_PLU; /* Unary plus */ + op = OP_PLU; /* Unary plus */ else if (op == OP_FAIL) - return (1); /* Error in evallex */ -#ifdef DEBUG_EVAL + return (1); /* Error in evallex */ +#ifdef DEBUG_EVAL fprintf( pCppOut, "op = %s, opdope = %03o, binop = %d, skip = %d\n", opname[op], opdope[op], binop, opp->skip); #endif - if (op == DIG) { /* Value? */ + if (op == DIG) { /* Value? */ if (binop != 0) { cerror("misplaced constant in #if", NULLST); return (1); @@ -270,7 +270,7 @@ again: ; return (1); } else { -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "pushing %d onto value stack[%d]\n", evalue, valp - value); #endif @@ -290,7 +290,7 @@ again: ; } binop = (prec & 2) >> 1; for (;;) { -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "op %s, prec %d., stacked op %s, prec %d, skip %d\n", opname[op], prec, opname[opp->op], opp->prec, opp->skip); #endif @@ -299,7 +299,7 @@ again: ; prec = OP_RPA_PREC; else if (op == OP_QUE) prec = OP_QUE_PREC; - op1 = opp->skip; /* Save skip for test */ + op1 = opp->skip; /* Save skip for test */ /* * Push operator onto op. stack. */ @@ -311,24 +311,24 @@ again: ; } opp->op = (char)op; opp->prec = (char)prec; - skip = (valp[-1] != 0); /* Short-circuit tester */ + skip = (valp[-1] != 0); /* Short-circuit tester */ /* * Do the short-circuit stuff here. Short-circuiting * stops automagically when operators are evaluated. */ if ((op == OP_ANA && !skip) || (op == OP_ORO && skip)) - opp->skip = S_ANDOR; /* And/or skip starts */ - else if (op == OP_QUE) /* Start of ?: operator */ + opp->skip = S_ANDOR; /* And/or skip starts */ + else if (op == OP_QUE) /* Start of ?: operator */ opp->skip = (char)((op1 & S_ANDOR) | ((!skip) ? S_QUEST : 0)); - else if (op == OP_COL) { /* : inverts S_QUEST */ + else if (op == OP_COL) { /* : inverts S_QUEST */ opp->skip = (char)((op1 & S_ANDOR) | (((op1 & S_QUEST) != 0) ? 0 : S_QUEST)); } - else { /* Other ops leave */ - opp->skip = (char)op1; /* skipping unchanged. */ + else { /* Other ops leave */ + opp->skip = (char)op1; /* skipping unchanged. */ } -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "stacking %s, valp[-1] == %d at %s", opname[op], valp[-1], infile->bptr); dumpstack(opstack, opp, value, valp); @@ -339,27 +339,27 @@ again: ; * Pop operator from op. stack and evaluate it. * End of stack and '(' are specials. */ - skip = opp->skip; /* Remember skip value */ - switch ((op1 = opp->op)) { /* Look at stacked op */ - case OP_END: /* Stack end marker */ + skip = opp->skip; /* Remember skip value */ + switch ((op1 = opp->op)) { /* Look at stacked op */ + case OP_END: /* Stack end marker */ if (op == OP_EOE) - return (valp[-1]); /* Finished ok. */ - goto again; /* Read another op. */ + return (valp[-1]); /* Finished ok. */ + goto again; /* Read another op. */ - case OP_LPA: /* ( on stack */ - if (op != OP_RPA) { /* Matches ) on input */ + case OP_LPA: /* ( on stack */ + if (op != OP_RPA) { /* Matches ) on input */ cerror("unbalanced paren's, op is \"%s\"", opname[op]); return (1); } - opp--; /* Unstack it */ - /* goto again; -- Fall through */ + opp--; /* Unstack it */ + /* goto again; -- Fall through */ case OP_QUE: - goto again; /* Evaluate true expr. */ + goto again; /* Evaluate true expr. */ - case OP_COL: /* : on stack. */ - opp--; /* Unstack : */ - if (opp->op != OP_QUE) { /* Matches ? on stack? */ + case OP_COL: /* : on stack. */ + opp--; /* Unstack : */ + if (opp->op != OP_QUE) { /* Matches ? on stack? */ cerror("Misplaced '?' or ':', previous operator is %s", opname[(int)opp->op]); return (1); @@ -367,19 +367,19 @@ again: ; /* * Evaluate op1. */ - default: /* Others: */ - opp--; /* Unstack the operator */ -#ifdef DEBUG_EVAL + default: /* Others: */ + opp--; /* Unstack the operator */ +#ifdef DEBUG_EVAL fprintf( pCppOut, "Stack before evaluation of %s\n", opname[op1]); dumpstack(opstack, opp, value, valp); #endif valp = evaleval(valp, op1, skip); -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "Stack after evaluation\n"); dumpstack(opstack, opp, value, valp); #endif - } /* op1 switch end */ - } /* Stack unwind loop */ + } /* op1 switch end */ + } /* Stack unwind loop */ } FILE_LOCAL int @@ -388,20 +388,20 @@ evallex(int skip) * Return next eval operator or value. Called from eval(). It * calls a special-purpose routines for 'char' strings and * numeric values: - * evalchar called to evaluate 'x' - * evalnum called to evaluate numbers. + * evalchar called to evaluate 'x' + * evalnum called to evaluate numbers. */ { - register int c, c1, t; + register int c, c1, t; -again: do { /* Collect the token */ +again: do { /* Collect the token */ c = skipws(); if ((c = macroid(c)) == EOF_CHAR || c == '\n') { unget(); - return (OP_EOE); /* End of expression */ + return (OP_EOE); /* End of expression */ } } while ((t = type[c]) == LET && catenate()); - if (t == INV) { /* Total nonsense */ + if (t == INV) { /* Total nonsense */ if (!skip) { if (isascii(c) && isprint(c)) cierror("illegal character '%c' in #if", c); @@ -410,38 +410,38 @@ again: do { /* Collect the token */ } return (OP_FAIL); } - else if (t == QUO) { /* ' or " */ - if (c == '\'') { /* Character constant */ - evalue = evalchar(skip); /* Somewhat messy */ -#ifdef DEBUG_EVAL + else if (t == QUO) { /* ' or " */ + if (c == '\'') { /* Character constant */ + evalue = evalchar(skip); /* Somewhat messy */ +#ifdef DEBUG_EVAL fprintf( pCppOut, "evalchar returns %d.\n", evalue); #endif - return (DIG); /* Return a value */ + return (DIG); /* Return a value */ } cerror("Can't use a string in an #if", NULLST); return (OP_FAIL); } - else if (t == LET) { /* ID must be a macro */ - if (streq(token, "defined")) { /* Or defined name */ + else if (t == LET) { /* ID must be a macro */ + if (streq(token, "defined")) { /* Or defined name */ c1 = c = skipws(); - if (c == '(') /* Allow defined(name) */ + if (c == '(') /* Allow defined(name) */ c = skipws(); if (type[c] == LET) { evalue = (lookid(c) != NULL); - if (c1 != '(' /* Need to balance */ - || skipws() == ')') /* Did we balance? */ - return (DIG); /* Parsed ok */ + if (c1 != '(' /* Need to balance */ + || skipws() == ')') /* Did we balance? */ + return (DIG); /* Parsed ok */ } cerror("Bad #if ... defined() syntax", NULLST); return (OP_FAIL); } - else if (streq(token, "sizeof")) /* New sizeof hackery */ - return (dosizeof()); /* Gets own routine */ + else if (streq(token, "sizeof")) /* New sizeof hackery */ + return (dosizeof()); /* Gets own routine */ /* * The Draft ANSI C Standard says that an undefined symbol * in an #if has the value zero. We are a bit pickier, * warning except where the programmer was careful to write - * #if defined(foo) ? foo : 0 + * #if defined(foo) ? foo : 0 */ #ifdef STRICT_UNDEF if (!skip) @@ -450,9 +450,9 @@ again: do { /* Collect the token */ evalue = 0; return (DIG); } - else if (t == DIG) { /* Numbers are harder */ + else if (t == DIG) { /* Numbers are harder */ evalue = evalnum(c); -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "evalnum returns %d.\n", evalue); #endif } @@ -460,7 +460,7 @@ again: do { /* Collect the token */ /* * Process a possible multi-byte lexeme. */ - c1 = cget(); /* Peek at next char */ + c1 = cget(); /* Peek at next char */ switch (c) { case '!': if (c1 == '=') @@ -468,7 +468,7 @@ again: do { /* Collect the token */ break; case '=': - if (c1 != '=') { /* Can't say a=b in #if */ + if (c1 != '=') { /* Can't say a=b in #if */ unget(); cerror("= not allowed in #if", NULLST); return (OP_FAIL); @@ -490,7 +490,7 @@ again: do { /* Collect the token */ break; case '\\': - if (c1 == '\n') /* Multi-line if */ + if (c1 == '\n') /* Multi-line if */ goto again; cerror("Unexpected \\ in #if", NULLST); return (OP_FAIL); @@ -505,15 +505,15 @@ dosizeof() /* * Process the sizeof (basic type) operation in an #if string. * Sets evalue to the size and returns - * DIG success - * OP_FAIL bad parse or something. + * DIG success + * OP_FAIL bad parse or something. */ { - register int c; - register TYPES *tp; - register SIZES *sizp; - register short *testp; - short typecode; + register int c; + register TYPES *tp; + register SIZES *sizp; + register short *testp; + short typecode; if ((c = skipws()) != '(') goto nogood; @@ -523,23 +523,23 @@ dosizeof() typecode = 0; while (0 != (c = skipws())) { if ((c = macroid(c)) == EOF_CHAR || c == '\n') - goto nogood; /* End of line is a bug */ - else if (c == '(') { /* thing (*)() func ptr */ + goto nogood; /* End of line is a bug */ + else if (c == '(') { /* thing (*)() func ptr */ if (skipws() == '*' - && skipws() == ')') { /* We found (*) */ - if (skipws() != '(') /* Let () be optional */ + && skipws() == ')') { /* We found (*) */ + if (skipws() != '(') /* Let () be optional */ unget(); else if (skipws() != ')') goto nogood; - typecode |= T_FPTR; /* Function pointer */ + typecode |= T_FPTR; /* Function pointer */ } - else { /* Junk is a bug */ + else { /* Junk is a bug */ goto nogood; } } - else if (type[c] != LET) /* Exit if not a type */ + else if (type[c] != LET) /* Exit if not a type */ break; - else if (!catenate()) { /* Maybe combine tokens */ + else if (!catenate()) { /* Maybe combine tokens */ /* * Look for this unexpandable token in basic_types. * The code accepts "int long" as well as "long int" @@ -554,7 +554,7 @@ dosizeof() cerror("#if sizeof, unknown type \"%s\"", token); return (OP_FAIL); } - typecode |= tp->type; /* Or in the type bit */ + typecode |= tp->type; /* Or in the type bit */ } } /* @@ -564,7 +564,7 @@ dosizeof() typecode |= T_PTR; c = skipws(); } - if (c == ')') { /* Last syntax check */ + if (c == ')') { /* Last syntax check */ for (testp = test_table; *testp != 0; testp++) { if (!bittest(typecode & *testp)) { cerror("#if ... sizeof: illegal type combination", NULLST); @@ -573,13 +573,13 @@ dosizeof() } /* * We assume that all function pointers are the same size: - * sizeof (int (*)()) == sizeof (float (*)()) + * sizeof (int (*)()) == sizeof (float (*)()) * We assume that signed and unsigned don't change the size: - * sizeof (signed int) == (sizeof unsigned int) + * sizeof (signed int) == (sizeof unsigned int) */ - if ((typecode & T_FPTR) != 0) /* Function pointer */ + if ((typecode & T_FPTR) != 0) /* Function pointer */ typecode = T_FPTR | T_PTR; - else { /* Var or var * datum */ + else { /* Var or var * datum */ typecode &= ~(T_SIGNED | T_UNSIGNED); if ((typecode & (T_SHORT | T_LONG)) != 0) typecode &= ~T_INT; @@ -597,12 +597,12 @@ dosizeof() ? sizp->psize : sizp->size; return (DIG); } - } /* We shouldn't fail */ + } /* We shouldn't fail */ cierror("#if ... sizeof: bug, unknown type code 0x%x", typecode); return (OP_FAIL); } -nogood: unget(); +nogood: unget(); cerror("#if ... sizeof() syntax error", NULLST); return (OP_FAIL); } @@ -630,9 +630,9 @@ evalnum(int c) * the unsigned suffix, but only returns a signed int value. */ { - register int value; - register int base; - register int c1; + register int value; + register int base; + register int c1; if (c != '0') base = 10; @@ -647,7 +647,7 @@ evalnum(int c) if (isascii(c) && isupper(c1)) c1 = tolower(c1); #ifdef EBCDIC - if (c1 <= 'f') + if (c1 <= 'f') #else if (c1 >= 'a') #endif @@ -659,7 +659,7 @@ evalnum(int c) value += c1; c = cget(); } - if (c == 'u' || c == 'U') /* Unsigned nonsense */ + if (c == 'u' || c == 'U') /* Unsigned nonsense */ c = cget(); unget(); return (value); @@ -671,18 +671,18 @@ evalchar(int skip) * Get a character constant */ { - register int c; - register int value; - register int count; + register int c; + register int value; + register int count; instring = TRUE; if ((c = cget()) == '\\') { switch ((c = cget())) { - case 'a': /* New in Standard */ + case 'a': /* New in Standard */ #if ('a' == '\a' || '\a' == ALERT) - value = ALERT; /* Use predefined value */ + value = ALERT; /* Use predefined value */ #else - value = '\a'; /* Use compiler's value */ + value = '\a'; /* Use compiler's value */ #endif break; @@ -706,15 +706,15 @@ evalchar(int skip) value = '\t'; break; - case 'v': /* New in Standard */ + case 'v': /* New in Standard */ #if ('v' == '\v' || '\v' == VT) - value = VT; /* Use predefined value */ + value = VT; /* Use predefined value */ #else - value = '\v'; /* Use compiler's value */ + value = '\v'; /* Use compiler's value */ #endif break; - case 'x': /* '\xFF' */ + case 'x': /* '\xFF' */ count = 3; value = 0; while ((((c = get()) >= '0' && c <= '9') @@ -783,12 +783,12 @@ evaleval(int* valp, int op, int skip) * evaleval() returns the new pointer to the top of the value stack. */ { - register int v1, v2 = 0; + register int v1, v2 = 0; if (isbinary(op)) v2 = *--valp; v1 = *--valp; -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL fprintf( pCppOut, "%s op %s", (isbinary(op)) ? "binary" : "unary", opname[op]); if (isbinary(op)) @@ -909,12 +909,12 @@ evaleval(int* valp, int op, int skip) return (valp); } -#ifdef DEBUG_EVAL +#ifdef DEBUG_EVAL dumpstack(opstack, opp, value, valp) -OPTAB opstack[NEXP]; /* Operand stack */ -register OPTAB *opp; /* Operator stack */ -int value[NEXP]; /* Value stack */ -register int *valp; /* -> value vector */ +OPTAB opstack[NEXP]; /* Operand stack */ +register OPTAB *opp; /* Operator stack */ +int value[NEXP]; /* Value stack */ +register int *valp; /* -> value vector */ { fprintf( pCppOut, "index op prec skip name -- op stack at %s", infile->bptr); while (opp > opstack) { diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c index 1f142051b653..2bbf161c7a42 100644 --- a/rsc/source/rscpp/cpp6.c +++ b/rsc/source/rscpp/cpp6.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -661,7 +661,7 @@ void dumpdef(char *why) register DEFBUF **syp; FILE *pRememberOut = NULL; - if ( bDumpDefs ) /*ER */ + if ( bDumpDefs ) /*ER */ { pRememberOut = pCppOut; pCppOut = pDefOut; @@ -731,7 +731,7 @@ void dumpadef(char *why, register DEFBUF *dp) EVALTYPE valEval; bIsInEval = 1; - infile = NULL; /* start from scrap */ + infile = NULL; /* start from scrap */ line = 0; wrongline = 0; *token = EOS; @@ -741,7 +741,7 @@ void dumpadef(char *why, register DEFBUF *dp) strcpy( file->buffer, dp->repl ); fprintf( pCppOut, " ===> "); nEvalOff = 0; - cppmain(); /* get() frees also *file */ + cppmain(); /* get() frees also *file */ valEval = 0; if ( 0 == evaluate( EvalBuf, &valEval ) ) { @@ -869,8 +869,8 @@ newline: } } #if (HOST == SYS_UNIX) -/*ER*/ if (c == '\r') -/*ER*/ return get(); /* DOS fuck */ +/*ER*/ if (c == '\r') +/*ER*/ return get(); /* DOS fuck */ #endif if (c == '\n') /* Maintain current */ ++line; /* line counter */ @@ -980,7 +980,7 @@ newline: } else if (c == '\f' || c == VT) /* Form Feed, Vertical */ c = ' '; /* Tab are whitespace */ - else if (c == 0xef) /* eat up UTF-8 BOM */ + else if (c == 0xef) /* eat up UTF-8 BOM */ { if((c = get()) == 0xbb) { diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index b3adecbc41cb..d725e5f94694 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -293,7 +293,7 @@ * NINCLUDE The number of directories that may be specified * on a per-system basis, or by the -I option. * BLK_NEST The number of nested #if's permitted. - * NFWORK FileNameWorkBuffer (added by erAck, was NWORK) + * NFWORK FileNameWorkBuffer (added by erAck, was NWORK) */ #ifndef IDMAX @@ -313,7 +313,7 @@ da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */ #define NWORK 128000 #define NBUFF NWORK -#define NFWORK 1024 +#define NFWORK 1024 #define NEXP 128 #define NINCLUDE 100 #define NPARMWORK (NWORK * 2) @@ -322,7 +322,7 @@ #ifndef ALERT #ifdef EBCDIC -#define ALERT '\057' +#define ALERT '\057' #else #define ALERT '\007' /* '\a' is "Bell" */ #endif diff --git a/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c index 4dc2d72bd4a9..598fded7248f 100644 --- a/rsc/source/rscpp/cppmain.c +++ b/rsc/source/rscpp/cppmain.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index 7c72d1c8df2c..f6c6651d79e1 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,9 +54,9 @@ *************************************************************************/ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) { - sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1; - char * pOrgStr = new char[ nMaxUniCodeBuf ]; - sal_uInt32 nOrgLen = 0; + sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1; + char * pOrgStr = new char[ nMaxUniCodeBuf ]; + sal_uInt32 nOrgLen = 0; if( nMaxUniCodeBuf * 6 > 0x0FFFFF ) RscExit( 10 ); @@ -157,12 +157,12 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) pStr++; } - sal_Unicode * pUniCode = new sal_Unicode[ nMaxUniCodeBuf ]; + sal_Unicode * pUniCode = new sal_Unicode[ nMaxUniCodeBuf ]; rtl_TextToUnicodeConverter hConv = rtl_createTextToUnicodeConverter( nTextEncoding ); sal_uInt32 nInfo; sal_Size nSrcCvtBytes; - sal_Size nUniSize = rtl_convertTextToUnicode( hConv, 0, + sal_Size nUniSize = rtl_convertTextToUnicode( hConv, 0, pOrgStr, nOrgLen, pUniCode, nMaxUniCodeBuf, RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT @@ -175,9 +175,9 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding ) rtl_destroyTextToUnicodeConverter( hConv ); hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 ); - // factor fo 6 is the maximum size of an UNICODE character as utf8 + // factor fo 6 is the maximum size of an UNICODE character as utf8 char * pUtf8 = (char *)rtl_allocateMemory( nUniSize * 6 ); - rtl_convertUnicodeToText( hConv, 0, + rtl_convertUnicodeToText( hConv, 0, pUniCode, nUniSize, pUtf8, nUniSize * 6, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 8c11dc13f9ab..b1c0a0483994 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,24 +39,24 @@ BOOL RscId::bNames = TRUE; /************************************************************************* |* -|* static RscId::SetNames -|* static RscId::SetNoNames +|* static RscId::SetNames +|* static RscId::SetNoNames |* -|* Beschreibung -|* Ersterstellung MM 26.06.91 -|* Letzte Aenderung MM 26.06.91 +|* Beschreibung +|* Ersterstellung MM 26.06.91 +|* Letzte Aenderung MM 26.06.91 |* *************************************************************************/ void RscId::SetNames( BOOL bSet ) { bNames = bSet; } -BOOL RscId::IsSetNames() { return bNames; } +BOOL RscId::IsSetNames() { return bNames; } /************************************************************************* |* -|* RscId::GetNumber +|* RscId::GetNumber |* -|* Beschreibung -|* Ersterstellung MM 17.05.91 -|* Letzte Aenderung MM 17.05.91 +|* Beschreibung +|* Ersterstellung MM 17.05.91 +|* Letzte Aenderung MM 17.05.91 |* *************************************************************************/ INT32 RscId::GetNumber() const{ @@ -67,11 +67,11 @@ INT32 RscId::GetNumber() const{ /************************************************************************* |* -|* RscId::Create() +|* RscId::Create() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ void RscId::Create( const RscExpType & rExpType ) @@ -89,11 +89,11 @@ void RscId::Create( const RscExpType & rExpType ) /************************************************************************* |* -|* RscId::Destroy() +|* RscId::Destroy() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ void RscId::Destroy(){ @@ -104,11 +104,11 @@ void RscId::Destroy(){ /************************************************************************* |* -|* RscId::RscId() +|* RscId::RscId() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscId::RscId( const RscId& rRscId ){ @@ -119,11 +119,11 @@ RscId::RscId( const RscId& rRscId ){ /************************************************************************* |* -|* RscId::RscId() +|* RscId::RscId() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ RscId::RscId( RscDefine * pDef ){ @@ -136,11 +136,11 @@ RscId::RscId( RscDefine * pDef ){ /************************************************************************* |* -|* RscId:: = +|* RscId:: = |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscId& RscId::operator = ( const RscId& rRscId ){ @@ -153,11 +153,11 @@ RscId& RscId::operator = ( const RscId& rRscId ){ /************************************************************************* |* -|* RscId::operator == +|* RscId::operator == |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ BOOL RscId::operator == ( const RscId& rRscId ) const @@ -167,11 +167,11 @@ BOOL RscId::operator == ( const RscId& rRscId ) const /************************************************************************* |* -|* RscId::operator < +|* RscId::operator < |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ BOOL RscId::operator < ( const RscId& rRscId ) const @@ -181,11 +181,11 @@ BOOL RscId::operator < ( const RscId& rRscId ) const /************************************************************************* |* -|* RscId::operator > +|* RscId::operator > |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ BOOL RscId::operator > ( const RscId& rRscId ) const @@ -195,11 +195,11 @@ BOOL RscId::operator > ( const RscId& rRscId ) const /************************************************************************* |* -|* RscId::INT32() +|* RscId::INT32() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ RscId::operator INT32() const @@ -209,11 +209,11 @@ RscId::operator INT32() const /************************************************************************* |* -|* RscId::GetNames() +|* RscId::GetNames() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ ByteString RscId::GetName() const @@ -233,11 +233,11 @@ ByteString RscId::GetName() const /************************************************************************* |* -|* RscId::GetMacro() +|* RscId::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 25.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 25.11.91 |* *************************************************************************/ ByteString RscId::GetMacro() const @@ -255,11 +255,11 @@ ByteString RscId::GetMacro() const /****************** R s c D e f i n e ************************************/ /************************************************************************* |* -|* RscDefine::RscDefine() +|* RscDefine::RscDefine() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId ) @@ -267,8 +267,8 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId ) { nRefCount = 0; lFileKey = lKey; - lId = lDefId; - pExp = NULL; + lId = lDefId; + pExp = NULL; } RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, @@ -278,16 +278,16 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, nRefCount = 0; lFileKey = lKey; pExpression->Evaluate( &lId ); - pExp = pExpression; + pExp = pExpression; } /************************************************************************* |* -|* RscDefine::~RscDefine() +|* RscDefine::~RscDefine() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscDefine::~RscDefine(){ @@ -299,11 +299,11 @@ RscDefine::~RscDefine(){ /************************************************************************* |* -|* RscDefine::DecRef() +|* RscDefine::DecRef() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ void RscDefine::DecRef(){ @@ -315,11 +315,11 @@ void RscDefine::DecRef(){ /************************************************************************* |* -|* RscDefine::DefineToNumber() +|* RscDefine::DefineToNumber() |* -|* Beschreibung -|* Ersterstellung MM 07.11.91 -|* Letzte Aenderung MM 07.11.91 +|* Beschreibung +|* Ersterstellung MM 07.11.91 +|* Letzte Aenderung MM 07.11.91 |* *************************************************************************/ void RscDefine::DefineToNumber() @@ -332,11 +332,11 @@ void RscDefine::DefineToNumber() /************************************************************************* |* -|* RscDefine::ChangeMacro() +|* RscDefine::ChangeMacro() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ void RscDefine::ChangeMacro( RscExpression * pExpression ){ @@ -356,15 +356,15 @@ void RscDefine::ChangeMacro( INT32 lIdentifier ){ /************************************************************************* |* -|* RscDefine::Evaluate() +|* RscDefine::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ BOOL RscDefine::Evaluate(){ - BOOL bRet = TRUE; + BOOL bRet = TRUE; if( pExp ) bRet = !pExp->Evaluate( &lId ); @@ -374,11 +374,11 @@ BOOL RscDefine::Evaluate(){ /************************************************************************* |* -|* RscDefine::Search() +|* RscDefine::Search() |* -|* Beschreibung -|* Ersterstellung MM 11.11.91 -|* Letzte Aenderung MM 11.11.91 +|* Beschreibung +|* Ersterstellung MM 11.11.91 +|* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ RscDefine * RscDefine::Search( const char * pStr ){ @@ -387,11 +387,11 @@ RscDefine * RscDefine::Search( const char * pStr ){ /************************************************************************* |* -|* RscDefine::GetMacro() +|* RscDefine::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ ByteString RscDefine::GetMacro() @@ -404,11 +404,11 @@ ByteString RscDefine::GetMacro() /****************** R s c D e f i n e L i s t ****************************/ /************************************************************************* |* -|* RscDefineList::New() +|* RscDefineList::New() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, @@ -436,11 +436,11 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName, /************************************************************************* |* -|* RscDefineList::Remove() +|* RscDefineList::Remove() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ BOOL RscDefineList::Remove( RscDefine * pDef ){ @@ -477,11 +477,11 @@ BOOL RscDefineList::Remove(){ /************************************************************************* |* -|* RscDefineList::Befor() +|* RscDefineList::Befor() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ BOOL RscDefineList::Befor( const RscDefine * pFree, @@ -506,11 +506,11 @@ BOOL RscDefineList::Befor( const RscDefine * pFree, /************************************************************************* |* -|* RscDefineList::WriteAll() +|* RscDefineList::WriteAll() |* -|* Beschreibung -|* Ersterstellung MM 28.10.91 -|* Letzte Aenderung MM 28.10.91 +|* Beschreibung +|* Ersterstellung MM 28.10.91 +|* Letzte Aenderung MM 28.10.91 |* *************************************************************************/ void RscDefineList::WriteAll( FILE * fOutput ) @@ -529,11 +529,11 @@ void RscDefineList::WriteAll( FILE * fOutput ) /****************** R s c E x p T y p e **********************************/ /************************************************************************* |* -|* RscExpType::Evaluate() +|* RscExpType::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ BOOL RscExpType::Evaluate( INT32 * plValue ) const{ @@ -554,11 +554,11 @@ BOOL RscExpType::Evaluate( INT32 * plValue ) const{ /************************************************************************* |* -|* RscExpType::GetMacro() +|* RscExpType::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ void RscExpType::GetMacro( ByteString & rStr ) const @@ -579,11 +579,11 @@ void RscExpType::GetMacro( ByteString & rStr ) const /****************** R s c E x p r e s s i o n ****************************/ /************************************************************************* |* -|* RscExpression::RscExpression() +|* RscExpression::RscExpression() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) @@ -599,11 +599,11 @@ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) /************************************************************************* |* -|* RscExpression::~RscExpression() +|* RscExpression::~RscExpression() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscExpression::~RscExpression(){ @@ -620,11 +620,11 @@ RscExpression::~RscExpression(){ /************************************************************************* |* -|* RscExpression::Evaluate() +|* RscExpression::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ BOOL RscExpression::Evaluate( INT32 * plValue ){ @@ -659,11 +659,11 @@ BOOL RscExpression::Evaluate( INT32 * plValue ){ /************************************************************************* |* -|* RscExpression::GetMacro() +|* RscExpression::GetMacro() |* -|* Beschreibung -|* Ersterstellung MM 01.11.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 01.11.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ ByteString RscExpression::GetMacro() @@ -705,27 +705,27 @@ ByteString RscExpression::GetMacro() /****************** R s c F i l e ****************************************/ /************************************************************************* |* -|* RscFile::RscFile() +|* RscFile::RscFile() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscFile :: RscFile(){ bLoaded = FALSE; bIncFile = FALSE; - bDirty = FALSE; + bDirty = FALSE; bScanned = FALSE; } /************************************************************************* |* -|* RscFile::~RscFile() +|* RscFile::~RscFile() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscFile :: ~RscFile(){ @@ -744,13 +744,13 @@ RscFile :: ~RscFile(){ /************************************************************************* |* -|* RscFile::Depend() +|* RscFile::Depend() |* -|* Beschreibung Diese Methode gibt 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 +|* Beschreibung Diese Methode gibt 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 |* *************************************************************************/ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){ @@ -774,11 +774,11 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){ /************************************************************************* |* -|* RscFile::InsertDependFile() +|* RscFile::InsertDependFile() |* -|* Beschreibung -|* Ersterstellung MM 06.01.92 -|* Letzte Aenderung MM 06.01.92 +|* Beschreibung +|* Ersterstellung MM 06.01.92 +|* Letzte Aenderung MM 06.01.92 |* *************************************************************************/ BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos ) @@ -805,11 +805,11 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, ULONG lPos ) /************************************************************************* |* -|* RscFile::RemoveDependFile() +|* RscFile::RemoveDependFile() |* -|* Beschreibung -|* Ersterstellung MM 18.11.91 -|* Letzte Aenderung MM 18.11.91 +|* Beschreibung +|* Ersterstellung MM 18.11.91 +|* Letzte Aenderung MM 18.11.91 |* *************************************************************************/ void RscFile :: RemoveDependFile( ULONG lDepFile ) @@ -829,11 +829,11 @@ void RscFile :: RemoveDependFile( ULONG lDepFile ) /****************** R s c D e f T r e e **********************************/ /************************************************************************* |* -|* RscDefTree::~RscDefTree() +|* RscDefTree::~RscDefTree() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ RscDefTree::~RscDefTree(){ @@ -842,11 +842,11 @@ RscDefTree::~RscDefTree(){ /************************************************************************* |* -|* RscDefTree::Remove() +|* RscDefTree::Remove() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ void RscDefTree::Remove(){ @@ -860,11 +860,11 @@ void RscDefTree::Remove(){ /************************************************************************* |* -|* RscDefTree::~Search() +|* RscDefTree::~Search() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ RscDefine * RscDefTree::Search( const char * pName ){ @@ -875,11 +875,11 @@ RscDefine * RscDefTree::Search( const char * pName ){ /************************************************************************* |* -|* RscDefTree::Insert() +|* RscDefTree::Insert() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ void RscDefTree::Insert( RscDefine * pDef ){ @@ -892,11 +892,11 @@ void RscDefTree::Insert( RscDefine * pDef ){ /************************************************************************* |* -|* RscDefTree::Remove() +|* RscDefTree::Remove() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ void RscDefTree::Remove( RscDefine * pDef ){ @@ -909,11 +909,11 @@ void RscDefTree::Remove( RscDefine * pDef ){ /************************************************************************* |* -|* RscDefTree::Evaluate() +|* RscDefTree::Evaluate() |* -|* Beschreibung -|* Ersterstellung MM 12.11.91 -|* Letzte Aenderung MM 12.11.91 +|* Beschreibung +|* Ersterstellung MM 12.11.91 +|* Letzte Aenderung MM 12.11.91 |* *************************************************************************/ BOOL RscDefTree::Evaluate( RscDefine * pDef ){ @@ -933,11 +933,11 @@ BOOL RscDefTree::Evaluate(){ /****************** R s c F i l e T a b **********************************/ /************************************************************************* |* -|* RscFileTab::RscFileTab() +|* RscFileTab::RscFileTab() |* -|* Beschreibung -|* Ersterstellung MM 07.11.91 -|* Letzte Aenderung MM 07.11.91 +|* Beschreibung +|* Ersterstellung MM 07.11.91 +|* Letzte Aenderung MM 07.11.91 |* *************************************************************************/ RscFileTab::RscFileTab(){ @@ -945,11 +945,11 @@ RscFileTab::RscFileTab(){ /************************************************************************* |* -|* RscFileTab::~RscFileTab() +|* RscFileTab::~RscFileTab() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscFileTab :: ~RscFileTab(){ @@ -967,11 +967,11 @@ RscFileTab :: ~RscFileTab(){ /************************************************************************* |* -|* RscFileTab::Find() +|* RscFileTab::Find() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ ULONG RscFileTab :: Find( const ByteString & rName ) @@ -990,11 +990,11 @@ ULONG RscFileTab :: Find( const ByteString & rName ) /************************************************************************* |* -|* RscFileTab::FindDef() +|* RscFileTab::FindDef() |* -|* Beschreibung -|* Ersterstellung MM 30.10.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 30.10.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscDefine * RscFileTab::FindDef( const char * pName ){ @@ -1003,16 +1003,16 @@ RscDefine * RscFileTab::FindDef( const char * pName ){ /************************************************************************* |* -|* RscFileTab::FindDef() +|* RscFileTab::FindDef() |* -|* Beschreibung -|* Ersterstellung MM 30.10.91 -|* Letzte Aenderung MM 01.11.91 +|* Beschreibung +|* Ersterstellung MM 30.10.91 +|* Letzte Aenderung MM 01.11.91 |* *************************************************************************/ RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName ) { - RscDefine * pDef = FindDef( rName ); + RscDefine * pDef = FindDef( rName ); if( pDef ) //befindet sich das DEFINE in einer Include-Datei in der @@ -1024,11 +1024,11 @@ RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName ) /************************************************************************* |* -|* RscFileTab::Depend() +|* RscFileTab::Depend() |* -|* Beschreibung -|* Ersterstellung MM 08.11.91 -|* Letzte Aenderung MM 08.11.91 +|* Beschreibung +|* Ersterstellung MM 08.11.91 +|* Letzte Aenderung MM 08.11.91 |* *************************************************************************/ BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){ @@ -1049,11 +1049,11 @@ BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){ /************************************************************************* |* -|* RscFileTab::TestDef() +|* RscFileTab::TestDef() |* -|* Beschreibung -|* Ersterstellung MM 14.01.92 -|* Letzte Aenderung MM 14.01.92 +|* Beschreibung +|* Ersterstellung MM 14.01.92 +|* Letzte Aenderung MM 14.01.92 |* *************************************************************************/ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, @@ -1073,11 +1073,11 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, /************************************************************************* |* -|* RscFileTab::TestDef() +|* RscFileTab::TestDef() |* -|* Beschreibung -|* Ersterstellung MM 14.01.92 -|* Letzte Aenderung MM 14.01.92 +|* Beschreibung +|* Ersterstellung MM 14.01.92 +|* Letzte Aenderung MM 14.01.92 |* *************************************************************************/ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, @@ -1107,11 +1107,11 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, ULONG lPos, /************************************************************************* |* -|* RscFileTab::NewDef() +|* RscFileTab::NewDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, @@ -1135,11 +1135,11 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, /************************************************************************* |* -|* RscFileTab::NewDef() +|* RscFileTab::NewDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, @@ -1171,11 +1171,11 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName, /************************************************************************* |* -|* RscFileTab::IsDefUsed() +|* RscFileTab::IsDefUsed() |* -|* Beschreibung -|* Ersterstellung MM 22.11.91 -|* Letzte Aenderung MM 22.11.91 +|* Beschreibung +|* Ersterstellung MM 22.11.91 +|* Letzte Aenderung MM 22.11.91 |* *************************************************************************/ BOOL RscFileTab::IsDefUsed( const ByteString & rDefName ) @@ -1190,11 +1190,11 @@ BOOL RscFileTab::IsDefUsed( const ByteString & rDefName ) /************************************************************************* |* -|* RscFileTab::DeleteDef() +|* RscFileTab::DeleteDef() |* -|* Beschreibung -|* Ersterstellung MM 11.11.91 -|* Letzte Aenderung MM 11.11.91 +|* Beschreibung +|* Ersterstellung MM 11.11.91 +|* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ void RscFileTab::DeleteDef( const ByteString & rDefName ) @@ -1213,11 +1213,11 @@ void RscFileTab::DeleteDef( const ByteString & rDefName ) /************************************************************************* |* -|* RscFileTab::ChangeDef() +|* RscFileTab::ChangeDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 11.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId ) @@ -1234,11 +1234,11 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId ) /************************************************************************* |* -|* RscFileTab::ChangeDef() +|* RscFileTab::ChangeDef() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 11.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 11.11.91 |* *************************************************************************/ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, @@ -1246,7 +1246,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, { RscDefine * pDef = FindDef( rDefName ); RscFile * pFile; - ULONG lPos = 0; + ULONG lPos = 0; if( pDef ){ pFile = GetFile( pDef->GetFileKey() ); @@ -1269,11 +1269,11 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, /************************************************************************* |* -|* RscFileTab::ChangeDefName() +|* RscFileTab::ChangeDefName() |* -|* Beschreibung -|* Ersterstellung MM 04.11.91 -|* Letzte Aenderung MM 04.11.91 +|* Beschreibung +|* Ersterstellung MM 04.11.91 +|* Letzte Aenderung MM 04.11.91 |* *************************************************************************/ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName, @@ -1297,15 +1297,15 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName, /************************************************************************* |* -|* RscFileTab::DeleteFileContext() +|* RscFileTab::DeleteFileContext() |* -|* Beschreibung -|* Ersterstellung MM 09.12.91 -|* Letzte Aenderung MM 09.12.91 +|* Beschreibung +|* Ersterstellung MM 09.12.91 +|* Letzte Aenderung MM 09.12.91 |* *************************************************************************/ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){ - RscFile * pFName; + RscFile * pFName; pFName = GetFile( lFileKey ); if( pFName ){ @@ -1322,15 +1322,15 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){ /************************************************************************* |* -|* RscFileTab::DeleteFile() +|* RscFileTab::DeleteFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ void RscFileTab :: DeleteFile( ULONG lFileKey ){ - RscFile * pFName; + RscFile * pFName; //Defines freigeben DeleteFileContext( lFileKey ); @@ -1349,17 +1349,17 @@ void RscFileTab :: DeleteFile( ULONG lFileKey ){ /************************************************************************* |* -|* RscFileTab::NewCodeFile() +|* RscFileTab::NewCodeFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ ULONG RscFileTab :: NewCodeFile( const ByteString & rName ) { - ULONG lKey; - RscFile * pFName; + ULONG lKey; + RscFile * pFName; lKey = Find( rName ); if( UNIQUEINDEX_ENTRY_NOTFOUND == lKey ) @@ -1375,17 +1375,17 @@ ULONG RscFileTab :: NewCodeFile( const ByteString & rName ) /************************************************************************* |* -|* RscFileTab::NewIncFile() +|* RscFileTab::NewIncFile() |* -|* Beschreibung -|* Ersterstellung MM 16.05.91 -|* Letzte Aenderung MM 16.05.91 +|* Beschreibung +|* Ersterstellung MM 16.05.91 +|* Letzte Aenderung MM 16.05.91 |* *************************************************************************/ ULONG RscFileTab :: NewIncFile( const ByteString & rName, const ByteString & rPath ) { - ULONG lKey; + ULONG lKey; RscFile * pFName; lKey = Find( rName ); diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx index ad496dfb3753..18e30a339f00 100644 --- a/rsc/source/tools/rschash.cxx +++ b/rsc/source/tools/rschash.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) m_aStringToID.find( aKey ); if( it != m_aStringToID.end() ) return it->second; - + if( bOnlyIfExists ) return InvalidAtom; - + Atom aRet = m_nNextID; m_aStringToID[ aKey ] = m_nNextID; m_aIDToString[ m_nNextID ] = rStr; diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 91f88fa2c75c..eb9764899140 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,12 +61,12 @@ using namespace rtl; /****************** C o d e **********************************************/ /************************************************************************* |* -|* rsc_strnicmp() +|* rsc_strnicmp() |* -|* Beschreibung Vergleicht zwei Strings Case-Unabhaengig bis zu -|* einer bestimmten Laenge -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* 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 ) @@ -91,11 +91,11 @@ int rsc_strnicmp( const char *string1, const char *string2, size_t count ) /************************************************************************* |* -|* rsc_strnicmp() +|* rsc_strnicmp() |* -|* Beschreibung Vergleicht zwei Strings Case-Unabhaengig -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* 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,13 +124,13 @@ char* rsc_strdup( const char* pStr ) /************************************************************************* |* -|* GetTmpFileName() +|* GetTmpFileName() |* -|* 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 +|* 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() @@ -142,19 +142,19 @@ ByteString GetTmpFileName() } /********************************************************************/ -/* */ -/* Function : Append( ) */ -/* */ -/* Parameters : psw - pointer to a preprocessor switch */ -/* */ -/* Description : appends text files */ +/* */ +/* Function : Append( ) */ +/* */ +/* Parameters : psw - pointer to a preprocessor switch */ +/* */ +/* Description : appends text files */ /********************************************************************/ BOOL Append( FILE * fDest, ByteString aTmpFile ) { #define MAX_BUF 4096 - char szBuf[ MAX_BUF ]; - int nItems; - FILE *fSource; + char szBuf[ MAX_BUF ]; + int nItems; + FILE *fSource; fSource = fopen( aTmpFile.GetBuffer(), "rb" ); if( !fDest || !fSource ){ @@ -187,13 +187,13 @@ BOOL Append( ByteString aOutputSrs, ByteString aTmpFile ) /************************************************************************* |* -|* InputFile +|* InputFile |* -|* 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 +|* 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,19 +212,19 @@ ByteString InputFile ( const char * pInput, const char * pExt ) /************************************************************************* |* -|* OutputFile +|* OutputFile |* -|* 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 +|* 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 ) { - UniString aUniInput( aInput, RTL_TEXTENCODING_ASCII_US ); - DirEntry aFileName( aUniInput ); + UniString aUniInput( aInput, RTL_TEXTENCODING_ASCII_US ); + DirEntry aFileName( aUniInput ); UniString aExt( pExt, RTL_TEXTENCODING_ASCII_US ); aFileName.SetExtension( aExt ); @@ -234,19 +234,19 @@ ByteString OutputFile ( ByteString aInput, const char * pExt ) /************************************************************************* |* -|* ::ResonseFile() +|* ::ResonseFile() |* -|* Beschreibung Kommandozeile aufbereiten -|* Ersterstellung MM 05.09.91 -|* Letzte Aenderung MM 05.09.91 +|* Beschreibung Kommandozeile aufbereiten +|* Ersterstellung MM 05.09.91 +|* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) { - FILE *fFile; - int nItems; - char szBuffer[4096]; // file buffer - sal_uInt32 i; + FILE *fFile; + int nItems; + char szBuffer[4096]; // file buffer + sal_uInt32 i; bool bInQuotes = false; // Programmname @@ -296,11 +296,11 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) /*************** R s c P t r P t r **************************************/ /************************************************************************* |* -|* RscPtrPtr :: RscPtrPtr() +|* RscPtrPtr :: RscPtrPtr() |* -|* Beschreibung Eine Tabelle mit Zeigern -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung Eine Tabelle mit Zeigern +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ RscPtrPtr :: RscPtrPtr(){ @@ -310,12 +310,12 @@ RscPtrPtr :: RscPtrPtr(){ /************************************************************************* |* -|* RscPtrPtr :: ~RscPtrPtr() +|* 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 +|* 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(){ @@ -324,11 +324,11 @@ RscPtrPtr :: ~RscPtrPtr(){ /************************************************************************* |* -|* RscPtrPtr :: Reset() +|* RscPtrPtr :: Reset() |* -|* Beschreibung -|* Ersterstellung MM 03.05.91 -|* Letzte Aenderung MM 03.05.91 +|* Beschreibung +|* Ersterstellung MM 03.05.91 +|* Letzte Aenderung MM 03.05.91 |* *************************************************************************/ void RscPtrPtr :: Reset(){ @@ -347,11 +347,11 @@ void RscPtrPtr :: Reset(){ /************************************************************************* |* -|* RscPtrPtr :: Append() +|* RscPtrPtr :: Append() |* -|* Beschreibung Haengt einen Eintrag an. -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* Beschreibung Haengt einen Eintrag an. +|* Ersterstellung MM 13.02.91 +|* Letzte Aenderung MM 13.02.91 |* *************************************************************************/ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ @@ -367,11 +367,11 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ /************************************************************************* |* -|* RscPtrPtr :: GetEntry() +|* RscPtrPtr :: GetEntry() |* -|* Beschreibung Liefert einen Eintrag, NULL wenn nicht vorhanden. -|* Ersterstellung MM 13.02.91 -|* Letzte Aenderung MM 13.02.91 +|* 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 ){ @@ -383,17 +383,17 @@ void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){ /****************** R S C W R I T E R C **********************************/ /************************************************************************* |* -|* RscWriteRc :: RscWriteRc() +|* RscWriteRc :: RscWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) { - short nSwapTest = 1; - RSCBYTEORDER_TYPE nMachineOrder; + short nSwapTest = 1; + RSCBYTEORDER_TYPE nMachineOrder; bSwap = FALSE; if( nOrder != RSC_SYSTEMENDIAN ) @@ -411,11 +411,11 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) /************************************************************************* |* -|* RscWriteRc :: ~RscWriteRc() +|* RscWriteRc :: ~RscWriteRc() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ RscWriteRc :: ~RscWriteRc() @@ -426,11 +426,11 @@ RscWriteRc :: ~RscWriteRc() /************************************************************************* |* -|* RscWriteRc :: IncSize() +|* RscWriteRc :: IncSize() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) @@ -443,11 +443,11 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) /************************************************************************* |* -|* RscWriteRc :: GetPointer() +|* RscWriteRc :: GetPointer() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) @@ -460,16 +460,16 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) /************************************************************************* |* -|* RscWriteRc :: Put() +|* RscWriteRc :: Put() |* -|* Beschreibung -|* Ersterstellung MM 15.04.91 -|* Letzte Aenderung MM 15.04.91 +|* Beschreibung +|* Ersterstellung MM 15.04.91 +|* Letzte Aenderung MM 15.04.91 |* *************************************************************************/ void RscWriteRc :: Put( sal_uInt16 nVal ) { - sal_uInt32 nOldLen; + sal_uInt32 nOldLen; nOldLen = IncSize( sizeof( nVal ) ); PutAt( nOldLen, nVal ); @@ -481,12 +481,12 @@ void RscWriteRc :: PutUTF8( char * pStr ) if( pStr ) nStrLen = strlen( pStr ); - sal_uInt32 n = nStrLen +1; + sal_uInt32 n = nStrLen +1; if( n % 2 ) // align to 2 n++; - sal_uInt32 nOldLen = IncSize( n ); + sal_uInt32 nOldLen = IncSize( n ); rtl_copyMemory( GetPointer( nOldLen ), pStr, nStrLen ); // 0 terminated pMem[ nOldLen + nStrLen ] = '\0'; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index 5dad0d2130df..d44554393a72 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ /****************** B i N o d e ******************************************/ /************************************************************************* |* -|* BiNode::BiNode() +|* BiNode::BiNode() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 +|* Beschreibung NAME.DOC +|* Ersterstellung MM 07.02.91 +|* Letzte Aenderung MM 07.02.91 |* *************************************************************************/ BiNode::BiNode(){ @@ -57,11 +57,11 @@ BiNode::BiNode(){ /************************************************************************* |* -|* BiNode::~BiNode() +|* BiNode::~BiNode() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 +|* Beschreibung +|* Ersterstellung MM 07.02.91 +|* Letzte Aenderung MM 07.02.91 |* *************************************************************************/ BiNode::~BiNode(){ @@ -69,11 +69,11 @@ BiNode::~BiNode(){ /************************************************************************* |* -|* BiNode::EnumNodes() +|* BiNode::EnumNodes() |* -|* Beschreibung -|* Ersterstellung MM 07.02.91 -|* Letzte Aenderung MM 07.02.91 +|* Beschreibung +|* Ersterstellung MM 07.02.91 +|* Letzte Aenderung MM 07.02.91 |* *************************************************************************/ void BiNode::EnumNodes( Link aLink ) const{ @@ -86,11 +86,11 @@ void BiNode::EnumNodes( Link aLink ) const{ /************************************************************************* |* -|* BiNode::ChangeDLListBTree() +|* BiNode::ChangeDLListBTree() |* -|* Beschreibung -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 +|* Beschreibung +|* Ersterstellung MM 11.01.91 +|* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ @@ -112,7 +112,7 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ else pList = (BiNode *)0; - if( NULL != (pTmp = pMiddle->Left()) ) // rechten Zeiger auf Null + if( NULL != (pTmp = pMiddle->Left()) ) // rechten Zeiger auf Null pTmp->pRight = (BiNode *)0; // linken Zeiger auf Null @@ -129,16 +129,16 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ /************************************************************************* |* -|* BiNode::ChangeBTreeDLList() +|* BiNode::ChangeBTreeDLList() |* -|* Beschreibung -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 +|* Beschreibung +|* Ersterstellung MM 11.01.91 +|* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ BiNode * BiNode::ChangeBTreeDLList(){ BiNode * pList; - BiNode * pLL_RN; // linke Liste rechter Knoten + BiNode * pLL_RN; // linke Liste rechter Knoten if( Right() ){ pList = Right()->ChangeBTreeDLList(); @@ -159,11 +159,11 @@ BiNode * BiNode::ChangeBTreeDLList(){ /****************** N a m e N o d e **************************************/ /************************************************************************* |* -|* NameNode::Remove() +|* NameNode::Remove() |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 +|* Beschreibung +|* Ersterstellung MM 10.07.91 +|* Letzte Aenderung MM 10.07.91 |* *************************************************************************/ NameNode * NameNode::Remove( NameNode * pRemove ){ @@ -202,11 +202,11 @@ NameNode * NameNode::Remove( NameNode * pRemove ){ /************************************************************************* |* -|* NameNode::Compare +|* NameNode::Compare |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 13.07.91 +|* Beschreibung +|* Ersterstellung MM 10.07.91 +|* Letzte Aenderung MM 13.07.91 |* *************************************************************************/ COMPARE NameNode::Compare( const NameNode * pCompare ) const{ @@ -229,11 +229,11 @@ COMPARE NameNode::Compare( const void * pCompare ) const{ /************************************************************************* |* -|* NameNode::SearchParent +|* NameNode::SearchParent |* -|* Beschreibung -|* Ersterstellung MM 10.07.91 -|* Letzte Aenderung MM 10.07.91 +|* Beschreibung +|* Ersterstellung MM 10.07.91 +|* Letzte Aenderung MM 10.07.91 |* *************************************************************************/ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ @@ -261,11 +261,11 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ /************************************************************************* |* -|* NameNode::Search +|* NameNode::Search |* -|* Beschreibung -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 27.06.90 +|* Beschreibung +|* Ersterstellung MM 21.03.90 +|* Letzte Aenderung MM 27.06.90 |* *************************************************************************/ NameNode* NameNode::Search( const NameNode * pSearch ) const{ @@ -310,11 +310,11 @@ NameNode* NameNode::Search( const void * pSearch ) const{ /************************************************************************* |* -|* NameNode::Insert() +|* NameNode::Insert() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 11.01.91 -|* Letzte Aenderung MM 11.01.91 +|* Beschreibung NAME.DOC +|* Ersterstellung MM 11.01.91 +|* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ @@ -328,7 +328,7 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ *pnDepth += 1; if( nCmp == GREATER ){ if( Left() ) - bRet = ((NameNode *)Left())->Insert( pTN, pnDepth ); + bRet = ((NameNode *)Left())->Insert( pTN, pnDepth ); else pLeft = pTN; } @@ -345,19 +345,19 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ /************************************************************************* |* -|* NameNode::Insert() +|* NameNode::Insert() |* -|* Beschreibung NAME.DOC -|* Ersterstellung MM 21.03.90 -|* Letzte Aenderung MM 11.01.91 +|* Beschreibung NAME.DOC +|* Ersterstellung MM 21.03.90 +|* Letzte Aenderung MM 11.01.91 |* *************************************************************************/ BOOL NameNode::Insert( NameNode * pTN ){ // insert a node in the tree. // if the node with the same name is in, return FALSE and no insert. // if not return true. - sal_uInt32 nDepth = 0; - BOOL bRet; + sal_uInt32 nDepth = 0; + BOOL bRet; bRet = Insert( pTN, &nDepth ); if( bRet ){ @@ -374,11 +374,11 @@ BOOL NameNode::Insert( NameNode * pTN ){ /************************************************************************* |* -|* NameNode::OrderTree() +|* NameNode::OrderTree() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 +|* Beschreibung +|* Ersterstellung MM 23.09.91 +|* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ void NameNode::OrderTree(){ @@ -405,20 +405,20 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){ /************************************************************************* |* -|* NameNode::IdOrderTree() +|* NameNode::IdOrderTree() |* -|* Beschreibung -|* Ersterstellung MM 15.11.91 -|* Letzte Aenderung MM 15.11.91 +|* Beschreibung +|* Ersterstellung MM 15.11.91 +|* Letzte Aenderung MM 15.11.91 |* *************************************************************************/ class OrderCtrl { - BOOL bOrder; + BOOL bOrder; NameNode * pName; DECL_LINK( CallBackFunc, NameNode * ); public: OrderCtrl() { bOrder = FALSE; pName = NULL; } - BOOL IsOrder( const NameNode * pRoot ) + BOOL IsOrder( const NameNode * pRoot ) { bOrder = TRUE; pName = NULL; @@ -444,11 +444,11 @@ BOOL NameNode::IsOrderTree() const{ /****************** I d N o d e ******************************************/ /************************************************************************* |* -|* IdNode::Search() +|* IdNode::Search() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 +|* Beschreibung +|* Ersterstellung MM 06.11.91 +|* Letzte Aenderung MM 06.11.91 |* *************************************************************************/ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{ @@ -457,11 +457,11 @@ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{ /************************************************************************* |* -|* IdNode::Compare() +|* IdNode::Compare() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 +|* Beschreibung +|* Ersterstellung MM 06.11.91 +|* Letzte Aenderung MM 06.11.91 |* *************************************************************************/ COMPARE IdNode::Compare( const NameNode * pSearch ) const @@ -487,11 +487,11 @@ COMPARE IdNode::Compare( const void * pSearch ) const{ /************************************************************************* |* -|* IdNode::GetId() +|* IdNode::GetId() |* -|* Beschreibung -|* Ersterstellung MM 23.09.91 -|* Letzte Aenderung MM 23.09.91 +|* Beschreibung +|* Ersterstellung MM 23.09.91 +|* Letzte Aenderung MM 23.09.91 |* *************************************************************************/ sal_uInt32 IdNode::GetId() const @@ -501,11 +501,11 @@ sal_uInt32 IdNode::GetId() const /************************************************************************* |* -|* StringNode::Search() +|* StringNode::Search() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 +|* Beschreibung +|* Ersterstellung MM 06.11.91 +|* Letzte Aenderung MM 06.11.91 |* *************************************************************************/ StringNode * StringNode::Search( const char * pSearch ) const{ @@ -514,11 +514,11 @@ StringNode * StringNode::Search( const char * pSearch ) const{ /************************************************************************* |* -|* StringNode::Compare() +|* StringNode::Compare() |* -|* Beschreibung -|* Ersterstellung MM 06.11.91 -|* Letzte Aenderung MM 06.11.91 +|* Beschreibung +|* Ersterstellung MM 06.11.91 +|* Letzte Aenderung MM 06.11.91 |* *************************************************************************/ COMPARE StringNode::Compare( const NameNode * pSearch ) const |