diff options
| author | Andras Timar <atimar@suse.com> | 2013-03-26 11:10:45 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-03-27 09:33:00 +0100 |
| commit | 73ff49f47dda14391f0c118f62002cb42680624e (patch) | |
| tree | 361fb6fecc7ce1e3466036f967614cd5afe3122d /rsc | |
| parent | 95c586d5c034115fd252c5fb0e4637bf9dc68a4d (diff) | |
remove unused functionality from Resource Compiler
and remove ASCII art comments and other useless comments
Change-Id: Iafa5eb5aa421b38b325bdc7cea6045b43a5c582a
Diffstat (limited to 'rsc')
41 files changed, 30 insertions, 3705 deletions
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h index 1108fcfa7061..3d2ab4aedbb0 100644 --- a/rsc/inc/rscall.h +++ b/rsc/inc/rscall.h @@ -64,7 +64,6 @@ extern AtomContainer* pHS; #define MSCPREPRO_FLAG 0x0080 // spezial Preprozessor #define PRINTSYNTAX_FLAG 0x0100 // Syntax ausgeben #define PRELOAD_FLAG 0x0200 // Alle Resourcen Preloaden -#define SMART_FLAG 0x0400 // abgekuertze Name #define SRSDEFAULT_FLAG 0x1000 // immer der Default geschrieben #define NOSYSRESTEST_FLAG 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur) diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index 1ab0f2e31271..9d036a5fc4fe 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -25,7 +25,6 @@ class RscEnum; -/******************* R s c A r r a y ************************************/ class RscInstNode : public IdNode { sal_uInt32 nTypeId; @@ -96,8 +95,6 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; class RscClassArray : public RscArray diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 8bcca4d40549..609d288f8a68 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -24,7 +24,6 @@ #include <rschash.hxx> #include <rsctop.hxx> -/******************* R s c C l a s s *************************************/ class RscClass : public RscTop { protected: @@ -91,11 +90,6 @@ public: RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - void WriteSyntax( FILE * fOutput, RscTypCont * pTC ); - - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); - void WriteRcCtor( FILE * fOutput, RscTypCont * pTC ); }; class RscSysDepend : public RscClass diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index f40223297e94..05eb843794e8 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -24,7 +24,6 @@ #include <rschash.hxx> #include <rsctop.hxx> -/******************* R s c C o n s t *************************************/ class RscConst : public RscTop { protected: @@ -45,12 +44,8 @@ public: sal_Bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; sal_Bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const; sal_uInt32 GetConstPos( Atom nConstId ); - virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC ); - virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; -/******************* R s c E n u m ***************************************/ class RscEnum : public RscConst { struct RscEnumInst { sal_uInt32 nValue; // Position der Konstanten im Array diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx index fbca3d864c7f..fe7ad8704765 100644 --- a/rsc/inc/rsccont.hxx +++ b/rsc/inc/rsccont.hxx @@ -23,7 +23,6 @@ #include <rscerror.h> #include <rsctop.hxx> -/******************* R s c B a s e C o n t *******************************/ struct ENTRY_STRUCT { RscId aName; RSCINST aInst; @@ -53,8 +52,6 @@ protected: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - void ContWriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char *, sal_Bool nWriteSize ); public: RscBaseCont( Atom nId, sal_uInt32 nTypId, RscTop * pSuper = NULL, @@ -103,13 +100,8 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32 , sal_Bool bExtra); - ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); - ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId &rId ); }; -/******************* R s c C o n t W r i t e S r c ***********************/ class RscContWriteSrc : public RscBaseCont { public: @@ -120,7 +112,6 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); }; -/******************* R s c C o n t ***************************************/ class RscCont : public RscContWriteSrc { public: RscCont( Atom nId, sal_uInt32 nTypId, @@ -128,11 +119,8 @@ public: sal_Bool bNoId = sal_True ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; -/******************* R s c C o n t E x t r a D a t a *********************/ class RscContExtraData : public RscContWriteSrc { public: RscContExtraData( Atom nId, sal_uInt32 nTypId, diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 905a2fc69488..89404d65cbd4 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -46,7 +46,6 @@ struct WriteRcContext RscCmdLine* pCmdLine; }; -/****************** R s c T y p C o n ************************************/ // Liste die alle Basistypen enthaelt typedef ::std::vector< RscTop* > RscBaseList; @@ -298,8 +297,6 @@ public: sal_Bool IsPreload() const { return (nFlags & PRELOAD_FLAG) ? sal_True : sal_False; } - sal_Bool IsSmart() const - { return (nFlags & SMART_FLAG) ? sal_True : sal_False; } sal_Bool IsSysResTest() const { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; } sal_Bool IsSrsDefault() const @@ -333,11 +330,6 @@ public: ERRTYPE WriteRc( WriteRcContext& rContext ); void WriteSrc( FILE * fOutput, sal_uLong nFileIndex, sal_Bool bName = sal_True ); - ERRTYPE WriteHxx( FILE * fOutput, sal_uLong nFileKey); - ERRTYPE WriteCxx( FILE * fOutput, sal_uLong nFileKey, - const rtl::OString& rHxxName ); - void WriteSyntax( FILE * fOutput ); - void WriteRcCtor( FILE * fOutput ); sal_uInt32 PutTranslatorKey( sal_uInt64 nKey ); void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; } }; diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 28b701624eee..6b8a579594e4 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -19,8 +19,6 @@ #ifndef _RSCERROR_H #define _RSCERROR_H -#include <tools/solar.h> - /****************** D E F I N I T I O N S ********************************/ /******************* R e t u r n E r r o r s *******************/ #define ERR_OK 0xFFFFFFFF diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index d4716cd10b84..838533bb6488 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -55,14 +55,6 @@ public: sal_uInt32, sal_Bool bExtra ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); - ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); - ERRTYPE WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); - ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); sal_Bool IsConsistent( const RSCINST & rInst ); ERRTYPE GetRef( const RSCINST & rInst, RscId * ); ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index d1a8c97d66a4..e9adb1ce82a6 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -24,7 +24,6 @@ #include <rschash.hxx> #include <rsctop.hxx> -/******************* R s c R a n g e *************************************/ class RscRange : public RscTop { protected: @@ -60,11 +59,8 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; -/******************* R s c L o n g R a n g e ******************************/ class RscLongRange : public RscTop { protected: @@ -101,12 +97,9 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; -/******************* R s c L o n g E n u m R a n g e ******************/ class RscLongEnumRange : public RscLongRange { public: @@ -116,7 +109,6 @@ public: sal_Int32 nValue ); }; -/******************* R s c I d R a n g e ***********************************/ class RscIdRange : public RscTop { sal_uInt32 nSize; @@ -156,12 +148,8 @@ public: ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); sal_Bool IsConsistent( const RSCINST & rInst ); - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); - }; -/******************* R s c B o o l ***************************************/ class RscBool : public RscRange { public: @@ -182,9 +170,6 @@ public: }; void WriteSrc( const RSCINST &, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * ); - void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); - }; class RscBreakRange : public RscRange { diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index 42c19984b46f..6a06d04343eb 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -45,13 +45,7 @@ public: rtl::OString aPath; // Liste der Pfade RSCBYTEORDER_TYPE nByteOrder; unsigned short nCommands; // Steuerbits - rtl::OString aOutputLst; // Name der List-Ausgabedatei rtl::OString aOutputSrs; // Name der Srs-Ausgabedatei - rtl::OString aOutputSrc; // Name der Src-Ausgabedatei - rtl::OString aOutputRcCtor; // Name der Ctor-Ausgabedatei - rtl::OString aOutputCxx; // Name der Cxx-Ausgabedatei - rtl::OString aOutputHxx; // Name der Hxx-Ausgabedatei - rtl::OString aTouchFile; // create this file when done in rsc2 rtl::OString aILDir; struct OutputFile @@ -79,11 +73,6 @@ struct WriteRcContext; class RscCompiler { private: - rtl::OString aTmpOutputHxx; // Name der TempHxx-Ausgabedatei - rtl::OString aTmpOutputCxx; // Name der TempCxx-Ausgabedatei - rtl::OString aTmpOutputRcCtor; // Name der Temp Ctor-Ausgabedatei - rtl::OString aTmpOutputSrc; // Name der TempSrc-Ausgabedatei - void CreateResFile( const char * pRc ); void Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile ); diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx index cbad2075fe68..87da46f7fae2 100644 --- a/rsc/inc/rscstr.hxx +++ b/rsc/inc/rscstr.hxx @@ -24,7 +24,6 @@ #include <rschash.hxx> #include <rsctop.hxx> -/******************* R s c S t r i n g ***********************************/ class RscString : public RscTop { RscTop * pRefClass; @@ -64,8 +63,6 @@ public: RscTypCont * pTC, sal_uInt32 nTab, const char * ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, sal_Bool bExtra ); - virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); }; #endif // _RSCSTR_HXX diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 91fd7202fc15..4f5b7842bd71 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -24,7 +24,6 @@ #include <rschash.hxx> #include <rscclobj.hxx> -/****************** T Y P E S ********************************************/ typedef sal_uInt32 RSCVAR; #define VAR_POINTER 0x0001 #define VAR_HIDDEN 0x0002 @@ -34,8 +33,6 @@ typedef sal_uInt32 RSCVAR; #define VAR_NOENUM 0x0020 #define VAR_EXTENDABLE 0x0040 /* Auch die Ableitung einer Klasse kann angegeben werden */ -/****************** C L A S S E S ****************************************/ -/******************* R s c C l a s s *************************************/ class RscTop : public RefNode { RscTop * pSuperClass; @@ -216,23 +213,6 @@ public: sal_uInt32 nDeep, sal_Bool bExtra ); virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ); - - // Weiterleitung an Superklassen wird unterbunden - virtual ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ); - virtual ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId &rId ); - virtual ERRTYPE WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId &rId ); - virtual ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId &rId ); - - void WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ); - virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC ); - - virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC, - const char * ); - virtual void WriteRcCtor( FILE * fOutput, RscTypCont * pTC ); }; #endif //_RSCTOP_HXX diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx index ddedf12b077b..600db98097fe 100644 --- a/rsc/inc/rsctree.hxx +++ b/rsc/inc/rsctree.hxx @@ -22,7 +22,6 @@ #include <tools/link.hxx> #include <rsctools.hxx> -/****************** C L A S S E S ****************************************/ class BiNode { protected: @@ -48,7 +47,6 @@ public: void EnumNodes( Link aLink ) const; }; -/*************************************************************************/ class NameNode : public BiNode { void SubOrderTree( NameNode * pOrderNode ); @@ -72,7 +70,6 @@ public: void OrderTree(); }; -/*************************************************************************/ class IdNode : public NameNode { virtual COMPARE Compare( const NameNode * ) const; @@ -86,7 +83,6 @@ public: virtual sal_uInt32 GetId() const; }; -/*************************************************************************/ class StringNode : public NameNode { virtual COMPARE Compare( const NameNode * ) const; diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index bd090b6ccd68..998eaeeaac5d 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -21,7 +21,6 @@ #define _TOOLS_VCLRSC_HXX #include <sal/types.h> -#include <tools/solar.h> #include <tools/wintypes.hxx> #include <tools/fldunit.hxx> #include <tools/mapunit.hxx> diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 691f02c7bc19..34e5f385dcd2 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -29,11 +29,6 @@ #include "rsclex.hxx" -/************************************************************************* -|* -|* ERRTYPE::operator = ; -|* -*************************************************************************/ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) { if( !IsError() ){ @@ -43,11 +38,6 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) return *this; } -/************************************************************************* -|* -|* RscError::StdOut(); -|* -*************************************************************************/ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) { if ( m_verbosity >= _verbosityLevel ) @@ -59,52 +49,27 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) } } -/************************************************************************* -|* -|* RscError::StdErr(); -|* -*************************************************************************/ void RscError::StdErr( const char * pStr ) { if( pStr ) fprintf( stderr, "%s", pStr ); } -/************************************************************************* -|* -|* RscError::LstOut(); -|* -*************************************************************************/ void RscError::LstOut( const char * pStr ){ if( fListing && pStr ) fprintf( fListing, "%s", pStr ); } -/************************************************************************* -|* -|* RscError::StdLstOut(); -|* -*************************************************************************/ void RscError::StdLstOut( const char * pStr ){ StdOut( pStr ); LstOut( pStr ); } -/************************************************************************* -|* -|* RscError::StdLstErr(); -|* -*************************************************************************/ void RscError::StdLstErr( const char * pStr ){ StdErr( pStr ); LstOut( pStr ); } -/************************************************************************* -|* -|* RscError::WriteError(); -|* -*************************************************************************/ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) { switch( rError ) @@ -173,7 +138,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) StdLstOut( "Command line: rsc [Switches] <Source File(s)>\n" ); StdLstOut( "Command line: rsc @<Command File>\n" ); StdLstOut( "-h shows this help.\n" ); - StdLstOut( "-p No Preprocessor.\n" ); + StdLstOut( "-p No preprocessor.\n" ); StdLstOut( "-s Syntax analysis, creates .srs file\n"); StdLstOut( "-l Linker, links files created with rsc -s,\n" ); StdLstOut( " creates .rc file and .res file.\n" ); @@ -182,24 +147,13 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) StdLstOut( "-i Include directives for the Preprocessor.\n" ); StdLstOut( "-presponse Use response file for Preprocessor.\n" ); StdLstOut( "-lg<language> Use a different language.\n" ); - StdLstOut( "-pp=<filename> Use a different Preprocessor.\n" ); - StdLstOut( "-rsc2=<filename> Specify the location for rsc2.\n" ); - StdLstOut( "No longer existent: -rc<filename> Use a different system resource compiler.\n" ); StdLstOut( "-fs=<filename> Name of the .res file.\n" ); StdLstOut( "-lip=<path> additional search path for system dependant files\n" ); StdLstOut( "-fp=<filename> Renaming of the .srs file.\n" ); - StdLstOut( "-fl=<filename> Listing file.\n" ); - StdLstOut( "-fh=<filename> Header file.\n" ); - StdLstOut( "-fc=<filename> Code file.\n" ); - StdLstOut( "-ft=<filename> Touch a file when done in rsc2 (for dependencies)\n" ); - StdLstOut( "-fr=<filename> Resource constructor .cxx-file.\n" ); - StdLstOut( "-fx=<filename> Name of .src-file.\n" ); StdLstOut( "-oil=<dir> Output directory for image list files\n" ); - StdLstOut( "-r<ENV>=<path> replace <path> by <ENV> in image list files\n" ); - StdLstOut( "-CHARSET_... Convert to this character set.\n" ); + StdLstOut( "-sub<ENV>=<path> replace <path> by <ENV> in image list files\n" ); StdLstOut( "-BIGENDIAN Format of number values.\n" ); StdLstOut( "-LITTLEENDIAN Format of number values.\n" ); - StdLstOut( "-SMART Generate smart names (cxx, hxx).\n" ); StdLstOut( "-SrsDefault Only write one language to srs file.\n" ); StdLstOut( "\nwhen creating multiple .res files in one pass, please give these\n" ); StdLstOut( "options in consecutive blocks:\n" ); @@ -323,7 +277,6 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) StdLstErr( "> could not be found." ); break; -/****************** W A R N I N G S **************************************/ case WRN_LOCALID: StdLstErr( "Sub resources should have an identifier < 256." ); break; @@ -365,11 +318,6 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) } } -/************************************************************************* -|* -|* RscErrorFormat() -|* -*************************************************************************/ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, const RscId & aId ){ char buf[ 10 ]; @@ -423,11 +371,6 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, StdLstErr( ": " ); } -/************************************************************************* -|* -|* RscError::Error() -|* -*************************************************************************/ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, const RscId & aId, const char * pMessage ) { @@ -442,11 +385,6 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass, }; } -/************************************************************************* -|* -|* RscError::FatalError(); -|* -*************************************************************************/ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, const char * pMessage ) { diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 21c61e7b7773..0b70e09fa934 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <ctype.h> // isdigit(), isalpha() #include <stdlib.h> #include <stdio.h> @@ -29,7 +27,6 @@ #include <sal/log.hxx> #include <sal/macros.h> -// Programmabhaengige Includes. #include <rsctree.hxx> #include <rsctop.hxx> #include <rscmgr.hxx> @@ -39,11 +36,6 @@ using ::rtl::OString; using ::rtl::OStringBuffer; -/************************************************************************* -|* -|* RscTypCont :: RscTypCont -|* -*************************************************************************/ RscTypCont :: RscTypCont( RscError * pErrHdl, RSCBYTEORDER_TYPE nOrder, const rtl::OString& rSearchPath, @@ -167,11 +159,6 @@ Atom RscTypCont::AddLanguage( const char* pLang ) } -/************************************************************************* -|* -|* RscTypCont :: ~RscTypCont -|* -*************************************************************************/ void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ){ if( pObjNode ){ DestroyNode( pRscTop, (ObjNode*)pObjNode->Left() ); @@ -256,7 +243,6 @@ void RscTypCont::ClearSysNames() aSysLst.clear(); } -//======================================================================= RscTop * RscTypCont::SearchType( Atom nId ) /* [Beschreibung] @@ -301,11 +287,6 @@ RscTop * RscTypCont::SearchType( Atom nId ) return NULL; } -/************************************************************************* -|* -|* RscTypCont :: PutSysName() -|* -*************************************************************************/ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, sal_uInt32 nConst, sal_uInt32 nId, sal_Bool bFirst ) { @@ -349,11 +330,6 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName, return pSysEntry->nKey; } -/************************************************************************* -|* -|* RscTypCont :: WriteInc -|* -*************************************************************************/ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) { @@ -398,11 +374,6 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey ) }; } -/************************************************************************* -|* -|* RscTypCont :: Methoden die ueber all Knoten laufen -|* -*************************************************************************/ class RscEnumerateObj { @@ -416,8 +387,6 @@ private: DECL_LINK( CallBackWriteRc, ObjNode * ); DECL_LINK( CallBackWriteSrc, ObjNode * ); - DECL_LINK( CallBackWriteCxx, ObjNode * ); - DECL_LINK( CallBackWriteHxx, ObjNode * ); ERRTYPE WriteRc( RscTop * pCl, ObjNode * pRoot ) { @@ -432,27 +401,10 @@ private: pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteSrc ) ); return aError; } - ERRTYPE WriteCxx( RscTop * pCl, ObjNode * pRoot ){ - pClass = pCl; - if( pRoot ) - pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteCxx ) ); - return aError; - } - ERRTYPE WriteHxx( RscTop * pCl, ObjNode * pRoot ){ - pClass = pCl; - if( pRoot ) - pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteHxx ) ); - return aError; - } public: void WriteRcFile( RscWriteRc & rMem, FILE * fOutput ); }; -/************************************************************************* -|* -|* RscEnumerateObj :: CallBackWriteRc -|* -*************************************************************************/ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) { RscWriteRc aMem( pTypCont->GetByteOrder() ); @@ -467,11 +419,6 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode ) return 0; } -/************************************************************************* -|* -|* RscEnumerateObj :: CallBackWriteSrc -|* -*************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) { if( pObjNode->GetFileKey() == lFileKey ){ @@ -484,41 +431,6 @@ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) } IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode ) -/************************************************************************* -|* -|* RscEnumerateObj :: CallBackWriteCxx -|* -*************************************************************************/ -IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) -{ - if( pClass->IsCodeWriteable() && pObjNode->GetFileKey() == lFileKey ) - aError = pClass->WriteCxxHeader( - RSCINST( pClass, pObjNode->GetRscObj() ), - fOutput, pTypCont, pObjNode->GetRscId() ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteCxx, ObjNode *, pObjNode ) - -/************************************************************************* -|* -|* RscEnumerateObj :: CallBackWriteHxx -|* -*************************************************************************/ -IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) -{ - if( pClass->IsCodeWriteable() && pObjNode->GetFileKey() == lFileKey ) - aError = pClass->WriteHxxHeader( - RSCINST( pClass, pObjNode->GetRscObj() ), - fOutput, pTypCont, pObjNode->GetRscId() ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteHxx, ObjNode *, pObjNode ) - -/************************************************************************* -|* -|* RscEnumerateObj :: WriteRcFile -|* -*************************************************************************/ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ) { // Definition der Struktur, aus denen die Resource aufgebaut ist @@ -571,10 +483,6 @@ private: DECL_LINK( CallBackWriteRc, RscTop * ); DECL_LINK( CallBackWriteSrc, RscTop * ); - DECL_LINK( CallBackWriteCxx, RscTop * ); - DECL_LINK( CallBackWriteHxx, RscTop * ); - DECL_LINK( CallBackWriteSyntax, RscTop * ); - DECL_LINK( CallBackWriteRcCtor, RscTop * ); public: RscEnumerateObj aEnumObj; @@ -600,43 +508,8 @@ public: pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteSrc ) ); return aEnumObj.aError; } - - ERRTYPE WriteCxx( sal_uLong lFileKey ) - { - aEnumObj.lFileKey = lFileKey; - - aEnumObj.aError.Clear(); - pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteCxx ) ); - return aEnumObj.aError; - } - - ERRTYPE WriteHxx( sal_uLong lFileKey ) - { - aEnumObj.lFileKey = lFileKey; - - aEnumObj.aError.Clear(); - pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteHxx ) ); - return aEnumObj.aError; - } - - void WriteSyntax() - { - pRoot->EnumNodes( LINK( this, RscEnumerateRef, - CallBackWriteSyntax ) ); - } - - void WriteRcCtor() - { - pRoot->EnumNodes( LINK( this, RscEnumerateRef, - CallBackWriteRcCtor ) ); - } }; -/************************************************************************* -|* -|* RscRscEnumerateRef :: CallBack... -|* -*************************************************************************/ IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef ) { aEnumObj.WriteRc( pRef, pRef->GetObjNode() ); @@ -649,38 +522,7 @@ IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteSrc, RscTop *, pRef ) return 0; } IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteSrc, RscTop *, pRef ) -IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteCxx, RscTop *, pRef ) -{ - if( pRef->IsCodeWriteable() ) - aEnumObj.WriteCxx( pRef, pRef->GetObjNode() ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteCxx, RscTop *, pRef ) -IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteHxx, RscTop *, pRef ) -{ - if( pRef->IsCodeWriteable() ) - aEnumObj.WriteHxx( pRef, pRef->GetObjNode() ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteHxx, RscTop *, pRef ) -IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteSyntax, RscTop *, pRef ) -{ - pRef->WriteSyntaxHeader( aEnumObj.fOutput, aEnumObj.pTypCont ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteSyntax, RscTop *, pRef ) -IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef ) -{ - pRef->WriteRcCtor( aEnumObj.fOutput, aEnumObj.pTypCont ); - return 0; -} -IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef ) -/************************************************************************* -|* -|* RscTypCont :: WriteRc -|* -*************************************************************************/ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) { @@ -701,11 +543,6 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) return aError; } -/************************************************************************* -|* -|* RscTypCont :: WriteSrc -|* -*************************************************************************/ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, sal_Bool bName ) { @@ -758,124 +595,6 @@ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey, }; } -/************************************************************************* -|* -|* RscTypCont :: WriteHxx -|* -*************************************************************************/ -ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey ) -{ - fprintf( fOutput, "#include <tools/rc.hxx>\n" ); - fprintf( fOutput, "#include <tools/resid.hxx>\n" ); - fprintf( fOutput, "#include <vcl/accel.hxx>\n" ); - fprintf( fOutput, "#include <vcl/bitmap.hxx>\n" ); - fprintf( fOutput, "#include <vcl/button.hxx>\n" ); - fprintf( fOutput, "#include <tools/color.hxx>\n" ); - fprintf( fOutput, "#include <vcl/combobox.hxx>\n" ); - fprintf( fOutput, "#include <vcl/ctrl.hxx>\n" ); - fprintf( fOutput, "#include <vcl/dialog.hxx>\n" ); - fprintf( fOutput, "#include <vcl/edit.hxx>\n" ); - fprintf( fOutput, "#include <vcl/field.hxx>\n" ); - fprintf( fOutput, "#include <vcl/fixed.hxx>\n" ); - fprintf( fOutput, "#include <vcl/group.hxx>\n" ); - fprintf( fOutput, "#include <vcl/image.hxx>\n" ); - fprintf( fOutput, "#include <vcl/keycod.hxx>\n" ); - fprintf( fOutput, "#include <vcl/lstbox.hxx>\n" ); - fprintf( fOutput, "#include <vcl/mapmod.hxx>\n" ); - fprintf( fOutput, "#include <vcl/menu.hxx>\n" ); - fprintf( fOutput, "#include <vcl/menubtn.hxx>\n" ); - fprintf( fOutput, "#include <vcl/morebtn.hxx>\n" ); - fprintf( fOutput, "#include <vcl/msgbox.hxx>\n" ); - fprintf( fOutput, "#include <vcl/scrbar.hxx>\n" ); - fprintf( fOutput, "#include <vcl/spin.hxx>\n" ); - fprintf( fOutput, "#include <vcl/spinfld.hxx>\n" ); - fprintf( fOutput, "#include <vcl/splitwin.hxx>\n" ); - fprintf( fOutput, "#include <vcl/status.hxx>\n" ); - fprintf( fOutput, "#include <vcl/tabctrl.hxx>\n" ); - fprintf( fOutput, "#include <vcl/tabdlg.hxx>\n" ); - fprintf( fOutput, "#include <vcl/tabpage.hxx>\n" ); - fprintf( fOutput, "#include <vcl/toolbox.hxx>\n" ); - fprintf( fOutput, "#include <vcl/window.hxx>\n" ); - fprintf( fOutput, "#include <vcl/wrkwin.hxx>\n" ); - fprintf( fOutput, "#include <svtools/svmedit.hxx>\n" ); - - RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - ERRTYPE aError; - - if( NOFILE_INDEX == nFileKey ) - { - sal_uIntPtr aIndex = aFileTab.FirstIndex(); - while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND ) - { - aError = aEnumRef.WriteHxx( aIndex ); - aIndex = aFileTab.NextIndex( aIndex ); - }; - } - else - aError = aEnumRef.WriteHxx( nFileKey ); - - return aError; -} - -/************************************************************************* -|* -|* RscTypCont :: WriteCxx -|* -*************************************************************************/ -ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey, - const rtl::OString& rHxxName ) -{ - RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - ERRTYPE aError; - fprintf( fOutput, "#include <string.h>\n" ); - WriteInc( fOutput, nFileKey ); - if( !rHxxName.isEmpty() ) - fprintf( fOutput, "#include \"%s\"\n", rHxxName.getStr() ); - fprintf( fOutput, "\n\n" ); - - if( NOFILE_INDEX == nFileKey ) - { - sal_uIntPtr aIndex = aFileTab.FirstIndex(); - while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND ) - { - aError = aEnumRef.WriteCxx( aIndex ); - aIndex = aFileTab.NextIndex( aIndex ); - }; - } - else - aError = aEnumRef.WriteCxx( nFileKey ); - - return aError; -} - -/************************************************************************* -|* -|* RscTypCont :: WriteSyntax -|* -*************************************************************************/ -void RscTypCont::WriteSyntax( FILE * fOutput ) -{ - for( size_t i = 0; i < aBaseLst.size(); i++ ) - aBaseLst[ i ]->WriteSyntaxHeader( fOutput, this ); - RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - aEnumRef.WriteSyntax(); -} - -//======================================================================= -void RscTypCont::WriteRcCtor -( - FILE * fOutput -) -{ - RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - aEnumRef.WriteRcCtor(); -} - -/************************************************************************* -|* -|* RscTypCont :: Delete() -|* -*************************************************************************/ class RscDel { sal_uLong lFileKey; diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index d162f1eb2971..a2a5d1567278 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -18,8 +18,6 @@ */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -43,7 +41,6 @@ #include <boost/unordered_map.hpp> -/****************** M A C R O S ******************************************/ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal ) { #if OSL_DEBUG_LEVEL > 2 @@ -62,12 +59,6 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) CONSTNAME, nVal ), nVal ); } -/****************** C O D E **********************************************/ -/************************************************************************* -|* RscTypCont::InitLangType() -|* -|* Beschreibung -*************************************************************************/ typedef boost::unordered_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; static langmap ULong_Iso_map; @@ -198,11 +189,6 @@ RscEnum * RscTypCont::InitLangType() return( &aLangType ); } -/************************************************************************* -|* -|* RscTypCont::InitFieldUnitsType() -|* -*************************************************************************/ RscEnum * RscTypCont::InitFieldUnitsType() { RscEnum * pFieldUnits; @@ -227,11 +213,6 @@ RscEnum * RscTypCont::InitFieldUnitsType() return pFieldUnits; } -/************************************************************************* -|* -|* RscTypCont::InitTimeFieldFormat() -|* -*************************************************************************/ RscEnum * RscTypCont::InitTimeFieldFormat() { RscEnum * pTimeFieldFormat; @@ -245,11 +226,6 @@ RscEnum * RscTypCont::InitTimeFieldFormat() return pTimeFieldFormat; } -/************************************************************************* -|* -|* RscTypCont::InitColor() -|* -*************************************************************************/ RscEnum * RscTypCont::InitColor(){ RscEnum * pColor; pColor = new RscEnum( pHS->getID( "EnumColor" ), RSC_NOTYPE ); @@ -274,11 +250,6 @@ RscEnum * RscTypCont::InitColor(){ return( pColor ); } -/************************************************************************* -|* -|* RscTypCont::InitMapUnit() -|* -*************************************************************************/ RscEnum * RscTypCont::InitMapUnit(){ RscEnum * pMapUnit; pMapUnit = new RscEnum( pHS->getID( "EnumMapUnit" ), RSC_NOTYPE ); @@ -300,11 +271,6 @@ RscEnum * RscTypCont::InitMapUnit(){ return( pMapUnit ); } -/************************************************************************* -|* -|* RscTypCont::InitKey() -|* -*************************************************************************/ RscEnum * RscTypCont::InitKey(){ RscEnum * pKey; pKey = new RscEnum( pHS->getID( "EnumKey" ), RSC_NOTYPE ); @@ -420,11 +386,6 @@ RscEnum * RscTypCont::InitKey(){ return( pKey ); } -/************************************************************************* -|* -|* RscTypCont::InitTriState() -|* -*************************************************************************/ RscEnum * RscTypCont::InitTriState(){ RscEnum * pTriState; pTriState = new RscEnum( pHS->getID( "EnumTriState" ), RSC_NOTYPE ); @@ -436,11 +397,6 @@ RscEnum * RscTypCont::InitTriState(){ return( pTriState ); } -/************************************************************************* -|* -|* RscTypCont::InitMessButtons() -|* -*************************************************************************/ RscEnum * RscTypCont::InitMessButtons() { RscEnum * pMessButtons; @@ -454,11 +410,6 @@ RscEnum * RscTypCont::InitMessButtons() return( pMessButtons ); } -/************************************************************************* -|* -|* RscTypCont::InitMessDefButton() -|* -*************************************************************************/ RscEnum * RscTypCont::InitMessDefButton(){ RscEnum * pMessDefButton; pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ), @@ -473,11 +424,6 @@ RscEnum * RscTypCont::InitMessDefButton(){ return( pMessDefButton ); } -/************************************************************************* -|* -|* RscTypCont::InitGeometry() -|* -*************************************************************************/ RscTupel * RscTypCont::InitGeometry() { RscTop * pTupel; @@ -498,21 +444,11 @@ RscTupel * RscTypCont::InitGeometry() return (RscTupel *)pTupel; } -/************************************************************************* -|* -|* RscTypCont::InitLangGeometry() -|* -*************************************************************************/ RscArray * RscTypCont::InitLangGeometry( RscTupel * pGeo ) { return new RscArray( pHS->getID( "Lang_TupelGeometry" ), RSC_NOTYPE, pGeo, &aLangType ); } -/************************************************************************* -|* -|* RscTypCont::InitStringList() -|* -*************************************************************************/ RscCont * RscTypCont::InitStringList() { RscCont * pCont; @@ -523,22 +459,12 @@ RscCont * RscTypCont::InitStringList() return pCont; } -/************************************************************************* -|* -|* RscTypCont::InitLangStringList() -|* -*************************************************************************/ RscArray * RscTypCont::InitLangStringList( RscCont * pStrLst ) { return new RscArray( pHS->getID( "Lang_CharsList" ), RSC_NOTYPE, pStrLst, &aLangType ); } -/************************************************************************* -|* -|* RscTypCont::InitStringTupel() -|* -*************************************************************************/ RscTupel * RscTypCont::InitStringTupel() { RscTop * pTupel; @@ -554,11 +480,6 @@ RscTupel * RscTypCont::InitStringTupel() return (RscTupel *)pTupel; } -/************************************************************************* -|* -|* RscTypCont::InitStringLongTupel() -|* -*************************************************************************/ RscTupel * RscTypCont::InitStringLongTupel() { RscTop * pTupel; @@ -574,11 +495,6 @@ RscTupel * RscTypCont::InitStringLongTupel() return (RscTupel *)pTupel; } -/************************************************************************* -|* -|* RscTypCont::InitStringTupelList() -|* -*************************************************************************/ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) { RscCont * pCont; @@ -589,11 +505,6 @@ RscCont * RscTypCont::InitStringTupelList( RscTupel * pTupelString ) return pCont; } -/************************************************************************* -|* -|* RscTypCont::InitStringLongTupelList() -|* -*************************************************************************/ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) { RscCont * pCont; @@ -604,22 +515,12 @@ RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) return pCont; } -/************************************************************************* -|* -|* RscTypCont::InitLangStringTupelList() -|* -*************************************************************************/ RscArray * RscTypCont::InitLangStringTupelList( RscCont * pStrTupelLst ) { return new RscArray( pHS->getID( "Lang_CharsCharsTupel" ), RSC_NOTYPE, pStrTupelLst, &aLangType ); } -/************************************************************************* -|* -|* RscTypCont::InitLangStringLongTupelList() -|* -*************************************************************************/ RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst ) { return new RscArray( pHS->getID( "Lang_CharsLongTupelList" ), diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index bb1fa3b7e367..d302deef625e 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -18,8 +18,6 @@ */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> @@ -35,9 +33,6 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -/************************************************************************* -|* RscTypCont::InsWinBit() -*************************************************************************/ void RscTypCont::InsWinBit( RscTop * pClass, const rtl::OString& rName, Atom nVal ) { @@ -55,9 +50,6 @@ void RscTypCont::InsWinBit( RscTop * pClass, const rtl::OString& rName, #define INS_WINBIT( pClass, WinBit ) \ InsWinBit( pClass, #WinBit, n##WinBit##Id ); -/************************************************************************* -|* RscTypCont::InitClassMgr() -*************************************************************************/ RscTop * RscTypCont::InitClassMgr() { RscTop * pClassMgr; @@ -89,9 +81,6 @@ RscTop * RscTypCont::InitClassMgr() return pClassMgr; } -/************************************************************************* -|* RscTypCont::InitClassString() -*************************************************************************/ RscTop * RscTypCont::InitClassString( RscTop * pSuper ){ Atom nId; RscTop * pClassString; @@ -107,9 +96,6 @@ RscTop * RscTypCont::InitClassString( RscTop * pSuper ){ return( pClassString ); } -/************************************************************************* -|* RscTypCont::InitClassBitmap() -*************************************************************************/ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){ Atom nId; RscTop * pClassBitmap; @@ -127,9 +113,6 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper ){ return( pClassBitmap ); } -/************************************************************************* -|* RscTypCont::InitClassColor() -*************************************************************************/ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){ Atom nId; RscTop * pClassColor; @@ -153,9 +136,6 @@ RscTop * RscTypCont::InitClassColor( RscTop * pSuper, RscEnum * pColor ){ return( pClassColor ); } -/************************************************************************* -|* RscTypCont::InitClassImage() -*************************************************************************/ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassColor ) { @@ -180,9 +160,6 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap, return( pClassImage ); } -/************************************************************************* -|* RscTypCont::InitClassImageList() -*************************************************************************/ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * pClassColor, RscCont * pStrLst ) { @@ -218,9 +195,6 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, return( pClassImageList ); } -/************************************************************************* -|* RscTypCont::InitClassWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, RscArray * pLangGeo ) { @@ -326,9 +300,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, return( pClassWindow ); } -/************************************************************************* -|* RscTypCont::InitClassSystemWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper ) { Atom nId; @@ -351,9 +322,6 @@ RscTop * RscTypCont::InitClassSystemWindow( RscTop * pSuper ) return pClassSystemWindow ; } -/************************************************************************* -|* RscTypCont::InitClassWorkWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) { Atom nId; @@ -386,9 +354,6 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper ) return pClassWorkWindow; } -/************************************************************************* -|* RscTypCont::InitClassDialogBox() -*************************************************************************/ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper ) { Atom nId; @@ -405,9 +370,6 @@ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper ) return pClassDialog; } -/************************************************************************* -|* RscTypCont::InitClassModelessDialog() -*************************************************************************/ RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper ) { Atom nId; @@ -422,9 +384,6 @@ RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper ) return pClassDialog; } -/************************************************************************* -|* RscTypCont::InitClassControl() -*************************************************************************/ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) { Atom nId; @@ -442,9 +401,6 @@ RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) return pClassControl; } -/************************************************************************* -|* RscTypCont::InitClassCheckBox() -*************************************************************************/ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) { Atom nId; @@ -468,9 +424,6 @@ RscTop * RscTypCont::InitClassCheckBox( RscTop * pSuper ) return pClassCheckBox; } -/************************************************************************* -|* RscTypCont::InitClassPushButton() -*************************************************************************/ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) { Atom nId; @@ -490,9 +443,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper ) return pClassPushButton; } -/************************************************************************* -|* RscTypCont::InitClassTriStateBox() -*************************************************************************/ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper, RscEnum * pTriState ) { @@ -513,9 +463,6 @@ RscTop * RscTypCont::InitClassTriStateBox( RscTop * pSuper, return( pClassTriStateBox ); } -/************************************************************************* -|* RscTypCont::InitClassMenuButton() -*************************************************************************/ RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper, RscTop * pClassMenu ) { @@ -536,9 +483,6 @@ RscTop * RscTypCont::InitClassMenuButton( RscTop * pSuper, } -/************************************************************************* -|* RscTypCont::InitClassImageButton() -*************************************************************************/ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, RscTop * pClassImage, RscEnum * pTriState ) @@ -606,9 +550,6 @@ RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper, return pClassImageButton; } -/************************************************************************* -|* RscTypCont::InitClassEdit() -*************************************************************************/ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) { Atom nId; @@ -632,9 +573,6 @@ RscTop * RscTypCont::InitClassEdit( RscTop * pSuper ) return pClassEdit; } -/************************************************************************* -|* RscTypCont::InitClassMultiLineedit() -*************************************************************************/ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper ) { Atom nId; @@ -655,9 +593,6 @@ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper ) return pClassMultiLineEdit; } -/************************************************************************* -|* RscTypCont::InitClassScrollBar() -*************************************************************************/ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) { Atom nId; @@ -713,9 +648,6 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) return pClassScrollBar; } -/************************************************************************* -|* RscTypCont::InitClassListBox() -*************************************************************************/ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) { Atom nId; @@ -748,9 +680,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) return pClassListBox; } -/************************************************************************* -|* RscTypCont::InitClassMultiListBox() -*************************************************************************/ RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper ) { Atom nId; @@ -767,9 +696,6 @@ RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper ) return pClassMultiListBox; } -/************************************************************************* -|* RscTypCont::InitClassComboBox() -*************************************************************************/ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) { Atom nId; @@ -796,9 +722,6 @@ RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) return pClassComboBox; } -/************************************************************************* -|* RscTypCont::InitClassFixedText() -*************************************************************************/ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) { Atom nId; @@ -824,9 +747,6 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) return pClassFixedText; } -/************************************************************************* -|* RscTypCont::InitClassFixedBitmap() -*************************************************************************/ RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap ) { Atom nId; @@ -847,9 +767,6 @@ RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitma return pClassFixedBitmap; } -/************************************************************************* -|* RscTypCont::InitClassFixedImage() -*************************************************************************/ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ) { Atom nId; @@ -868,9 +785,6 @@ RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage return pClassFixedImage; } -/************************************************************************* -|* RscTypCont::InitClassImageRadioButton() -*************************************************************************/ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) { Atom nId; @@ -894,9 +808,6 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper ) return pClassRadioButton; } -/************************************************************************* -|* RscTypCont::InitClassImageRadioButton() -*************************************************************************/ RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage ) { Atom nId; @@ -916,9 +827,6 @@ RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClass return pClassImageRadioButton; } -/************************************************************************* -|* RscTypCont::InitClassKeyCode() -*************************************************************************/ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { Atom nId; @@ -1009,9 +917,6 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) return pClassKeyCode; } -/************************************************************************* -|* RscTypCont::InitClassAccelItem() -*************************************************************************/ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, RscTop * pClassKeyCode ) { @@ -1035,9 +940,6 @@ RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, return pClassAccelItem; } -/************************************************************************* -|* RscTypCont::InitClassAccelm() -*************************************************************************/ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) { Atom nId; @@ -1066,9 +968,6 @@ RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) return pClassAccel; } -/************************************************************************* -|* RscTypCont::InitClassMenuItem() -*************************************************************************/ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassKeyCode ) @@ -1179,9 +1078,6 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, return pClassMenuItem; } -/************************************************************************* -|* RscTypCont::InitClassMenu() -*************************************************************************/ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, RscTop * pClassMenuItem ) { @@ -1212,9 +1108,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, return pClassMenu; } -/************************************************************************* -|* RscTypCont::InitClassMessageBox() -*************************************************************************/ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, RscEnum * pMessButtons, RscEnum * pMessDefButton ) @@ -1247,9 +1140,6 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, return pClassMessBox; } -/************************************************************************* -|* RscTypCont::InitClassSplitter() -*************************************************************************/ RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper ) { Atom nId; @@ -1268,9 +1158,6 @@ RscTop * RscTypCont::InitClassSplitter( RscTop * pSuper ) return pClassSplitter; } -/************************************************************************* -|* RscTypCont::InitClassSplitWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) { Atom nId; @@ -1289,9 +1176,6 @@ RscTop * RscTypCont::InitClassSplitWindow( RscTop * pSuper ) return pClassSplitWindow; } -/************************************************************************* -|* RscTypCont::InitClassTime() -*************************************************************************/ RscTop * RscTypCont::InitClassTime( RscTop * pSuper ) { Atom nId; @@ -1320,9 +1204,6 @@ RscTop * RscTypCont::InitClassTime( RscTop * pSuper ) return pClassTime; } -/************************************************************************* -|* RscTypCont::InitClassDate() -*************************************************************************/ RscTop * RscTypCont::InitClassDate( RscTop * pSuper ) { Atom nId; @@ -1348,9 +1229,6 @@ RscTop * RscTypCont::InitClassDate( RscTop * pSuper ) return pClassDate; } -/************************************************************************* -|* RscTypCont::InitClassPatternFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper ) { Atom nId; @@ -1375,9 +1253,6 @@ RscTop * RscTypCont::InitClassPatternFormatter( RscTop * pSuper ) return pClassPattern; } -/************************************************************************* -|* RscTypCont::InitClassNumericFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) { Atom nId; @@ -1411,9 +1286,6 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper ) return pClassNumeric; } -/************************************************************************* -|* RscTypCont::InitClassMetricFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, RscEnum * pFieldUnits ) { @@ -1436,9 +1308,6 @@ RscTop * RscTypCont::InitClassMetricFormatter( RscTop * pSuper, return pClassMetric; } -/************************************************************************* -|* RscTypCont::InitClassCurrencyFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassCurrencyFormatter(RscTop * pSuper) { Atom nId; @@ -1452,9 +1321,6 @@ RscTop * RscTypCont::InitClassCurrencyFormatter(RscTop * pSuper) return pClassCurrency; } -/************************************************************************* -|* RscTypCont::InitClassDateFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper, RscTop * pClassDate ) { @@ -1486,9 +1352,6 @@ RscTop * RscTypCont::InitClassDateFormatter( RscTop * pSuper, return pClassDateF; } -/************************************************************************* -|* RscTypCont::InitClassTimeFormatter() -*************************************************************************/ RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper, RscTop * pClassTime, RscEnum * pTimeFieldFormat ) @@ -1524,9 +1387,6 @@ RscTop * RscTypCont::InitClassTimeFormatter( RscTop * pSuper, return pClassTimeF; } -/************************************************************************* -|* RscTypCont::InitClassSpinField() -*************************************************************************/ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) { Atom nId; @@ -1545,9 +1405,6 @@ RscTop * RscTypCont::InitClassSpinField( RscTop * pSuper ) return pClassSpinField; } -/************************************************************************* -|* RscTypCont::InitClassPatternField() -*************************************************************************/ RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper ) { Atom nId; @@ -1563,9 +1420,6 @@ RscTop * RscTypCont::InitClassPatternField( RscTop * pSuper ) return pClassPatternField; } -/************************************************************************* -|* RscTypCont::InitClassNumericField() -*************************************************************************/ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper ) { Atom nId; @@ -1591,9 +1445,6 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper ) return pClassNumericField; } -/************************************************************************* -|* RscTypCont::InitClassMetricField() -*************************************************************************/ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) { Atom nId; @@ -1620,9 +1471,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop * pSuper ) return pClassMetricField; } -/************************************************************************* -|* RscTypCont::InitClassCurrencyField() -*************************************************************************/ RscTop * RscTypCont::InitClassCurrencyField ( const char * pClassName, @@ -1654,9 +1502,6 @@ RscTop * RscTypCont::InitClassCurrencyField return pClassCurrencyField; } -/************************************************************************* -|* RscTypCont::InitClassDateField() -*************************************************************************/ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate ) { Atom nId; @@ -1678,9 +1523,6 @@ RscTop * RscTypCont::InitClassDateField( RscTop * pSuper, RscTop * pClassDate ) return pClassDateField; } -/************************************************************************* -|* RscTypCont::InitClassTimeField() -*************************************************************************/ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ) { Atom nId; @@ -1702,9 +1544,6 @@ RscTop * RscTypCont::InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ) return pClassTimeField; } -/************************************************************************* -|* RscTypCont::InitClassPatternBox() -*************************************************************************/ RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper ) { Atom nId; @@ -1720,9 +1559,6 @@ RscTop * RscTypCont::InitClassPatternBox( RscTop * pSuper ) return pClassPatternBox; } -/************************************************************************* -|* RscTypCont::InitClassNumericBox() -*************************************************************************/ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) { Atom nId; @@ -1740,9 +1576,6 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) return pClassNumericBox; } -/************************************************************************* -|* RscTypCont::InitClassMetricBox() -*************************************************************************/ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper ) { Atom nId; @@ -1760,9 +1593,6 @@ RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper ) return pClassMetricBox; } -/************************************************************************* -|* RscTypCont::InitClassCurrencyBox() -*************************************************************************/ RscTop * RscTypCont::InitClassCurrencyBox ( const char * pClassName, @@ -1785,9 +1615,6 @@ RscTop * RscTypCont::InitClassCurrencyBox return pClassCurrencyBox; } -/************************************************************************* -|* RscTypCont::InitClassDateBox() -*************************************************************************/ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper ) { Atom nId; @@ -1805,9 +1632,6 @@ RscTop * RscTypCont::InitClassDateBox( RscTop * pSuper ) return pClassDateBox; } -/************************************************************************* -|* RscTypCont::InitClassTimeBox() -*************************************************************************/ RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper ) { Atom nId; @@ -1825,9 +1649,6 @@ RscTop * RscTypCont::InitClassTimeBox( RscTop * pSuper ) return pClassTimeBox; } -/************************************************************************* -|* RscTypCont::InitClassDockWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { @@ -1865,9 +1686,6 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, return pClassDockWindow; } -/************************************************************************* -|* RscTypCont::InitClassToolBoxItem() -*************************************************************************/ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, @@ -1998,9 +1816,6 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, return pClassToolBoxItem; } -/************************************************************************* -|* RscTypCont::InitClassToolBox() -*************************************************************************/ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem, RscTop * pClassImageList ) @@ -2082,9 +1897,6 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, return pClassToolBox; } -/************************************************************************* -|* RscTypCont::InitClassStatusBar() -*************************************************************************/ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper ) { Atom nId; @@ -2103,9 +1915,6 @@ RscTop * RscTypCont::InitClassStatusBar( RscTop * pSuper ) return pClassStatusBar; } -/************************************************************************* -|* RscTypCont::InitClassMoreButton() -*************************************************************************/ RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit ) { Atom nId; @@ -2131,9 +1940,6 @@ RscTop * RscTypCont::InitClassMoreButton( RscTop * pSuper, RscEnum * pMapUnit ) return pClassMoreButton; } -/************************************************************************* -|* RscTypCont::InitClassFloatingWindow() -*************************************************************************/ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, RscEnum * pMapUnit ) { @@ -2168,9 +1974,6 @@ RscTop * RscTypCont::InitClassFloatingWindow( RscTop * pSuper, return pClassFloatingWindow; } -/************************************************************************* -|* RscTypCont::InitClassTabControlItem() -*************************************************************************/ RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper ) { Atom nId; @@ -2195,9 +1998,6 @@ RscTop * RscTypCont::InitClassTabControlItem( RscTop * pSuper ) return pClassTabControlItem; } -/************************************************************************* -|* RscTypCont::InitClassTabControl() -*************************************************************************/ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper, RscTop * pClassTabControlItem ) { @@ -2226,9 +2026,6 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper, return pClassTabControl; } -/************************************************************************* -|* RscTypCont::InitClassSfxFamilyStyleItem() -*************************************************************************/ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, @@ -2276,9 +2073,6 @@ RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, return pClassSfxFamilyStyleItem; } -/************************************************************************* -|* RscTypCont::InitClassSfxTemplateDialogm() -*************************************************************************/ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, RscTop * pClassFamilyStyleItem ) { @@ -2305,9 +2099,6 @@ RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, return pClassSfxTemplateDialog; } -/************************************************************************* -|* RscTypCont::InitClassSfxSlotInfo() -*************************************************************************/ RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 541af05c6ee5..8803a01f3e99 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -18,8 +18,6 @@ */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> @@ -27,7 +25,6 @@ #include <vclrsc.hxx> -// Programmabhaengige Includes. #include <rsctree.hxx> #include <rsctop.hxx> #include <rscrange.hxx> @@ -43,15 +40,9 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -/****************** M a c r o s ******************************************/ #define INS_WINBIT( pClass, WinBit ) \ InsWinBit( pClass, #WinBit, n##WinBit##Id ); -/************************************************************************* -|* -|* RscTypCont::Init() -|* -*************************************************************************/ void RscTypCont::Init() { RscEnum * pFieldUnits; @@ -159,7 +150,6 @@ void RscTypCont::Init() aNmTb.SetSort( sal_False ); { - /********** C O M P I L E R T Y P E N ******************************/ aNmTb.Put( "LINE", LINE, (long)0 ); aNmTb.Put( "NOT", NOT, (long)0 ); aNmTb.Put( "DEFINE", DEFINE, (long)0 ); @@ -182,29 +172,21 @@ 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 ************************************/ { - /********** S H O R T ************************************************/ aShort.SetRange( -32768, 32767 ); - /********** U S H O R T **********************************************/ aUShort.SetRange( 0, 0xFFFF ); - /********** L O N G **************************************************/ aLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 ); aEnumLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 ); - /********** I D U S H O R T ******************************************/ aIdUShort.SetRange( 0, 0xFFFF ); - /********** I D N O Z E R O U S H O R T ******************************/ aIdNoZeroUShort.SetRange( 1, 0xFFFF ); - /********** N O Z E R O S H O R T ************************************/ aNoZeroShort.SetRange( -32768, 32767 ); aNoZeroShort.SetOutRange( 0 ); - /********** R A N G E S H O R T **************************************/ a1to12Short.SetRange( 1, 12 ); a0to23Short.SetRange( 0, 23 ); a1to31Short.SetRange( 1, 31 ); @@ -212,11 +194,9 @@ void RscTypCont::Init() a0to99Short.SetRange( 0, 99 ); a0to9999Short.SetRange( 0, 9999 ); - /********** I D R A N G E ********************************************/ aIdLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 ); } { - /********** W I N B I T S F L A G ************************************/ // Variablenname fuer WinBits nWinBitVarId = aNmTb.Put( "_WinBits", VARNAME ); @@ -335,7 +315,6 @@ void RscTypCont::Init() aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<sal_Int32>(WB_STDPOPUP) ); } { - /********** I n i t B a s i c T y p e s **************************/ InitLangType(); aBaseLst.push_back( pFieldUnits = InitFieldUnitsType() ); aBaseLst.push_back( pTimeFieldFormat = InitTimeFieldFormat() ); @@ -358,23 +337,18 @@ void RscTypCont::Init() aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) ); } { - /********** R E S O U R C E T Y P E N ******************************/ - /********** R S C M G R **********************************************/ pRoot = pClassMgr = InitClassMgr(); - /********** V e r s i o n s k o n t r o l l e ************************/ aVersion.pClass = new RscClass( pHS->getID( "VersionControl" ), RSC_VERSIONCONTROL, pClassMgr ); aVersion = aVersion.pClass->Create( NULL, RSCINST() ); - /********** S T R I N G **********************************************/ pClassString = InitClassString( pClassMgr ); pRoot->Insert( pClassString ); // String als Referenzklasse des Basisstrings einsetzen aString.SetRefClass( pClassString ); - /********** S T R I N G L I S T **************************************/ // Klasse anlegen nId = pHS->getID( "StringArray" ); pClassStringArray = new RscClass( nId, RSC_STRINGARRAY, pClassMgr ); @@ -386,64 +360,52 @@ void RscTypCont::Init() nId = aNmTb.Put( "ItemList", VARNAME ); pClassStringArray->SetVariable( nId, pLangStringLongTupelList ); - /********** B I T M A P **********************************************/ pClassBitmap = InitClassBitmap( pClassMgr ); pRoot->Insert( pClassBitmap ); } { - /********** C O L O R ************************************************/ pClassColor = InitClassColor( pClassMgr, pColor ); pRoot->Insert( pClassColor ); - /********** I M A G E ************************************************/ pClassImage = InitClassImage( pClassMgr, pClassBitmap, pClassColor ); pRoot->Insert( pClassImage ); - /********** I M A G E L I S T ****************************************/ pClassImageList = InitClassImageList( pClassMgr, pClassColor, pStringLongTupelList ); pRoot->Insert( pClassImageList ); - /********** W I N D O W **********************************************/ pClassWindow = InitClassWindow( pClassMgr, pMapUnit, pLangGeometry ); pRoot->Insert( pClassWindow ); } { - /********** S Y S T E M W I N D O W **********************************/ pClassSystemWindow = InitClassSystemWindow( pClassWindow ); //aBaseLst.Insert( pClassSystemWindow, LIST_APPEND ); pRoot->Insert( pClassSystemWindow ); - /********** W O R K W I N D O W **************************************/ pClassWorkWindow = InitClassWorkWindow( pClassSystemWindow ); pRoot->Insert( pClassWorkWindow ); - /********** D I A L O G **********************************************/ // Klasse anlegen pClassDialog = new RscClass( pHS->getID( "Dialog" ), RSC_DIALOG, pClassSystemWindow ); pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); aBaseLst.push_back( pClassDialog ); - /********** M O D A L D I A L O G ***********************************/ // Klasse anlegen pClassModalDialog = InitClassModalDialog( pClassDialog ); pRoot->Insert( pClassModalDialog ); - /********** M O D E L E S S D I A L O G ******************************/ // Klasse anlegen pClassModelessDialog = InitClassModelessDialog( pClassDialog ); pRoot->Insert( pClassModelessDialog ); } { - /********** C O N T R O L ********************************************/ pClassControl = InitClassControl( pClassWindow ); pRoot->Insert( pClassControl ); - /********** B U T T O N **********************************************/ // Klasse anlegen nId = pHS->getID( "Button" ); pClassButton = new RscClass( nId, RSC_BUTTON, pClassControl ); @@ -451,16 +413,13 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassButton ); pRoot->Insert( pClassButton ); - /********** C H E C K B O X ******************************************/ pClassCheckBox = InitClassCheckBox( pClassButton ); pRoot->Insert( pClassCheckBox ); - /********** P U S H B U T T O N **************************************/ // Klasse anlegen pClassPushButton = InitClassPushButton( pClassButton ); pRoot->Insert( pClassPushButton ); - /********** H E L P B U T T O N **************************************/ // Klasse anlegen nId = pHS->getID( "HelpButton" ); pClassHelpButton = new RscClass( nId, RSC_HELPBUTTON, @@ -469,7 +428,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassHelpButton ); pRoot->Insert( pClassHelpButton ); - /********** O K B U T T O N ******************************************/ // Klasse anlegen nId = pHS->getID( "OKButton" ); pClassOKButton = new RscClass( nId, RSC_OKBUTTON, @@ -478,7 +436,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassOKButton ); pRoot->Insert( pClassOKButton ); - /********** C A N C E L B U T T O N **********************************/ // Klasse anlegen nId = pHS->getID( "CancelButton" ); pClassCancelButton = new RscClass( nId, RSC_CANCELBUTTON, @@ -488,64 +445,50 @@ void RscTypCont::Init() pRoot->Insert( pClassCancelButton ); } { - /********** R A D I O B U T T O N ************************************/ pClassRadioButton = InitClassRadioButton( pClassButton ); pRoot->Insert( pClassRadioButton ); - /********** I m a g e R a d i o B u t t o n **************************/ nId = pHS->getID( "ImageRadioButton" ); pClassImageRadioButton = InitClassImageRadioButton( pClassRadioButton, pClassImage ); pRoot->Insert( pClassImageRadioButton ); - /********** T R I S T A T E B O X ************************************/ pClassTriStateBox = InitClassTriStateBox( pClassControl, pTriState ); pRoot->Insert( pClassTriStateBox ); - /********** I M A G E B U T T O N ************************************/ pClassImageButton = InitClassImageButton( pClassPushButton, pClassImage, pTriState ); pRoot->Insert( pClassImageButton ); - /********** E D I T **************************************************/ pClassEdit = InitClassEdit( pClassControl ); pRoot->Insert( pClassEdit ); - /********** M U L T I L I N E E D I T ********************************/ pClassMultiLineEdit = InitClassMultiLineEdit( pClassEdit ); pRoot->Insert( pClassMultiLineEdit ); - /********** S C R O L L B A R ****************************************/ pClassScrollBar = InitClassScrollBar( pClassControl ); pRoot->Insert( pClassScrollBar ); } { - /********** L I S T B O X ********************************************/ pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList ); pRoot->Insert( pClassListBox ); - /********** M U L T I L I S T B O X **********************************/ pClassMultiListBox = InitClassMultiListBox( pClassListBox); pRoot->Insert( pClassMultiListBox ); - /********** C O M B O B O X ******************************************/ pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList ); pRoot->Insert( pClassComboBox ); - /********** F I X E D T E X T ****************************************/ pClassFixedText = InitClassFixedText( pClassControl ); pRoot->Insert( pClassFixedText ); - /********** F i x e d B i t m a p ************************************/ pClassFixedBitmap = InitClassFixedBitmap( pClassControl, pClassBitmap ); pRoot->Insert( pClassFixedBitmap ); - /********** F i x e d I m a g e **************************************/ pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage ); pRoot->Insert( pClassFixedImage ); - /********** G R O U P B O X ******************************************/ // Klasse anlegen nId = pHS->getID( "GroupBox" ); pClassGroupBox = new RscClass( nId, RSC_GROUPBOX, pClassControl ); @@ -553,7 +496,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassGroupBox ); pRoot->Insert( pClassGroupBox ); - /********** K E Y C O D E ********************************************/ pClassKeyCode = InitClassKeyCode( pClassMgr, pKey ); pRoot->Insert( pClassKeyCode ); { @@ -562,47 +504,38 @@ void RscTypCont::Init() aBaseLst.push_back( pLangClassKeyCode ); } - /********** A C C E L I T E M ***************************************/ pClassAccelItem = InitClassAccelItem( pClassMgr, pLangClassKeyCode ); pRoot->Insert( pClassAccelItem ); } { - /********** A C C E L E R A T O R ************************************/ pClassAccel = InitClassAccel( pClassMgr, pClassAccelItem ); pRoot->Insert( pClassAccel ); nAcceleratorType = pClassAccel->GetId(); - /********** A C C E L I T E M ***************************************/ // pClassAccel ist erst hier definiert nId = aNmTb.Put( "SubAccelerator", VARNAME ); pClassAccelItem->SetVariable( nId, pClassAccel, NULL, VAR_SVDYNAMIC, ACCELITEM_ACCEL ); - /********** M E N U I T E M ******************************************/ pClassMenuItem = InitClassMenuItem( pClassMgr, pClassBitmap, pLangClassKeyCode ); pRoot->Insert( pClassMenuItem ); - /********** M E N U **************************************************/ pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem ); pRoot->Insert( pClassMenu ); - /********** M E N U I T E M ******************************************/ // pClassMenu ist erst hier definiert nId = aNmTb.Put( "SubMenu", VARNAME ); pClassMenuItem->SetVariable( nId, pClassMenu, NULL, VAR_SVDYNAMIC, RSC_MENUITEM_MENU ); - /********** M E N U B U T T O N **************************************/ pClassMenuButton = InitClassMenuButton( pClassControl, pClassMenu ); pRoot->Insert( pClassMenuButton ); - /********** M E S S A G E B O X **************************************/ pClassMessBox = InitClassMessBox( pClassMgr, pMessButtons, pMessDefButton ); pRoot->Insert( pClassMessBox ); - /********** I N F O B O X ********************************************/ // Klasse anlegen nId = pHS->getID( "InfoBox" ); pClassInfoBox = new RscClass( nId, RSC_INFOBOX, pClassMessBox ); @@ -610,7 +543,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassInfoBox ); pRoot->Insert( pClassInfoBox ); - /********** W A R N I N G B O X **************************************/ // Klasse anlegen nId = pHS->getID( "WarningBox" ); pClassWarningBox = new RscClass( nId, RSC_WARNINGBOX, pClassMessBox ); @@ -618,7 +550,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassWarningBox ); pRoot->Insert( pClassWarningBox ); - /********** E R R O R B O X ******************************************/ // Klasse anlegen nId = pHS->getID( "ErrorBox" ); pClassErrorBox = new RscClass( nId, RSC_ERRORBOX, pClassMessBox ); @@ -626,7 +557,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassErrorBox ); pRoot->Insert( pClassErrorBox ); - /********** Q U E R Y B O X ******************************************/ // Klasse anlegen nId = pHS->getID( "QueryBox" ); pClassQueryBox = new RscClass( nId, RSC_QUERYBOX, pClassMessBox ); @@ -635,15 +565,12 @@ void RscTypCont::Init() pRoot->Insert( pClassQueryBox ); } { - /********** S P L I T T E R ******************************************/ pClassSplitter = InitClassSplitter( pClassWindow ); pRoot->Insert( pClassSplitter ); - /********** S P L I T W I N D O W ************************************/ pClassSplitWindow = InitClassSplitWindow( pClassWindow ); pRoot->Insert( pClassSplitWindow ); - /********** S P I N B U T T O N **************************************/ // Klasse anlegen nId = pHS->getID( "SpinButton" ); pClassSpinButton = new RscClass( nId, RSC_SPINBUTTON, pClassControl ); @@ -664,21 +591,17 @@ void RscTypCont::Init() pRoot->Insert( pClassSpinButton ); } { - /********** T I M E **************************************************/ pClassTime = InitClassTime( pClassMgr ); pRoot->Insert( pClassTime ); - /********** D A T E **************************************************/ pClassDate = InitClassDate( pClassMgr ); pRoot->Insert( pClassDate ); } { - /********** S P I N F I E L D ****************************************/ pClassSpinField = InitClassSpinField( pClassEdit ); pRoot->Insert( pClassSpinField ); } { - /********** P A T T E R N F I E L D **********************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassPatternFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); @@ -686,7 +609,6 @@ void RscTypCont::Init() pClassPatternField = InitClassPatternField( pClassTmp ); pRoot->Insert( pClassPatternField ); } - /********** N U M E R I C F I E L D **********************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); @@ -694,7 +616,6 @@ void RscTypCont::Init() pClassNumericField = InitClassNumericField( pClassTmp ); pRoot->Insert( pClassNumericField ); } - /********** M E T R I C F I E L D ************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); @@ -704,7 +625,6 @@ void RscTypCont::Init() pClassMetricField = InitClassMetricField( pClassTmp ); pRoot->Insert( pClassMetricField ); } - /********** C U R R E N C Y F I E L D ********************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassSpinField ); aBaseLst.push_back( pClassTmp ); @@ -718,7 +638,6 @@ void RscTypCont::Init() pRoot->Insert( pClassLongCurrencyField ); } - /********** D A T E F I E L D ****************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassDateFormatter( pClassSpinField, pClassDate ); aBaseLst.push_back( pClassTmp ); @@ -726,7 +645,6 @@ void RscTypCont::Init() pClassDateField = InitClassDateField( pClassTmp, pClassDate ); pRoot->Insert( pClassDateField ); } - /********** T I M E F I E L D ****************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassTimeFormatter( pClassSpinField, pClassTime, pTimeFieldFormat ); @@ -735,7 +653,6 @@ void RscTypCont::Init() pClassTimeField = InitClassTimeField( pClassTmp, pClassTime ); pRoot->Insert( pClassTimeField ); } - /********** P A T T E R N B O X **************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassPatternFormatter( pClassComboBox ); aBaseLst.push_back( pClassTmp ); @@ -743,7 +660,6 @@ void RscTypCont::Init() pClassPatternBox = InitClassPatternBox( pClassTmp ); pRoot->Insert( pClassPatternBox ); } - /********** N U M E R I C B O X **************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox ); aBaseLst.push_back( pClassTmp ); @@ -753,7 +669,6 @@ void RscTypCont::Init() } } { - /********** M E T R I C B O X ****************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox ); aBaseLst.push_back( pClassTmp ); @@ -763,7 +678,6 @@ void RscTypCont::Init() pClassMetricBox = InitClassMetricBox( pClassTmp ); pRoot->Insert( pClassMetricBox ); } - /********** C U R R E N C Y B O X ************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox ); aBaseLst.push_back( pClassTmp ); @@ -776,7 +690,6 @@ void RscTypCont::Init() pClassLongCurrencyBox = InitClassCurrencyBox( "LongCurrencyBox", RSC_LONGCURRENCYBOX, pClassTmp ); pRoot->Insert( pClassLongCurrencyBox ); } - /********** D A T E B O X ********************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassDateFormatter( pClassComboBox, pClassDate ); aBaseLst.push_back( pClassTmp ); @@ -784,7 +697,6 @@ void RscTypCont::Init() pClassDateBox = InitClassDateBox( pClassTmp ); pRoot->Insert( pClassDateBox ); } - /********** T I M E B O X ********************************************/ { // Mehrfachvererbung von Hand RscTop * pClassTmp = InitClassTimeFormatter( pClassComboBox, pClassTime, pTimeFieldFormat ); @@ -793,34 +705,27 @@ void RscTypCont::Init() pClassTimeBox = InitClassTimeBox( pClassTmp ); pRoot->Insert( pClassTimeBox ); } - /********** D O C K I N G W I N D O W ********************************/ pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pRoot->Insert( pClassDockingWindow ); - /********** T O O L B O X I T E M ************************************/ pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap, pClassImage, pTriState ); pRoot->Insert( pClassToolBoxItem ); - /********** T O O L B O X ********************************************/ pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem, pClassImageList ); pRoot->Insert( pClassToolBox ); - /********** S T A T U S B A R ****************************************/ pClassStatusBar = InitClassStatusBar( pClassWindow ); pRoot->Insert( pClassStatusBar ); - /********** M O R E B U T T O N **************************************/ pClassMoreButton = InitClassMoreButton( pClassPushButton, pMapUnit ); pRoot->Insert( pClassMoreButton ); - /********** F L O A T W I N D O W ************************************/ pClassFloatingWindow = InitClassFloatingWindow( pClassSystemWindow, pMapUnit ); pRoot->Insert( pClassFloatingWindow ); - /********** T A B P A G E ********************************************/ // Klasse anlegen nId = pHS->getID( "TabPage" ); pClassTabPage = @@ -829,7 +734,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassTabPage ); pRoot->Insert( pClassTabPage ); - /********** T A B D I A L O G ****************************************/ // Klasse anlegen nId = pHS->getID( "TabDialog" ); pClassTabDialog = @@ -838,16 +742,13 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassTabDialog ); pRoot->Insert( pClassTabDialog ); - /********** T A B C O N T R O L I T E M *******************************/ pClassTabControlItem = InitClassTabControlItem( pClassMgr ); pRoot->Insert( pClassTabControlItem ); - /********** T A B C O N T R O L **************************************/ pClassTabControl = InitClassTabControl( pClassControl, pClassTabControlItem ); pRoot->Insert( pClassTabControl ); - /********** F I X E D L I N E ****************************************/ // Klasse anlegen nId = pHS->getID( "FixedLine" ); pClassFixedLine = @@ -859,7 +760,6 @@ void RscTypCont::Init() aNmTb.Put( nId, CLASSNAME, pClassFixedLine ); pRoot->Insert( pClassFixedLine ); - /********** S C R O L L B A R B O X **********************************/ // Klasse anlegen nId = pHS->getID( "ScrollBarBox" ); pClassScrollBarBox = @@ -869,19 +769,16 @@ void RscTypCont::Init() pRoot->Insert( pClassScrollBarBox ); INS_WINBIT(pClassScrollBarBox,Sizeable) - /********** S F X S T Y L E F A M I L Y I T E M **********************/ pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr, pClassBitmap, pClassImage, pLangStringLongTupelList ); pRoot->Insert( pClassSfxStyleFamilyItem ); - /********** S F X T E M P L A T E D I A L O G ************************/ pClassSfxTemplateDialog = InitClassSfxTemplateDialog( pClassMgr, pClassSfxStyleFamilyItem ); pRoot->Insert( pClassSfxTemplateDialog ); - /********** S F X I N F O I T E M ************************************/ pClassSfxSlotInfo = InitClassSfxSlotInfo( pClassMgr ); pRoot->Insert( pClassSfxSlotInfo ); } diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 6667ee058fe9..c9ed1c44dc32 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ #include <stdlib.h> #include <stdio.h> #include <ctype.h> @@ -31,8 +30,6 @@ #define _cdecl __cdecl #endif -/****************** C o d e **********************************************/ -/****************** keyword sort function ********************************/ extern "C" { int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ); } @@ -47,33 +44,18 @@ int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ) return( 0 ); } -/************************************************************************* -|* -|* RscNameTable::RscNameTable() -|* -*************************************************************************/ RscNameTable::RscNameTable() { bSort = sal_True; nEntries = 0; pTable = NULL; }; -/************************************************************************* -|* -|* RscNameTable::~RscNameTable() -|* -*************************************************************************/ RscNameTable::~RscNameTable() { if( pTable ) rtl_freeMemory( pTable ); }; -/************************************************************************* -|* -|* RscNameTable::SetSort() -|* -*************************************************************************/ void RscNameTable::SetSort( sal_Bool bSorted ){ bSort = bSorted; if( bSort && pTable){ @@ -83,11 +65,6 @@ void RscNameTable::SetSort( sal_Bool bSorted ){ }; }; -/************************************************************************* -|* -|* RscNameTable::Put() -|* -*************************************************************************/ Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, long nValue ){ if( pTable ) pTable = (KEY_STRUCT *) @@ -124,11 +101,6 @@ Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass ) return( Put( nName, nTyp, (long)pClass ) ); }; -/************************************************************************* -|* -|* RscNameTable::Get() -|* -*************************************************************************/ sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){ KEY_STRUCT * pKey = NULL; KEY_STRUCT aSearchName; diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index a78301ac1b36..fcf0733670f4 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -54,7 +54,6 @@ const char* StringContainer::putString( const char* pString ) return aInsert.first->getStr(); } -/*************************************************************************/ int c; sal_Bool bLastInclude;// War letztes Symbol INCLUDE RscFileInst* pFI; @@ -69,7 +68,6 @@ sal_Bool bTargetDefined; StringContainer* pStringContainer = NULL; -/****************** C O D E **********************************************/ sal_uInt32 GetNumber(){ sal_uInt32 l = 0; sal_uInt32 nLog = 10; @@ -307,7 +305,6 @@ int yylex() return( aKeyVal[ 0 ].nKeyWord ); } -/****************** yyerror **********************************************/ #ifdef RS6000 extern "C" void yyerror( char* pMessage ) #elif defined SOLARIS @@ -319,7 +316,6 @@ void yyerror( char* pMessage ) pTC->pEH->Error( ERR_YACC, NULL, RscId(), pMessage ); } -/****************** parser start function ********************************/ void InitParser( RscFileInst * pFileInst ) { pTC = pFileInst->pTypCont; // Datenkontainer setzten diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index 069ba3d870d4..3c000be49754 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -17,19 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <string.h> #include <rscpar.hxx> #include <rscdb.hxx> -/****************** R s c F i l e I n s t ********************************/ -/****************** C O D E **********************************************/ -/************************************************************************* -|* -|* RscFileInst::Init() -|* -*************************************************************************/ void RscFileInst::Init() { nLineNo = 0; @@ -41,11 +32,6 @@ void RscFileInst::Init() bEof = sal_False; }; -/************************************************************************* -|* -|* RscFileInst::RscFileInst() -|* -*************************************************************************/ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, sal_uLong lFIndex, FILE * fFile ) { @@ -61,11 +47,6 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, pInput = (char *)rtl_allocateMemory( nInputBufLen ); } -/************************************************************************* -|* -|* RscFileInst::~RscFileInst() -|* -*************************************************************************/ RscFileInst::~RscFileInst(){ if( pInput ) rtl_freeMemory( pInput ); @@ -73,11 +54,6 @@ RscFileInst::~RscFileInst(){ rtl_freeMemory( pLine ); } -/************************************************************************* -|* -|* RscFileInst::GetChar() -|* -*************************************************************************/ int RscFileInst::GetChar() { if( pLine[ nScanPos ] ) @@ -95,11 +71,6 @@ int RscFileInst::GetChar() } } -/************************************************************************* -|* -|* RscFileInst::GetNewLine() -|* -*************************************************************************/ void RscFileInst::GetNewLine() { nLineNo++; @@ -172,11 +143,6 @@ END: } } -/************************************************************************* -|* -|* RscFileInst::SetError() -|* -*************************************************************************/ void RscFileInst::SetError( ERRTYPE aError ) { if( aError.IsOk() ) diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 16d2833f53ac..742f58b42581 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -37,13 +37,11 @@ #include <rsclex.hxx> -/************** V a r i a b l e n ****************************************/ 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 ) { RSCINST aInst; @@ -242,7 +240,6 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) return aInst; } -/************** Y a c c C o d e ****************************************/ //#define YYDEBUG 1 #define TYPE_Atom 0 @@ -355,7 +352,6 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) %% -/********************** D E F I N I T I O N S ****************************/ resource_definitions : | resource_definitions resource_definition @@ -1137,7 +1133,6 @@ var_body | var_bodycomplex ; -/********************** work on yacc stack *******************************/ string_multiline : STRING { diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index 135c655a717a..4535b56cd2f4 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -23,16 +23,9 @@ #include <rscrsc.hxx> #include <rscdb.hxx> -/*************** 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. */ -/****************************************************************/ #if defined( UNX ) || defined ( __GNUC__ ) || defined(__MINGW32__) - void ExitProgram( void ){ + void ExitProgram( void ){ #else void cdecl ExitProgram( void ){ #endif diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 082263794aee..acf83dbf8840 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -38,7 +38,6 @@ #include <sal/main.h> #include <rtl/strbuf.hxx> -/*************** C O D E ************************************************/ // Entry point declaration for modules rscpp and rsc2 extern "C" @@ -47,11 +46,6 @@ extern "C" } int rsc2_main(int, char**); -/************************************************************************* -|* CallPrePro() -|* -|* Beschreibung -*************************************************************************/ static sal_Bool CallPrePro( const rtl::OString& rInput, const rtl::OString& rOutput, RscPtrPtr * pCmdLine, sal_Bool bResponse ) @@ -148,11 +142,6 @@ static sal_Bool CallPrePro( const rtl::OString& rInput, } -/************************************************************************* -|* CallRsc2 -|* -|* Beschreibung -*************************************************************************/ static sal_Bool CallRsc2( RscStrList * pInputList, const rtl::OString &rSrsName, RscPtrPtr * pCmdLine ) { @@ -215,11 +204,6 @@ static sal_Bool CallRsc2( RscStrList * pInputList, return( sal_True ); } -/************************************************************************* -|* -|* main() -|* -*************************************************************************/ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { sal_Bool bPrePro = sal_True; diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index 5119e3f1f078..ebd237913b67 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> -// Programmabhaengige Includes. #include <rscall.h> #include <rsckey.hxx> diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 8b8b6db7b29a..f10b9c0bf018 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -17,35 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Programmabhaengige Includes. #include <rscconst.hxx> #include <rscarray.hxx> #include <rscdb.hxx> -/****************** C O D E **********************************************/ -/****************** R s c I n s t N o d e ********************************/ -/************************************************************************* -|* -|* RscInstNode::RscInstNode() -|* -*************************************************************************/ RscInstNode::RscInstNode( sal_uInt32 nId ) { nTypeId = nId; } -/************************************************************************* -|* -|* RscInstNode::~RscInstNode() -|* -*************************************************************************/ RscInstNode::~RscInstNode() { if( aInst.IsInst() ) @@ -55,22 +40,11 @@ RscInstNode::~RscInstNode() } } -/************************************************************************* -|* -|* RscInstNode::GetId() -|* -*************************************************************************/ sal_uInt32 RscInstNode::GetId() const { return nTypeId; } -/****************** R s c A r r a y *************************************/ -/************************************************************************* -|* -|* RscArray::RscArray() -|* -*************************************************************************/ RscArray::RscArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) : RscTop( nId, nTypeId, pSuper ) { @@ -79,40 +53,20 @@ RscArray::RscArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTy nSize = nOffInstData + ALIGNED_SIZE( sizeof( RscArrayInst ) ); } -/************************************************************************* -|* -|* RscArray::~RscArray() -|* -*************************************************************************/ RscArray::~RscArray() { } -/************************************************************************* -|* -|* RscArray::~RscArray() -|* -*************************************************************************/ RSCCLASS_TYPE RscArray::GetClassType() const { return RSCCLASS_ENUMARRAY; } -/************************************************************************* -|* -|* RscArray::GetIndexType() -|* -*************************************************************************/ RscTop * RscArray::GetTypeClass() const { return pTypeClass; } -/************************************************************************* -|* -|* RscArray::Create() -|* -*************************************************************************/ static RscInstNode * Create( RscInstNode * pNode ) { RscInstNode * pRetNode = NULL; @@ -162,13 +116,6 @@ RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } -/************************************************************************* -|* -|* RscArray::Destroy() -|* -|* Beschreibung -|* -*************************************************************************/ static void Destroy( RscInstNode * pNode ) { if( pNode ) @@ -191,13 +138,6 @@ void RscArray::Destroy( const RSCINST & rInst ) ::Destroy( pClassData->pNode ); } -/************************************************************************* -|* -|* RscArray::GetValueEle() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscArray::GetValueEle ( const RSCINST & rInst, @@ -242,13 +182,6 @@ ERRTYPE RscArray::GetValueEle return aError; } -/************************************************************************* -|* -|* RscArray::GetArrayEle() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscArray::GetArrayEle ( const RSCINST & rInst, @@ -266,11 +199,6 @@ ERRTYPE RscArray::GetArrayEle return GetValueEle( rInst, lValue, pCreateClass, pGetInst ); } -/************************************************************************* -|* -|* RscArray::IsConsistent() -|* -*************************************************************************/ static sal_Bool IsConsistent( RscInstNode * pNode ) { sal_Bool bRet = sal_True; @@ -300,11 +228,6 @@ sal_Bool RscArray::IsConsistent( const RSCINST & rInst ) return( bRet ); } -/************************************************************************* -|* -|* RscArray::SetToDefault() -|* -*************************************************************************/ static void SetToDefault( RscInstNode * pNode ) { if( pNode ) @@ -326,11 +249,6 @@ void RscArray::SetToDefault( const RSCINST & rInst ) RscTop::SetToDefault( rInst ); } -/************************************************************************* -|* -|* RscArray::IsDefault() -|* -*************************************************************************/ static sal_Bool IsDefault( RscInstNode * pNode ) { sal_Bool bRet = sal_True; @@ -359,11 +277,6 @@ sal_Bool RscArray::IsDefault( const RSCINST & rInst ) return bRet; } -/************************************************************************* -|* -|* RscArray::IsValueDefault() -|* -*************************************************************************/ static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) { sal_Bool bRet = sal_True; @@ -392,11 +305,6 @@ sal_Bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return bRet; } -/************************************************************************* -|* RscArray::WriteSrcHeader() -|* -|* Beschreibung -*************************************************************************/ void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const RscId & aId, const char * pVarName ) @@ -439,11 +347,6 @@ void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* RscArray::WriteSrc() -|* -|* Beschreibung -*************************************************************************/ static void WriteSrc( RscInstNode * pNode, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName, CLASS_DATA pDfltData, RscConst * pTypeClass ) @@ -488,11 +391,6 @@ void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, WriteSrcArray( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* RscArray::WriteRc() -|* -|* Beschreibung -*************************************************************************/ ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -529,42 +427,16 @@ ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return aError; } -//======================================================================== -void RscArray::WriteRcAccess -( - FILE * fOutput, - RscTypCont * pTC, - const char * pName -) -{ - GetSuperClass()->WriteRcAccess( fOutput, pTC, pName ); -} - -/************************************************************************* -|* -|* RscClassArray::RscClassArray() -|* -*************************************************************************/ RscClassArray::RscClassArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) : RscArray( nId, nTypeId, pSuper, pTypeCl ) { } -/************************************************************************* -|* -|* RscClassArray::~RscClassArray() -|* -*************************************************************************/ RscClassArray::~RscClassArray() { } -/************************************************************************* -|* -|* RscClassArray::WriteSrcHeader() -|* -*************************************************************************/ void RscClassArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const RscId & aId, const char * pName ) @@ -572,11 +444,6 @@ void RscClassArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscArray::WriteSrcHeader( rInst, fOutput, pTC, nTab, aId, pName ); } -/************************************************************************* -|* -|* RscClassArray::WriteSrc() -|* -*************************************************************************/ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) @@ -584,11 +451,6 @@ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscArray::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* -|* RscClassArray::WriteRcHeader() -|* -*************************************************************************/ ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -598,22 +460,12 @@ ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, nDeep, bExtra ); } -/************************************************************************* -|* -|* RscLangArray::RscLangArray() -|* -*************************************************************************/ RscLangArray::RscLangArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) : RscArray( nId, nTypeId, pSuper, pTypeCl ) { } -/************************************************************************* -|* -|* RscLangArray::RscLangArray() -|* -*************************************************************************/ RSCCLASS_TYPE RscLangArray::GetClassType() const { if( GetSuperClass() ) diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 0eed5ea95c23..0205eba1e277 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -17,27 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Programmabhaengige Includes. #include <rscdb.hxx> #include <rscclass.hxx> #include <tools/rcid.h> #include <tools/rc.h> -/****************** C O D E **********************************************/ -/****************** R s c C l a s s **************************************/ -/************************************************************************* -|* -|* RscClass::RscClass() -|* -*************************************************************************/ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) : RscTop( nId, nTypeId, pSuperCl ) { @@ -47,11 +37,6 @@ RscClass::RscClass( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) nSize = nSuperSize + ALIGNED_SIZE( sizeof( RscClassInst ) ); } -/************************************************************************* -|* -|* RscClass::Pre_dtor() -|* -*************************************************************************/ void RscClass::Pre_dtor() { sal_uInt32 i; @@ -71,32 +56,17 @@ void RscClass::Pre_dtor() }; } -/************************************************************************* -|* -|* RscClass::~RscClass() -|* -*************************************************************************/ RscClass::~RscClass() { if( pVarTypeList ) rtl_freeMemory( (void *)pVarTypeList ); } -/************************************************************************* -|* -|* RscClass::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscClass::GetClassType() const { return RSCCLASS_COMPLEX; } -/************************************************************************* -|* -|* RscClass::GetInstData() -|* -*************************************************************************/ RSCINST RscClass::GetInstData ( CLASS_DATA pData, @@ -142,13 +112,6 @@ RSCINST RscClass::GetInstData return( aInst ); } -/************************************************************************* -|* -|* RscClass::GetInstDflt() -|* -|* Beschreibung -|* -*************************************************************************/ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) { if( pVarTypeList[ nEle ].pDefault ) @@ -157,11 +120,6 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) return pVarTypeList[ nEle ].pClass->GetDefault().pData; } -/************************************************************************* -|* -|* RscClass::SetVarDflt() -|* -*************************************************************************/ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet ) { RscClassInst * pClass; @@ -173,11 +131,6 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet ) pClass->nVarDflt &= ~((sal_uLong)1 << nEle); } -/************************************************************************* -|* -|* RscClass::IsDflt() -|* -*************************************************************************/ sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) { RscClassInst * pClass; @@ -191,11 +144,6 @@ sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) return bRet; } -/************************************************************************* -|* -|* RscClass::Create() -|* -*************************************************************************/ RSCINST RscClass::Create ( RSCINST * pInst, @@ -260,13 +208,6 @@ RSCINST RscClass::Create return( aInst ); } -/************************************************************************* -|* -|* RscClass::Destroy() -|* -|* Beschreibung -|* -*************************************************************************/ void RscClass::Destroy( const RSCINST & rInst ) { sal_uInt32 i; @@ -294,13 +235,6 @@ void RscClass::Destroy( const RSCINST & rInst ) }; } -/************************************************************************* -|* -|* RscClass::SetVariable() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscClass::SetVariable ( Atom nVarName, @@ -356,13 +290,6 @@ ERRTYPE RscClass::SetVariable return( ERR_OK ); } -/************************************************************************* -|* -|* RscClass::EnumVariable() -|* -|* Beschreibung -|* -*************************************************************************/ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { sal_uInt32 i; @@ -376,13 +303,6 @@ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) } } -/************************************************************************* -|* -|* RscClass::GetVariable() -|* -|* Beschreibung -|* -*************************************************************************/ RSCINST RscClass::GetVariable ( const RSCINST & rInst, @@ -456,13 +376,6 @@ RSCINST RscClass::GetVariable bInitDflt, pCreateClass ) ); } -/************************************************************************* -|* -|* RscClass::GetCopyVar() -|* -|* Beschreibung -|* -*************************************************************************/ RSCINST RscClass::GetCopyVar ( const RSCINST & rInst, @@ -500,13 +413,6 @@ RSCINST RscClass::GetCopyVar return RscTop::GetCopyVar( rInst, nVarName ); } -/************************************************************************* -|* -|* RscClass::IsConsistent() -|* -|* Beschreibung -|* -*************************************************************************/ sal_Bool RscClass::IsConsistent( const RSCINST & rInst ) { sal_uInt32 i = 0; @@ -530,13 +436,6 @@ sal_Bool RscClass::IsConsistent( const RSCINST & rInst ) return( bRet ); } -/************************************************************************* -|* -|* RscClass::SetToDefault() -|* -|* Beschreibung -|* -*************************************************************************/ void RscClass::SetToDefault( const RSCINST & rInst ) { sal_uInt32 i; @@ -561,13 +460,6 @@ void RscClass::SetToDefault( const RSCINST & rInst ) RscTop::SetToDefault( rInst ); } -/************************************************************************* -|* -|* RscClass::IsDefault() -|* -|* Beschreibung -|* -*************************************************************************/ sal_Bool RscClass::IsDefault( const RSCINST & rInst ) { sal_uInt32 i; @@ -585,13 +477,6 @@ sal_Bool RscClass::IsDefault( const RSCINST & rInst ) return( RscTop::IsDefault( rInst ) ); } -/************************************************************************* -|* -|* RscClass::GetDefault() -|* -|* Beschreibung -|* -*************************************************************************/ RSCINST RscClass::GetDefault( Atom nVarId ) { sal_uInt32 i; @@ -611,13 +496,6 @@ RSCINST RscClass::GetDefault( Atom nVarId ) return( RscTop::GetDefault( nVarId ) ); } -/************************************************************************* -|* -|* RscClass::IsValueDflt() -|* -|* Beschreibung -|* -*************************************************************************/ sal_Bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) { RSCINST aTmpI; @@ -638,13 +516,6 @@ sal_Bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) return sal_True; } -/************************************************************************* -|* -|* RscClass::IsValueDefault() -|* -|* Beschreibung -|* -*************************************************************************/ sal_Bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { RSCINST aTmpI; @@ -679,13 +550,6 @@ sal_Bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return sal_True; } -/************************************************************************* -|* -|* RscClass::SetDefault() -|* -|* Beschreibung -|* -*************************************************************************/ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) { sal_uInt32 i = 0; @@ -710,13 +574,6 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) } -/************************************************************************* -|* -|* RscClass::WriteSrc() -|* -|* Beschreibung -|* -*************************************************************************/ void RscClass::WriteSrc ( const RSCINST & rInst, @@ -798,13 +655,6 @@ void RscClass::WriteSrc return; } -/************************************************************************* -|* -|* RscClass::WriteInstRc() -|* -|* Beschreibung -|* -*************************************************************************/ sal_Int32 RscClass::GetCorrectValues ( const RSCINST & rInst, @@ -925,13 +775,6 @@ ERRTYPE RscClass::WriteInstRc return( aError ); } -/************************************************************************* -|* -|* RscClass::WriteRc() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscClass::WriteRc ( const RSCINST & rInst, @@ -950,113 +793,10 @@ ERRTYPE RscClass::WriteRc return( aError ); } -/************************************************************************* -|* -|* RscClass::WriteSyntax() -|* -|* Beschreibung -|* -*************************************************************************/ -void RscClass::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) -{ - RscTop::WriteSyntax( fOutput, pTC ); - - sal_uInt32 i; - // Wenn eine Variable Maskierung hat, dann Maskenfeld - fprintf( fOutput, "\t//%s\n", pHS->getString( GetId() ).getStr() ); - for( i = 0; i < nEntries; i++ ) - { - fprintf( fOutput, "\t%s", pHS->getString( pVarTypeList[ i ].nVarName ).getStr() ); - sal_uInt32 n = strlen( pHS->getString( pVarTypeList[ i ].nVarName ).getStr() ); - while( n < 20 ) - { - putc( ' ', fOutput ); - n++; - } - fprintf( fOutput, " = %s;\n", - pHS->getString( pVarTypeList[ i ].pClass->GetId() ).getStr() ); - }; -} - -//================================================================== -void RscClass::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( %s ", pName, pHS->getString( GetId() ).getStr() ); - fprintf( fOutput, "%s ", aCallPar2.getStr() ); - fprintf( fOutput, "ResId( (RSHEADER_TYPE*)(pResData+nOffset) ) ) );\n" ); - fprintf( fOutput, "\t\tnOffset += GetObjSizeRes( (RSHEADER_TYPE*)(pResData+nOffset) );\n" ); -} - -//================================================================== -void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) -{ - if( GetId() != InvalidAtom ) - { - // Konstruktor - fprintf( fOutput, "%s::%s%s bFreeResource )", - pHS->getString( GetId() ).getStr(), - pHS->getString( GetId() ).getStr(), - aCallParType.getStr() ); - if( GetSuperClass() ) - { - // Superaufruf - fprintf( fOutput, "\n\t: %s", pHS->getString( GetSuperClass()->GetId() ).getStr() ); - fprintf( fOutput, "%s", GetSuperClass()->aCallPar1.getStr() ); - fprintf( fOutput, " rResId.SetRT2( 0x%lx ) )", - sal::static_int_cast< unsigned long >(GetTypId()) ); - } - fprintf( fOutput, "\n{\n" ); - fprintf( fOutput, "\tsal_uInt32\tnObjMask;\n" ); - fprintf( fOutput, "\tsal_uInt32\tnOffset = 0;\n" ); - fprintf( fOutput, "\tBYTE *\tpResData;\n\n" ); - fprintf( fOutput, "\tpResData = (tBYTE *)GetClassRes();\n\n" ); - fprintf( fOutput, "\tnObjMask = *(sal_uInt32*)pResData;\n" ); - fprintf( fOutput, "\tnOffset += 4;\n\n" ); - - for( sal_uInt32 i = 0; i < nEntries; i++ ) - { - if( !((VAR_NODATAINST | VAR_NORC) & pVarTypeList[ i ].nVarType )) - { - fprintf( fOutput, "\tif( nObjMask & 0x%lx )\n\t{\n", - sal::static_int_cast< unsigned long >( - pVarTypeList[ i ].nMask) ); - - pVarTypeList[ i ].pClass->WriteRcAccess( fOutput, pTC, - pHS->getString( pVarTypeList[ i ].nVarName ).getStr() ); - - fprintf( fOutput, "\t}\n" ); - } - } - fprintf( fOutput, "\tIncrementRes( nOffset );\n" ); - fprintf( fOutput, "\tif( bFreeResource )\n" ); - fprintf( fOutput, "\t\tFreeResource();\n" ); - fprintf( fOutput, "}\n\n" ); - } -} - -/************************************************************************* -|* -|* RscSysDepend::RscSysDepend() -|* -|* Beschreibung -|* -*************************************************************************/ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) : RscClass( nId, nTypeId, pSuper ) {} -/************************************************************************* -|* -|* RscSysDepend::WriteRc() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra, sal_Bool bFirst ) { @@ -1091,13 +831,6 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem return( aError ); } -/************************************************************************* -|* -|* RscSysDepend::WriteRc() -|* -|* Beschreibung -|* -*************************************************************************/ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -1109,24 +842,10 @@ ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return aError; } -/************************************************************************* -|* -|* RscTupel::RscTupel() -|* -|* Beschreibung -|* -*************************************************************************/ RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper ) : RscClass( nId, nTypeId, pSuper ) {} -/************************************************************************* -|* -|* RscTupel::GetTupelVar() -|* -|* Beschreibung -|* -*************************************************************************/ RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, const RSCINST & rInitInst ) { @@ -1138,13 +857,6 @@ RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, return GetVariable( rInst, pVarTypeList[ nPos ].nVarName, rInitInst ); } -/************************************************************************* -|* -|* RscTupel::WriteSrc() -|* -|* Beschreibung -|* -*************************************************************************/ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx index 291d1247bbb7..d11ce80195bd 100644 --- a/rsc/source/res/rscclobj.cxx +++ b/rsc/source/res/rscclobj.cxx @@ -17,45 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. - -// Solar Definitionen -#include <tools/solar.h> - -// Programmabhaengige Includes. #include <rscclobj.hxx> #include <rsctop.hxx> -/****************** C O D E **********************************************/ -/****************** R e f N o d e ****************************************/ -/************************************************************************* -|* -|* RefNode::RefNode() -|* -*************************************************************************/ RefNode::RefNode( Atom nTyp ){ pObjBiTree = 0; nTypNameId = nTyp; } -/************************************************************************* -|* -|* RefNode::GetId() -|* -*************************************************************************/ sal_uInt32 RefNode::GetId() const { return( nTypNameId ); } -/************************************************************************* -|* -|* RefNode::PutObjNode() -|* -*************************************************************************/ sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){ // insert a node in the b-tree pObjBiTree // if the node with the same name is in pObjBiTree, @@ -68,12 +44,6 @@ sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){ return( sal_True ); } -/****************** O b j N o d e ****************************************/ -/************************************************************************* -|* -|* RefNode::GetObjNode() -|* -*************************************************************************/ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){ // insert a node in the b-tree pObjBiTree // if the node with the same name is in pObjBiTree, @@ -85,22 +55,12 @@ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){ return( NULL ); } -/************************************************************************* -|* -|* ObjNode::ObjNode() -|* -*************************************************************************/ ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){ pRscObj = pData; aRscId = rId; lFileKey = lKey; } -/************************************************************************* -|* -|* ObjNode::DelObjNode() -|* -*************************************************************************/ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){ ObjNode * pRetNode = this; @@ -126,21 +86,11 @@ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){ return pRetNode; } -/************************************************************************* -|* -|* ObjNode::GetId() -|* -*************************************************************************/ sal_uInt32 ObjNode::GetId() const { return( (sal_uInt32)(long)aRscId ); } -/************************************************************************* -|* -|* ObjNode::IsConsistent() -|* -*************************************************************************/ sal_Bool ObjNode::IsConsistent() { sal_Bool bRet = sal_True; diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index bbcf8e8f07e4..2564c69f9e15 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.cxx @@ -17,29 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ - -// C and C++ Includes. #include <cstdlib> #include <cstdio> #include <cstring> -// Solar Definitionen -#include <tools/solar.h> - -// Programmabhaengige Includes. #include <rscconst.hxx> #include <rscall.h> #include <rschash.hxx> #include <tools/resid.hxx> -/****************** C O D E **********************************************/ -/****************** R s c C o n s t **************************************/ -/************************************************************************* -|* -|* RscConst::RscConst() -|* -*************************************************************************/ RscConst::RscConst( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) { @@ -47,32 +33,17 @@ RscConst::RscConst( Atom nId, sal_uInt32 nTypeId ) nEntries = 0; } -/************************************************************************* -|* -|* RscConst::~RscConst() -|* -*************************************************************************/ RscConst::~RscConst() { if( pVarArray ) rtl_freeMemory( (void *)pVarArray ); } -/************************************************************************* -|* -|* RscConst::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscConst::GetClassType() const { return RSCCLASS_CONST; } -/************************************************************************* -|* -|* RscConst::SetConstance() -|* -*************************************************************************/ ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){ if( pVarArray ) pVarArray = (VarEle *) @@ -88,22 +59,12 @@ ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){ return( ERR_OK ); } -/************************************************************************* -|* -|* RscConst::GetConstance() -|* -*************************************************************************/ Atom RscConst::GetConstant( sal_uInt32 nPos ){ if( nPos < nEntries ) return pVarArray[ nPos ].nId; return( InvalidAtom ); } -/************************************************************************* -|* -|* RscConst::GetConstValue() -|* -*************************************************************************/ sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const { sal_uInt32 i = 0; @@ -117,11 +78,6 @@ sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const return sal_False; } -/************************************************************************* -|* -|* RscConst::GetValueConst() -|* -*************************************************************************/ sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const { sal_uInt32 i = 0; @@ -135,15 +91,6 @@ sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const return sal_False; } -/************************************************************************* -|* -|* RscConst::GetConstPos() -|* -|* Beschreibung Sucht die Position der Konstanten -|* Return = nEntries, nicht gefunden -|* Return = Position im Feld -|* -*************************************************************************/ sal_uInt32 RscConst::GetConstPos( Atom nConst ) { sal_uInt32 i = 0; @@ -157,57 +104,12 @@ sal_uInt32 RscConst::GetConstPos( Atom nConst ) return( nEntries ); } -/************************************************************************* -|* -|* RscEnum::WriteSyntax() -|* -*************************************************************************/ -void RscConst::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) -{ - RscTop::WriteSyntax( fOutput, pTC ); - - sal_uInt32 i = 0; - // Wenn eine Variable Maskierung hat, dann Maskenfeld - fprintf( fOutput, "\t" ); - for( i = 0; i < nEntries; i++ ) - { - fprintf( fOutput, "%s, ", pHS->getString( pVarArray[ i ].nId ).getStr() ); - if( 3 == (i % 4) && i < sal_uInt32(nEntries -1) ) - fprintf( fOutput, "\n\t" ); - }; - fprintf( fOutput, "\n" ); -} - -//================================================================== -void RscConst::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( %s( ", pName, pHS->getString( GetId() ).getStr() ); - fprintf( fOutput, "*(short*)(pResData+nOffset) ) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( short );\n" ); -} - -/****************** R s c E n u m ****************************************/ -/************************************************************************* -|* -|* RscEnum::RscEnum() -|* -*************************************************************************/ RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId ) : RscConst( nId, nTypeId ) { nSize = ALIGNED_SIZE( sizeof( RscEnumInst ) ); } -/************************************************************************* -|* -|* RscEnum::SetConst() -|* -*************************************************************************/ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { sal_uInt32 i = 0; @@ -222,11 +124,6 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal* return( ERR_RSCENUM ); } -/************************************************************************* -|* -|* RscEnum::SetNumber() -|* -*************************************************************************/ ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) { sal_uInt32 i = 0; @@ -239,31 +136,16 @@ ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) return( ERR_RSCENUM ); } -/************************************************************************* -|* -|* RscEnum::GetConst() -|* -*************************************************************************/ ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){ *pH = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId; return( ERR_OK ); } -/************************************************************************* -|* -|* RscEnum::GetNumber() -|* -*************************************************************************/ ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){ *pNumber = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue; return( ERR_OK ); } -/************************************************************************* -|* -|* RscEnum::Create() -|* -*************************************************************************/ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; @@ -287,11 +169,6 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCl return( aInst ); } -/************************************************************************* -|* -|* RscEnum::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ if( ((RscEnumInst*)rInst.pData)->nValue == @@ -304,11 +181,6 @@ sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ return sal_False; } -/************************************************************************* -|* -|* RscEnum::WriteSrc() -|* -*************************************************************************/ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -316,11 +188,6 @@ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId ).getStr() ); } -/************************************************************************* -|* -|* RscEnum::WriteRc() -|* -*************************************************************************/ ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) { diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index 9ead8773c10f..2919a00a8e54 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -17,25 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ - -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Programmabh�ngige Includes. #include <rsccont.hxx> #include <tools/rcid.h> -/****************** C O D E **********************************************/ -/****************** E N T R Y S T R U C T ********************************/ -/************************************************************************* -|* -|* ENTRYSTRUCT::Destroy() -|* -*************************************************************************/ void ENTRY_STRUCT::Destroy() { aName.Destroy(); @@ -45,12 +34,6 @@ void ENTRY_STRUCT::Destroy() }; } -/****************** R s c B a s e C o n t ********************************/ -/************************************************************************* -|* -|* RscBaseCont::RscBaseCont() -|* -*************************************************************************/ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscTop( nId, nTypeId, pSuper ), @@ -63,30 +46,15 @@ RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, nSize = nOffInstData + ALIGNED_SIZE( sizeof( RscBaseContInst ) ); } -/************************************************************************* -|* -|* RscBaseCont::~RscBaseCont() -|* -*************************************************************************/ RscBaseCont::~RscBaseCont() { } -/************************************************************************* -|* -|* RscBaseCont::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscBaseCont::GetClassType() const { return RSCCLASS_COMPLEX; } -/************************************************************************* -|* -|* DestroyElements() -|* -*************************************************************************/ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) { if( pClassData->nEntries ){ @@ -100,11 +68,6 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) }; } -/************************************************************************* -|* -|* RscBaseCont::Create() -|* -*************************************************************************/ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { @@ -153,11 +116,6 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } -/************************************************************************* -|* -|* RscBaseCont::Destroy() -|* -*************************************************************************/ void RscBaseCont::Destroy( const RSCINST & rInst ){ RscBaseContInst * pClassData; @@ -167,11 +125,6 @@ void RscBaseCont::Destroy( const RSCINST & rInst ){ DestroyElements( pClassData ); } -/************************************************************************* -|* -|* RscBaseCont::SearchEle() -|* -*************************************************************************/ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass, sal_uInt32 nPos ) { @@ -194,22 +147,12 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName return RSCINST(); } -/************************************************************************* -|* -|* RscBaseCont::SearchEle() -|* -*************************************************************************/ RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass ) { return SearchElePos( rInst, rEleName, pClass, 0 ); } -/************************************************************************* -|* -|* RscBaseCont::GetElement() -|* -*************************************************************************/ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop * pCreateClass, const RSCINST & rCreateInst, RSCINST * pGetInst ) @@ -226,12 +169,10 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, if( !pCreateClass->InHierarchy( pTypeClass ) ){ if( pTypeClass1 ){ if( !pCreateClass->InHierarchy( pTypeClass1 ) ){ - // Falscher Typ return ERR_CONT_INVALIDTYPE; } } else{ - // Falscher Typ return ERR_CONT_INVALIDTYPE; }; }; @@ -283,11 +224,6 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, return aError; } -/************************************************************************* -|* -|* RscBaseCont::GetCount() -|* -*************************************************************************/ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ RscBaseContInst * pClassData; @@ -295,11 +231,6 @@ sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){ return( pClassData->nEntries ); } -/************************************************************************* -|* -|* RscBaseCont::GetPosEle() -|* -*************************************************************************/ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; @@ -310,11 +241,6 @@ RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ return RSCINST(); } -/************************************************************************* -|* -|* RscBaseCont::MovePosEle() -|* -*************************************************************************/ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, sal_uInt32 nSourcePos ) { @@ -345,11 +271,6 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, return aError; } -/************************************************************************* -|* -|* RscBaseCont::SetPosRscId() -|* -*************************************************************************/ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, const RscId & rId ){ RscBaseContInst * pClassData; @@ -372,11 +293,6 @@ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, return( aError ); } -/************************************************************************* -|* -|* RscBaseCont::GetInfoEle() -|* -*************************************************************************/ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; SUBINFO_STRUCT aInfo; @@ -391,11 +307,6 @@ SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) return( aInfo ); } -/************************************************************************* -|* -|* RscBaseCont::SetString() -|* -*************************************************************************/ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) { RscBaseContInst * pClassData; @@ -405,8 +316,7 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); -//?B 040991 -//?W 040991 sonst Endlosrekursion moeglich +// otherwise infinite recursion is possible if( RSC_NOTYPE == pTypeClass->GetTypId() ){ aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr ); @@ -429,11 +339,6 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) return( aError ); } -/************************************************************************* -|* -|* RscBaseCont::SetNumber() -|* -*************************************************************************/ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ RscBaseContInst * pClassData; RSCINST aTmpI; @@ -442,8 +347,7 @@ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); -//?B 040991 -//?W 040991 sonst Endlosrekursion moeglich +// otherwise infinite recursion is possible if( RSC_NOTYPE == pTypeClass->GetTypId() ){ aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber ); @@ -466,7 +370,6 @@ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ return( aError ); } -//================================================================== ERRTYPE RscBaseCont::SetBool ( const RSCINST & rInst, @@ -480,8 +383,7 @@ ERRTYPE RscBaseCont::SetBool pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); - //?B 040991 - //?W 040991 sonst Endlosrekursion moeglich + // otherwise infinite recursion is possible if( RSC_NOTYPE == pTypeClass->GetTypId() ) { aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); @@ -505,7 +407,6 @@ ERRTYPE RscBaseCont::SetBool return( aError ); } -//================================================================== ERRTYPE RscBaseCont::SetConst ( const RSCINST & rInst, @@ -520,8 +421,7 @@ ERRTYPE RscBaseCont::SetConst pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); -//?B 040991 -//?W 040991 sonst Endlosrekursion moeglich + // otherwise infinite recursion is possible if( RSC_NOTYPE == pTypeClass->GetTypId() ){ aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); aError = aTmpI.pClass->GetConst( aTmpI, &nConst ); @@ -544,11 +444,6 @@ ERRTYPE RscBaseCont::SetConst return( aError ); } -/************************************************************************* -|* -|* RscBaseCont::SetRef() -|* -*************************************************************************/ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){ RscBaseContInst * pClassData; RSCINST aTmpI; @@ -557,8 +452,7 @@ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){ pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); -//?B 040991 -//?W 040991 sonst Endlosrekursion moeglich + // otherwise infinite recursion is possible if( RSC_NOTYPE == pTypeClass->GetTypId() ){ aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); aError = aTmpI.pClass->GetRef( aTmpI, &aId ); @@ -581,11 +475,6 @@ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){ return( aError ); } -/************************************************************************* -|* -|* RscBaseCont::IsConsistent() -|* -*************************************************************************/ sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) { sal_uInt32 i = 0; RscBaseContInst * pClassData; @@ -617,11 +506,6 @@ sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) { return( bRet ); } -/************************************************************************* -|* -|* RscBaseCont::SetToDefault() -|* -*************************************************************************/ void RscBaseCont::SetToDefault( const RSCINST & rInst ) { sal_uInt32 i = 0; @@ -638,11 +522,6 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst ) RscTop::SetToDefault( rInst ); } -/************************************************************************* -|* -|* RscBaseCont::IsDefault() -|* -*************************************************************************/ sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){ sal_uInt32 i = 0; RscBaseContInst * pClassData; @@ -663,11 +542,6 @@ sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){ return( RscTop::IsDefault( rInst ) ); } -/************************************************************************* -|* -|* RscBaseCont::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { RscBaseContInst * pClassData; @@ -683,11 +557,6 @@ sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return sal_True; } -/************************************************************************* -|* -|* RscBaseCont::Delete() -|* -*************************************************************************/ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) { @@ -708,11 +577,6 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, } -/************************************************************************* -|* -|* RscBaseCont::DeletePos() -|* -*************************************************************************/ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ RscBaseContInst * pClassData; @@ -730,11 +594,6 @@ void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){ }; } -/************************************************************************* -|* -|* RscBaseCont::ContWriteSrc() -|* -*************************************************************************/ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) @@ -756,11 +615,6 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, }; } -/************************************************************************* -|* -|* RscBaseCont::ContWriteRc() -|* -*************************************************************************/ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -784,41 +638,6 @@ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, return( aError ); } -//================================================================== -void RscBaseCont::ContWriteRcAccess -( - FILE * fOutput, - RscTypCont * pTC, - const char * pName, - sal_Bool bWriteSize -) -{ - if( (bNoId || bWriteSize) && !pTypeClass1 ) - { - fprintf( fOutput, "\t\tsal_uInt32 nItems = *(sal_uInt32 *)(pResData+nOffset) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( sal_uInt32 );\n" ); - - fprintf( fOutput, "\t\t// Items hinzufuegen\n" ); - fprintf( fOutput, "\t\tfor( sal_uInt32 i = 0; i < nItems; i++ )\n" ); - fprintf( fOutput, "\t\t{\n" ); - pTypeClass->WriteRcAccess( fOutput, pTC, "Item" ); - fprintf( fOutput, "\t\t}\n" ); - } - else - { - fprintf( fOutput, "\t\tSet%s( %s ", pName, pHS->getString( GetId() ).getStr() ); - fprintf( fOutput, "%s ", aCallPar2.getStr() ); - fprintf( fOutput, "ResId( (RSHEADER_TYPE*)(pResData+nOffset) ) ) );\n" ); - fprintf( fOutput, "\t\tnOffset += GetObjSizeRes( (RSHEADER_TYPE*)(pResData+nOffset) );\n" ); - } -} - - -/************************************************************************* -|* -|* RscBaseCont::WriteSrc() -|* -*************************************************************************/ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) @@ -827,11 +646,6 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, ContWriteSrc( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* -|* RscBaseCont::WriteRc() -|* -*************************************************************************/ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -844,84 +658,11 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return( aError ); } -/************************************************************************* -|* -|* RscBaseCont::WriteHxx() -|* -*************************************************************************/ -ERRTYPE RscBaseCont::WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rRscId ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - ERRTYPE aError; - - aError = RscTop::WriteHxx( rInst, fOutput, pTC, rRscId ); - - pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); - - for( i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ) - { - if( pClassData->pEntries[ i ].aName.IsId() - && pClassData->pEntries[ i ].aInst.pClass->IsCodeWriteable() ) - { - aError = pClassData->pEntries[ i ].aInst.pClass-> - WriteHxx( pClassData->pEntries[ i ].aInst, - fOutput, pTC, - pClassData->pEntries[ i ].aName ); - } - }; - - return( aError ); -} - -/************************************************************************* -|* -|* RscBaseCont::WriteCxx() -|* -*************************************************************************/ -ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rRscId ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - ERRTYPE aError; - - aError = RscTop::WriteCxx( rInst, fOutput, pTC, rRscId ); - - pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData); - - for( i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ) - { - if( pClassData->pEntries[ i ].aName.IsId() - && pClassData->pEntries[ i ].aInst.pClass->IsCodeWriteable() ) - { - aError = pClassData->pEntries[ i ].aInst.pClass-> - WriteCxx( pClassData->pEntries[ i ].aInst, - fOutput, pTC, - pClassData->pEntries[ i ].aName ); - } - }; - - return( aError ); -} - -/*************** R s c C o n t W r i t e S r c ***************************/ -/************************************************************************* -|* -|* RscContWriteSrc::RscContWriteSrc() -|* -*************************************************************************/ RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscBaseCont( nId, nTypeId, pSuper, bNoIdent ) {} -/************************************************************************* -|* -|* RscContWriteSrc::WriteSrc() -|* -*************************************************************************/ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) @@ -942,21 +683,10 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, fprintf( fOutput, "}" ); } -/*************** R s c C o n t *******************************************/ -/************************************************************************* -|* -|* RscCont::RscCont() -|* -*************************************************************************/ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent ) {} -/************************************************************************* -|* -|* RscCont::WriteRc() -|* -*************************************************************************/ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -975,32 +705,11 @@ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return aError; } -//================================================================== -void RscCont::WriteRcAccess -( - FILE * fOutput, - RscTypCont * pTC, - const char * pName -) -{ - ContWriteRcAccess( fOutput, pTC, pName, sal_True ); -} - -/************************************************************************* -|* -|* RscContExtraData::RscContExtraData() -|* -*************************************************************************/ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent ) : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent ) {} -/************************************************************************* -|* -|* RscContExtraData::WriteRc() -|* -*************************************************************************/ ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index a842d1876bb8..c37e377b9a7e 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.cxx @@ -17,45 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> #include <rscflag.hxx> -/****************** C O D E **********************************************/ -/****************** R s c F l a g ****************************************/ -/************************************************************************* -|* -|* RscFlag::RscFlag() -|* -*************************************************************************/ RscFlag::RscFlag( Atom nId, sal_uInt32 nTypeId ) : RscConst( nId, nTypeId ) {} -/************************************************************************* -|* -|* RscFlag::Size() -|* -|* Beschreibung Die Groe�e der Instanzdaten richtet sich nach -|* der Anzahl der Flags -|* -*************************************************************************/ sal_uInt32 RscFlag::Size() { return( ALIGNED_SIZE( sizeof( RscFlagInst ) * ( 1 + (nEntries -1) / (sizeof( sal_uInt32 ) * 8) ) ) ); } -/************************************************************************* -|* -|* RscFlag::SetNotConst() -|* -*************************************************************************/ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst ) { sal_uInt32 i = 0; @@ -71,11 +49,6 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst ) return( ERR_RSCFLAG ); } -/************************************************************************* -|* -|* RscFlag::SetConst() -|* -*************************************************************************/ ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) { sal_uInt32 i = 0; @@ -91,11 +64,6 @@ ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal* return( ERR_RSCFLAG ); } -/************************************************************************* -|* -|* RscFlag::CreateBasic() -|* -*************************************************************************/ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) { RSCINST aInst; @@ -110,11 +78,6 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) return( aInst ); } -/************************************************************************* -|* -|* RscFlag::Create() -|* -*************************************************************************/ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { RSCINST aInst = CreateBasic( pInst ); @@ -136,11 +99,6 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCl return( aInst ); } -/************************************************************************* -|* -|* RscFlag::CreateClient() -|* -*************************************************************************/ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI, sal_Bool bOwnClass, Atom nConstId ) { @@ -169,11 +127,6 @@ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI, return( aInst ); } -/************************************************************************* -|* -|* RscFlag::SetToDefault() -|* -*************************************************************************/ void RscFlag::SetToDefault( const RSCINST & rInst ) { sal_uInt32 i = 0; @@ -182,11 +135,6 @@ void RscFlag::SetToDefault( const RSCINST & rInst ) ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags = 0xFFFFFFFF; } -/************************************************************************* -|* -|* RscFlag::IsDlft() -|* -*************************************************************************/ sal_Bool RscFlag::IsDefault( const RSCINST & rInst ) { sal_uInt32 i = 0; @@ -212,11 +160,6 @@ sal_Bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId ) return( sal_True ); } -/************************************************************************* -|* -|* RscFlag::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, Atom nConstId ) { @@ -262,11 +205,6 @@ sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return sal_True; } -/************************************************************************* -|* -|* RscFlag::IsSet() -|* -*************************************************************************/ sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) { sal_uInt32 i = 0, nFlag = 0; @@ -282,11 +220,6 @@ sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId ) return( sal_True ); } -/************************************************************************* -|* -|* RscFlag::WriteSrc() -|* -*************************************************************************/ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -313,11 +246,6 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput, }; } -/************************************************************************* -|* -|* RscFlag::WriteRc() -|* -*************************************************************************/ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) { @@ -339,11 +267,6 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, return( ERR_OK ); } -/************************************************************************* -|* -|* RscClient::RscClient() -|* -*************************************************************************/ RscClient::RscClient( Atom nId, sal_uInt32 nTypeId, RscFlag * pClass, Atom nConstantId ) : RscTop ( nId, nTypeId ) @@ -352,21 +275,11 @@ RscClient::RscClient( Atom nId, sal_uInt32 nTypeId, RscFlag * pClass, nConstId = nConstantId; } -/************************************************************************* -|* -|* RscClient::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscClient::GetClassType() const { return RSCCLASS_BOOL; } -/************************************************************************* -|* -|* RscClient::WriteSrc() -|* -*************************************************************************/ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -376,11 +289,6 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput, fprintf( fOutput, "FALSE" ); } -/************************************************************************* -|* -|* RscClient::Create() -|* -*************************************************************************/ RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index be2301b18f3b..9f3642aa1f1a 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -17,45 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> -// Programmabhaengige Includes. #include <rscmgr.hxx> #include <rscdb.hxx> -/****************** C O D E **********************************************/ -/****************** R s c M g r ******************************************/ -/************************************************************************* -|* -|* RscMgr::RscMgr() -|* -*************************************************************************/ RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl ) : RscClass( nId, nTypeId, pSuperCl ) { } -/************************************************************************* -|* -|* RscMgr::Size() -|* -*************************************************************************/ sal_uInt32 RscMgr::Size() { return RscClass::Size() + ALIGNED_SIZE( sizeof( RscMgrInst ) ); } -/************************************************************************* -|* -|* RscMgr::Create() -|* -*************************************************************************/ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; RscMgrInst * pClassData; @@ -82,11 +62,6 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCla return( aInst ); } -/************************************************************************* -|* -|* RscMgr::Destroy() -|* -*************************************************************************/ void RscMgr::Destroy( const RSCINST & rInst ){ RscMgrInst * pClassData; @@ -96,11 +71,6 @@ void RscMgr::Destroy( const RSCINST & rInst ){ pClassData->Destroy(); } -/************************************************************************* -|* -|* RscMgr::SetToDefault() -|* -*************************************************************************/ void RscMgr::SetToDefault( const RSCINST & rInst ) { RscMgrInst * pClassData; @@ -111,11 +81,6 @@ void RscMgr::SetToDefault( const RSCINST & rInst ) RscClass::SetToDefault( rInst ); } -/************************************************************************* -|* -|* RscMgr::IsDefault() -|* -*************************************************************************/ sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){ RscMgrInst * pClassData; @@ -126,11 +91,6 @@ sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){ return( RscClass::IsDefault( rInst ) ); } -/************************************************************************* -|* -|* RscMgr::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( !RscClass::IsValueDefault( rInst, pDef ) ) return sal_False; @@ -148,11 +108,6 @@ sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ } -/************************************************************************* -|* -|* RscMgr::WriteSrcHeader() -|* -*************************************************************************/ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const RscId & rId, const char * pVarName ) @@ -184,21 +139,11 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, } } -/************************************************************************* -|* -|* RscMgr::WriteSrc() -|* -*************************************************************************/ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, const char * ) { } -/************************************************************************* -|* -|* RscMgr::WriteRcHeader() -|* -*************************************************************************/ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId &rId, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -286,11 +231,6 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, return( aError ); } -/************************************************************************* -|* -|* RscMgr::WriteRc() -|* -*************************************************************************/ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, RscTypCont *, sal_uInt32, sal_Bool ) @@ -298,221 +238,6 @@ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, return( ERR_OK ); } - -static rtl::OString MakeSmartName( const rtl::OString& rDefName ) -{ - rtl::OStringBuffer aSmartName; - if( rDefName.getStr() ) - { - char * pStr = (char *)rDefName.getStr(); - aSmartName.append(static_cast<sal_Char>(toupper(*pStr))); - while( *++pStr ) - { - if( '_' == *pStr ) - { - if( *++pStr ) - aSmartName.append(static_cast<sal_Char>(toupper(*pStr))); - else - break; - } - else - aSmartName.append(static_cast<sal_Char>(tolower(*pStr))); - } - } - return aSmartName.makeStringAndClear(); -} - -static rtl::OString MakeName( RscTypCont * pTypCon, RscTop * pClass, - const rtl::OString& rName ) -{ - rtl::OStringBuffer aRet; - if( !pTypCon->IsSmart() || isdigit( rName[0] ) ) - { - aRet.append(pHS->getString( pClass->GetId() ).getStr()); - aRet.append(rName); - } - else - aRet.append(MakeSmartName(rName)); - return aRet.makeStringAndClear(); -} - -/************************************************************************* -|* -|* RscMgr::WriteHxxHeader() -|* -*************************************************************************/ -ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId &rId ) -{ - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = NULL; - - pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); - - if( pClassData->aRefId.IsId() ) - { - pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); - if( !pObjNode && pTC ) - { - rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); - aMsg.append(' ').append(pClassData->aRefId.GetName()); - aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr()); - } - } - - if( pObjNode ) - { - RSCINST aRefI; - - aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); - aError = aRefI.pClass->WriteHxxHeader( aRefI, fOutput, pTC, - rId ); - } - else if (pTC) - { - fprintf( fOutput, "class %s", - MakeName( pTC, rInst.pClass, - rId.GetName() ).getStr() ); - fprintf( fOutput, " : public %s", - pHS->getString( rInst.pClass->GetId() ).getStr() ); - fprintf( fOutput, "\n{\nprotected:\n" ); - - aError = RscClass::WriteHxx( rInst, fOutput, pTC, rId ); - - RSCINST aExtraInst = rInst.pClass->GetCopyVar( rInst, nRsc_EXTRADATA ); - if( aExtraInst.IsInst() ) - { - if( aExtraInst.pClass->GetCount( aExtraInst ) ) - fprintf( fOutput, " char * pExtraData;\n" ); - } - if( aError.IsOk() ) - { - fprintf( fOutput, "public:\n " ); - fprintf( fOutput, "%s%s bFreeRes = TRUE )", - MakeName( pTC, rInst.pClass, - rId.GetName() ).getStr(), - (rInst.pClass->aCallParType).getStr() ); - fprintf( fOutput, ";\n};\n\n" ); - } - }; - return aError; -} - -/************************************************************************* -|* -|* RscMgr::WriteHxx() -|* -*************************************************************************/ -ERRTYPE RscMgr::WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ) -{ - fprintf( fOutput, " %s", pHS->getString( rInst.pClass->GetId() ).getStr() ); - fprintf( fOutput, " a%s;\n", - MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() ); - - return ERR_OK; -} - -/************************************************************************* -|* -|* RscClass::WriteCxxHeader() -|* -*************************************************************************/ -ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ) -{ - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = NULL; - - pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size()); - - if( pClassData->aRefId.IsId() ) - { - pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); - if( !pObjNode && pTC ) - { - rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); - aMsg.append(' ').append(pClassData->aRefId.GetName()); - aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error( aError, rInst.pClass, rId, aMsg.getStr() ); - } - } - - if( pObjNode ) - { - RSCINST aRefI; - - aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); - aError = aRefI.pClass->WriteCxxHeader( aRefI, fOutput, pTC, - rId ); - } - else if (pTC) - { - fprintf( fOutput, "%s::%s", - MakeName( pTC, rInst.pClass, rId.GetName() ).getStr(), - MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() ); - fprintf( fOutput, "%s", (rInst.pClass->aCallParType).getStr() ); - if( GetCount( rInst ) ) - fprintf( fOutput, " bFreeRes" ); - fprintf( fOutput, " )\n : %s", pHS->getString( rInst.pClass->GetId() ).getStr() ); - fprintf( fOutput, "%s", (rInst.pClass->aCallPar1).getStr() ); - fprintf( fOutput, " rResId )" ); - - aError = RscClass::WriteCxx( rInst, fOutput, pTC, rId ); - - fprintf( fOutput, "\n{\n" ); - RSCINST aExtraInst = rInst.pClass->GetCopyVar( rInst, nRsc_EXTRADATA ); - if( aExtraInst.IsInst() ) - { - if( aExtraInst.pClass->GetCount( aExtraInst ) ) - { - fprintf( fOutput, " //read extra data\n" ); - fprintf( fOutput, " pExtraData = new char " - "[ GetRemainSizeRes() ];\n" ); - fprintf( fOutput, " memcpy( pExtraData, " - "GetClassRes(), GetRemainSizeRes() );\n" ); - fprintf( fOutput, " IncrementRes( GetRemainSizeRes() );\n" ); - } - } - - if( GetCount( rInst ) ) - { // Es gibt UnterResourcen - fprintf( fOutput, " if( bFreeRes ) FreeResource();\n" ); - } - else - { - fprintf( fOutput, - " // No subresources, automatic free resource\n" ); - } - fprintf( fOutput, "}\n\n" ); - } - return aError; -} - -/************************************************************************* -|* -|* RscClass::WriteCxx() -|* -*************************************************************************/ -ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ) -{ - fprintf( fOutput, ",\n a%s", - MakeName( pTC, rInst.pClass, rId.GetName() ).getStr() ); - fprintf( fOutput, "%s", (rInst.pClass->aCallPar2).getStr() ); - fprintf( fOutput, " ResId( %s ) )", (rId.GetName()).getStr() ); - - return ERR_OK; -} - -/************************************************************************* -|* -|* RscArray::IsConsistent() -|* -*************************************************************************/ sal_Bool RscMgr::IsConsistent( const RSCINST & rInst ) { sal_Bool bRet; @@ -532,11 +257,6 @@ sal_Bool RscMgr::IsConsistent( const RSCINST & rInst ) return( bRet ); } -/************************************************************************* -|* -|* RscMgr::GetRef() -|* -*************************************************************************/ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ RscMgrInst * pClassData; @@ -545,11 +265,6 @@ ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){ return ERR_OK; } -/************************************************************************* -|* -|* RscMgr::IsToDeep() -|* -*************************************************************************/ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) { RscMgrInst * pClassData; @@ -585,11 +300,6 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep ) return( aError ); } -/************************************************************************* -|* -|* RscMgr::SetRef() -|* -*************************************************************************/ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) { RscMgrInst * pClassData; diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 7619ee5df0a2..fe06d341e2ae 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -17,27 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Solar Definitionen -#include <tools/solar.h> - -// Programmabh�ngige Includes. #include <rscrange.hxx> -/****************** D E F I N E S ****************************************/ -/****************** C O D E **********************************************/ -/****************** R s c R a n g e **************************************/ -/************************************************************************* -|* -|* RscRange::RscRange() -|* -*************************************************************************/ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) { @@ -45,21 +31,11 @@ RscRange::RscRange( Atom nId, sal_uInt32 nTypeId ) nSize = ALIGNED_SIZE( sizeof( RscRangeInst ) ); } -/************************************************************************* -|* -|* RscRange::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscRange::GetClassType() const { return RSCCLASS_NUMBER; } -/************************************************************************* -|* -|* RscRange::SetRange() -|* -*************************************************************************/ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { if( nMinimum > nMaximum ) @@ -76,11 +52,6 @@ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscRange::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { if( pDef ) @@ -95,11 +66,6 @@ sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return sal_False; } -/************************************************************************* -|* -|* RscRange::SetNumber() -|* -*************************************************************************/ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) @@ -109,22 +75,12 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscRange::GetNumber() -|* -*************************************************************************/ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { *pN = ((RscRangeInst *)rInst.pData)->nValue + nMin; return( ERR_OK ); } -/************************************************************************* -|* -|* RscRange::Create() -|* -*************************************************************************/ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { @@ -155,22 +111,12 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } -/************************************************************************* -|* -|* RscRange::WriteSrc() -|* -*************************************************************************/ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { fprintf( fOutput, "%ld", long( ((RscRangeInst *)rInst.pData)->nValue + nMin ) ); } -/************************************************************************* -|* -|* RscRange::WriteRc() -|* -*************************************************************************/ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) { @@ -190,28 +136,6 @@ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, return( ERR_OK ); } -//======================================================================= -void RscRange::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( ", pName ); - if( nMin >= 0 ) - fprintf( fOutput, "*(sal_uInt32 *)(pResData+nOffset) );\n" ); - else - fprintf( fOutput, "*(sal_Int32 *)(pResData+nOffset) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( sal_uInt32 );\n" ); -} - -/****************** R s c L o n g R a n g e ******************************/ -/************************************************************************* -|* -|* RscLongRange::RscLongRange() -|* -*************************************************************************/ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) { @@ -219,21 +143,11 @@ RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId ) nSize = ALIGNED_SIZE( sizeof( RscLongRangeInst ) ); } -/************************************************************************* -|* -|* RscLongRange::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscLongRange::GetClassType() const { return RSCCLASS_NUMBER; } -/************************************************************************* -|* -|* RscLongRange::SetRange() -|* -*************************************************************************/ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { if( nMinimum > nMaximum ) @@ -250,11 +164,6 @@ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscLongRange::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) { if( pDef ) @@ -265,11 +174,6 @@ sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) return sal_False; } -/************************************************************************* -|* -|* RscLongRange::SetNumber() -|* -*************************************************************************/ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) @@ -280,11 +184,6 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscLongRange::GetNumber() -|* -*************************************************************************/ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) { memmove( pN, &((RscLongRangeInst*)rInst.pData)->nValue, @@ -292,11 +191,6 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscLongRange::Create() -|* -*************************************************************************/ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { @@ -330,11 +224,6 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } -/************************************************************************* -|* -|* RscLongRange::WriteSrc() -|* -*************************************************************************/ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -343,11 +232,6 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, fprintf( fOutput, "%d", static_cast<int>(lVal) ); } -/************************************************************************* -|* -|* RscLongRange::WriteRc() -|* -*************************************************************************/ ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) { @@ -359,47 +243,17 @@ ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, return( ERR_OK ); } -//======================================================================= -void RscLongRange::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( ", pName ); - fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" ); -} - -/****************** R s c L o n g E n u m R a n g e *********************/ -/************************************************************************* -|* RscLongEnumRange::RscLongEnumRange() -|* -|* Beschreibung -*************************************************************************/ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId ) : RscLongRange( nId, nTypeId ) { } -/************************************************************************* -|* RscLongEnumRange::SetConst() -|* -|* Beschreibung -*************************************************************************/ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, sal_Int32 nValue ) { return SetNumber( rInst, nValue ); } -/****************** R s c I d R a n g e **********************************/ -/************************************************************************* -|* -|* RscIdRange::RscIdRange() -|* -*************************************************************************/ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) { @@ -407,21 +261,11 @@ RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId ) nMin = nMax = 0; } -/************************************************************************* -|* -|* RscIdRange::RscIdRange() -|* -*************************************************************************/ RSCCLASS_TYPE RscIdRange::GetClassType() const { return RSCCLASS_NUMBER; } -/************************************************************************* -|* -|* RscIdRange::Create() -|* -*************************************************************************/ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){ RSCINST aInst; RscId * pClassData; @@ -455,20 +299,10 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOw return( aInst ); } -/************************************************************************* -|* -|* RscIdRange::Destroy() -|* -*************************************************************************/ void RscIdRange :: Destroy( const RSCINST & rInst ){ ((RscId *)rInst.pData)->Destroy(); } -/************************************************************************* -|* -|* RscIdRange::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pDef ){ if( ((RscId*)rInst.pData)->aExp.IsNumber() @@ -485,11 +319,6 @@ sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ return sal_False; } -/************************************************************************* -|* -|* RscIdRange::SetNumber() -|* -*************************************************************************/ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) { if( nMax < nValue || nMin > nValue ) @@ -500,21 +329,11 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) return( ERR_OK ); } -/************************************************************************* -|* -|* RscIdRange::GetNumber() -|* -*************************************************************************/ ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){ *plValue = ((RscId *)rInst.pData)->GetNumber(); return( ERR_OK ); } -/************************************************************************* -|* -|* RscIdRange::SetRef() -|* -*************************************************************************/ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ ERRTYPE aError; if( rRscId.IsId() ){ @@ -530,33 +349,18 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){ return( aError ); } -/************************************************************************* -|* -|* RscIdRange::GetRef() -|* -*************************************************************************/ ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){ *pRscId = *(RscId *)rInst.pData; return( ERR_OK ); } -/************************************************************************* -|* -|* RscIdRange::WriteSrc() -|* -*************************************************************************/ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { fprintf( fOutput, "%s", ((RscId *)rInst.pData)->GetName().getStr() ); } -/************************************************************************* -|* -|* RscIdRange::WriteRc() -|* -*************************************************************************/ ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont *, sal_uInt32, sal_Bool ) { @@ -567,24 +371,6 @@ ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, return( ERR_OK ); } -//======================================================================= -void RscIdRange::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( ", pName ); - fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" ); -} - -/************************************************************************* -|* -|* RscIdRange::IsConsistent() -|* -*************************************************************************/ sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst ) { long nValue = ((RscId *)rInst.pData)->GetNumber(); @@ -595,33 +381,17 @@ sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst ) } } -/****************** R s c B o o l ****************************************/ -/************************************************************************* -|* -|* RscBool::RscBool() -|* -*************************************************************************/ RscBool::RscBool( Atom nId, sal_uInt32 nTypeId ) : RscRange( nId, nTypeId ) { RscRange::SetRange( 0, 1 ); } -/************************************************************************* -|* -|* RscBool::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscBool::GetClassType() const { return RSCCLASS_BOOL; } -/************************************************************************* -|* -|* RscBool::WriteSrc() -|* -*************************************************************************/ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -634,36 +404,12 @@ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput, fprintf( fOutput, "FALSE" ); } -//======================================================================= -void RscBool::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tSet%s( ", pName ); - fprintf( fOutput, "(sal_Bool)*(short *)(pResData+nOffset) );\n" ); - fprintf( fOutput, "\t\tnOffset += sizeof( short );\n" ); -} - -/****************** R s c B r e a k R a n g e ****************************/ -/************************************************************************* -|* -|* RscBreakRange::SetNumber() -|* -*************************************************************************/ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId ) : RscRange( nId, nTypeId ) { nOutRange = 0xFFFFFFFF; } -/************************************************************************* -|* -|* RscBreakRange::SetNumber() -|* -*************************************************************************/ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){ if( nValue == nOutRange ) return( ERR_RSCRANGE_OUTDEFSET ); @@ -671,11 +417,6 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){ return( RscRange::SetNumber( rInst, nValue ) ); } -/************************************************************************* -|* -|* RscBreakRange::Create() -|* -*************************************************************************/ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index fa4d85139e9f..c0a05607ccee 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -17,27 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Programmabh�ngige Includes. #include <rscdb.hxx> #include <rscstr.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> -/****************** C O D E **********************************************/ -/****************** R s c S t r i n g ************************************/ -/************************************************************************* -|* -|* RscString::RscString() -|* -*************************************************************************/ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) : RscTop( nId, nTypeId ) { @@ -45,21 +35,11 @@ RscString::RscString( Atom nId, sal_uInt32 nTypeId ) pRefClass = NULL; } -/************************************************************************* -|* -|* RscString::GetClassType() -|* -*************************************************************************/ RSCCLASS_TYPE RscString::GetClassType() const { return RSCCLASS_STRING; } -/************************************************************************* -|* -|* RscString::SetNumber() -|* -*************************************************************************/ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ char * pTmp; ERRTYPE aError; @@ -85,31 +65,16 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){ return( aError ); } -/************************************************************************* -|* -|* RscString::GetString() -|* -*************************************************************************/ ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){ *ppStr = ((RscStringInst *)rInst.pData)->pStr; return( ERR_OK ); } -/************************************************************************* -|* -|* RscString::GetRef() -|* -*************************************************************************/ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){ *pRscId = ((RscStringInst *)rInst.pData)->aRefId; return( ERR_OK ); } -/************************************************************************* -|* -|* RscString::SetRef() -|* -*************************************************************************/ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ if( pRefClass ){ ((RscStringInst *)rInst.pData)->aRefId = rRefId; @@ -121,11 +86,6 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){ return ERR_OK; } -/************************************************************************* -|* -|* RscString::Create() -|* -*************************************************************************/ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ) { @@ -156,22 +116,12 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, return( aInst ); } -/************************************************************************* -|* -|* RscString::Destroy() -|* -*************************************************************************/ void RscString::Destroy( const RSCINST & rInst ){ if( ((RscStringInst *)rInst.pData)->pStr ) rtl_freeMemory( ((RscStringInst *)rInst.pData)->pStr ); ((RscStringInst *)rInst.pData)->aRefId.Destroy(); } -/************************************************************************* -|* -|* RscString::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ RscStringInst * pData = (RscStringInst*)rInst.pData; RscStringInst * pDefData = (RscStringInst*)pDef; @@ -215,11 +165,6 @@ sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ return sal_False; } -/************************************************************************* -|* -|* RscString::WriteSrc() -|* -*************************************************************************/ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont *, sal_uInt32, const char * ) { @@ -259,11 +204,6 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, } } -/************************************************************************* -|* -|* RscString::WriteRc() -|* -*************************************************************************/ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -332,17 +272,4 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return( aError ); } -//================================================================== -void RscString::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - fprintf( fOutput, "\t\tString aStr( (const char*)(pResData+nOffset) );\n" ); - fprintf( fOutput, "\t\tSet%s( aStr );\n", pName ); - fprintf( fOutput, "\t\tnOffset += GetStringSizeRes( aStr );\n" ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 791606edf39e..454a4abdd6de 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -17,22 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdio.h> #include <string.h> // Solar Definitionen #include <tools/solar.h> #include <rsctop.hxx> -/****************** C O D E **********************************************/ -/****************** R s c T o p ******************************************/ -/************************************************************************* -|* -|* RscTop::RscTop() -|* -*************************************************************************/ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) : RefNode( nId ) , pSuperClass( pSuperCl ) @@ -44,11 +35,6 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) pSuperClass->aCallParType ); } -/************************************************************************* -|* -|* RscTop::SetCallPar() -|* -*************************************************************************/ void RscTop::SetCallPar(const rtl::OString& rPar1, const rtl::OString& rPar2, const rtl::OString& rParType) { @@ -57,11 +43,6 @@ void RscTop::SetCallPar(const rtl::OString& rPar1, const rtl::OString& rPar2, aCallParType = rParType; } -/************************************************************************* -|* -|* RscTop::GetDefault() -|* -*************************************************************************/ RSCINST RscTop::GetDefault() { if( !aDfltInst.IsInst() ) @@ -69,11 +50,6 @@ RSCINST RscTop::GetDefault() return aDfltInst; } -/************************************************************************* -|* -|* RscTop::Pre_dtor() -|* -*************************************************************************/ void RscTop :: Pre_dtor(){ if( aDfltInst.IsInst() ){ aDfltInst.pClass->Destroy( aDfltInst ); @@ -82,20 +58,10 @@ void RscTop :: Pre_dtor(){ }; } -/************************************************************************* -|* -|* RscTop::GetConstant() -|* -*************************************************************************/ Atom RscTop :: GetConstant( sal_uInt32 ){ return InvalidAtom; } -/************************************************************************* -|* -|* RscTop::GetIndexType() -|* -*************************************************************************/ RscTop * RscTop::GetTypeClass() const { if( pSuperClass ) @@ -104,11 +70,6 @@ RscTop * RscTop::GetTypeClass() const return NULL; } -/************************************************************************* -|* -|* RscTop::Size() -|* -*************************************************************************/ sal_uInt32 RscTop :: Size() { if( pSuperClass ) @@ -117,11 +78,6 @@ sal_uInt32 RscTop :: Size() return 0; } -/************************************************************************* -|* -|* RscTop::GetRef() -|* -*************************************************************************/ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ if( pSuperClass ) return pSuperClass->GetRef( rInst, pRscId ); @@ -129,11 +85,6 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::InHierarchy() -|* -*************************************************************************/ sal_Bool RscTop::InHierarchy( RscTop * pClass ){ if( this == pClass ) return( sal_True ); @@ -142,11 +93,6 @@ sal_Bool RscTop::InHierarchy( RscTop * pClass ){ return( sal_False ); } -/************************************************************************* -|* -|* RscTop::SetVariable() -|* -*************************************************************************/ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, Atom nDataBaseName ) @@ -159,22 +105,12 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::EnumVariable() -|* -*************************************************************************/ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) { if( pSuperClass ) pSuperClass->EnumVariables( pData, pProc ); } -/************************************************************************* -|* -|* RscTop::GetVariable() -|* -*************************************************************************/ RSCINST RscTop::GetVariable ( const RSCINST & rInst, @@ -191,11 +127,6 @@ RSCINST RscTop::GetVariable return RSCINST(); } -/************************************************************************* -|* -|* RscTop::GetCopyVar() -|* -*************************************************************************/ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) { if( pSuperClass ) @@ -205,11 +136,6 @@ RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) return RSCINST(); } -/************************************************************************* -|* -|* RscTop::GetTupelVar() -|* -*************************************************************************/ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, const RSCINST & rInitInst ) { @@ -219,11 +145,6 @@ RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, return RSCINST(); } -/************************************************************************* -|* -|* RscTop::GetElement() -|* -*************************************************************************/ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop *pCreateClass, const RSCINST & rCreateInst, RSCINST * pGetInst ) @@ -237,11 +158,6 @@ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetArrayEle() -|* -*************************************************************************/ ERRTYPE RscTop::GetArrayEle ( const RSCINST & rInst, @@ -256,11 +172,6 @@ ERRTYPE RscTop::GetArrayEle return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetValueEle() -|* -*************************************************************************/ ERRTYPE RscTop::GetValueEle ( const RSCINST & rInst, @@ -275,11 +186,6 @@ ERRTYPE RscTop::GetValueEle return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SearchEle() -|* -*************************************************************************/ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, RscTop * pClass ) { @@ -290,11 +196,6 @@ RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, return RSCINST(); } -/************************************************************************* -|* -|* RscTop::GetPosEle() -|* -*************************************************************************/ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ if( pSuperClass ) return pSuperClass-> @@ -303,11 +204,6 @@ RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){ return RSCINST(); } -/************************************************************************* -|* -|* RscTop::MovePosEle() -|* -*************************************************************************/ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, sal_uInt32 nSourcePos ) { @@ -318,11 +214,6 @@ ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SetPosRscId() -|* -*************************************************************************/ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, const RscId & rRscId ) { @@ -333,11 +224,6 @@ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetInfoEle() -|* -*************************************************************************/ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ if( pSuperClass ) return pSuperClass-> @@ -346,11 +232,6 @@ SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){ return SUBINFO_STRUCT(); } -/************************************************************************* -|* -|* RscTop::GetCount() -|* -*************************************************************************/ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ if( pSuperClass ) return pSuperClass->GetCount( rInst ); @@ -358,11 +239,6 @@ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){ return 0; } -/************************************************************************* -|* -|* RscTop::SetNumber() -|* -*************************************************************************/ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ if( pSuperClass ) return pSuperClass-> @@ -371,11 +247,6 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SetBool() -|* -*************************************************************************/ ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){ if( pSuperClass ) return pSuperClass-> @@ -384,11 +255,6 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SetConst() -|* -*************************************************************************/ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) { if( pSuperClass ) @@ -397,11 +263,6 @@ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SetNotConst() -|* -*************************************************************************/ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ if( pSuperClass ) return pSuperClass-> @@ -410,11 +271,6 @@ ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::SetString() -|* -*************************************************************************/ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ if( pSuperClass ) return pSuperClass-> @@ -423,11 +279,6 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetNumber() -|* -*************************************************************************/ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){ if( pSuperClass ) return pSuperClass-> @@ -436,11 +287,6 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetBool() -|* -*************************************************************************/ ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){ if( pSuperClass ) return pSuperClass-> @@ -449,11 +295,6 @@ ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetCont() -|* -*************************************************************************/ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ if( pSuperClass ) return pSuperClass-> @@ -462,11 +303,6 @@ ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::GetString() -|* -*************************************************************************/ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ if( pSuperClass ) return pSuperClass-> @@ -475,11 +311,6 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::Create() -|* -*************************************************************************/ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwnRange ) { if( pSuperClass ) @@ -492,21 +323,11 @@ RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwn } } -/************************************************************************* -|* -|* RscTop::Destroy() -|* -*************************************************************************/ void RscTop::Destroy( const RSCINST & rInst ){ if( pSuperClass ) pSuperClass->Destroy( rInst ); } -/************************************************************************* -|* -|* RscTop::IsConsistent() -|* -*************************************************************************/ sal_Bool RscTop::IsConsistent( const RSCINST & rInst ) { if( pSuperClass ) @@ -515,22 +336,12 @@ sal_Bool RscTop::IsConsistent( const RSCINST & rInst ) return sal_True; } -/************************************************************************* -|* -|* RscTop::SetToDefault() -|* -*************************************************************************/ void RscTop::SetToDefault( const RSCINST & rInst ) { if( pSuperClass ) pSuperClass->SetToDefault( rInst ); } -/************************************************************************* -|* -|* RscTop::IsDefault() -|* -*************************************************************************/ sal_Bool RscTop::IsDefault( const RSCINST & rInst ){ if( pSuperClass ) return pSuperClass->IsDefault( rInst ); @@ -538,11 +349,6 @@ sal_Bool RscTop::IsDefault( const RSCINST & rInst ){ return sal_True; } -/************************************************************************* -|* -|* RscTop::IsValueDefault() -|* -*************************************************************************/ sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ if( pSuperClass ) return pSuperClass->IsValueDefault( rInst, pDef ); @@ -550,21 +356,11 @@ sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){ return sal_True; } -/************************************************************************* -|* -|* RscTop::SetDefault() -|* -*************************************************************************/ void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){ if( pSuperClass ) pSuperClass->SetDefault( rInst, nVarId ); } -/************************************************************************* -|* -|* RscTop::GetDefault() -|* -*************************************************************************/ RSCINST RscTop::GetDefault( Atom nVarId ){ if( pSuperClass ) return pSuperClass-> @@ -573,11 +369,6 @@ RSCINST RscTop::GetDefault( Atom nVarId ){ return RSCINST(); } -/************************************************************************* -|* -|* RscTop::Delete() -|* -*************************************************************************/ void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, const RscId & rId ) { @@ -585,22 +376,12 @@ void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, pSuperClass->Delete( rInst, pClass, rId ); } -/************************************************************************* -|* -|* RscTop::DeletePos() -|* -*************************************************************************/ void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) { if( pSuperClass ) pSuperClass->DeletePos( rInst, nPos ); } -/************************************************************************* -|* -|* RscTop::SetRef() -|* -*************************************************************************/ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ if( pSuperClass ) return pSuperClass->SetRef( rInst, rRefId ); @@ -608,65 +389,6 @@ ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){ return ERR_UNKNOWN_METHOD; } -/************************************************************************* -|* -|* RscTop::WriteHxxHeader() -|* -*************************************************************************/ -ERRTYPE RscTop::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ) -{ - if( pSuperClass ) - return pSuperClass->WriteHxxHeader( rInst, fOutput, pTC, rId ); - else - return rInst.pClass->WriteHxx( rInst, fOutput, pTC, rId ); -} - -/************************************************************************* -|* -|* RscTop::WriteHxx() -|* -*************************************************************************/ -ERRTYPE RscTop::WriteHxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ){ - if( pSuperClass ) - return pSuperClass->WriteHxx( rInst, fOutput, pTC, rId ); - else - return( ERR_OK ); -} - -/************************************************************************* -|* -|* RscTop::WriteCxxHeader() -|* -*************************************************************************/ -ERRTYPE RscTop::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ) -{ - if( pSuperClass ) - return pSuperClass->WriteCxxHeader( rInst, fOutput, pTC, rId ); - else - return rInst.pClass->WriteCxx( rInst, fOutput, pTC, rId ); -} - -/************************************************************************* -|* -|* RscTop::WriteCxx() -|* -*************************************************************************/ -ERRTYPE RscTop::WriteCxx( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, const RscId & rId ){ - if( pSuperClass ) - return pSuperClass->WriteCxx( rInst, fOutput, pTC, rId ); - else - return ERR_OK; -} - -/************************************************************************* -|* -|* RscTop::WriteSrcHeader() -|* -*************************************************************************/ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const RscId & rId, const char * pVarName ) @@ -677,11 +399,6 @@ void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* -|* RscTop::WriteSrc() -|* -*************************************************************************/ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) { @@ -689,11 +406,6 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, pSuperClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); } -/************************************************************************* -|* -|* RscTop::WriteRcHeader() -|* -*************************************************************************/ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, const RscId & rId, sal_uInt32 nDeep, sal_Bool bExtra ) @@ -705,11 +417,6 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, return( rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra ) ); } -/************************************************************************* -|* -|* RscTop::WriteRc() -|* -*************************************************************************/ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra ) { @@ -720,53 +427,4 @@ ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, return( ERR_OK ); } -/************************************************************************* -|* -|* RscTop::WriteSyntaxHeader() -|* -*************************************************************************/ -void RscTop::WriteSyntaxHeader( FILE * fOutput, RscTypCont * pTC ) -{ - if( GetId() != InvalidAtom ) - { - fprintf( fOutput, "class %s \n{\n", pHS->getString( GetId() ).getStr() ); - WriteSyntax( fOutput, pTC ); - fprintf( fOutput, "};\n\n" ); - } -} - -/************************************************************************* -|* -|* RscTop::WriteSyntax() -|* -*************************************************************************/ -void RscTop::WriteSyntax( FILE * fOutput, RscTypCont * pTC ) -{ - if( pSuperClass ) - pSuperClass->WriteSyntax( fOutput, pTC ); -} - -//======================================================================== -void RscTop::WriteRcAccess -( - FILE * fOutput, - RscTypCont * /*pTC*/, - const char * pName -) -{ - if( GetId() != InvalidAtom ) - { - fprintf( fOutput, "\t\t//%s %s\n", - pHS->getString( GetId() ).getStr(), pName ); - } -} - -//======================================================================== -void RscTop::WriteRcCtor( FILE * fOutput, RscTypCont * pTC ) -{ - if( pSuperClass ) - pSuperClass->WriteRcCtor( fOutput, pTC ); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 8b6901189f6e..133daec3d268 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************************************************************/ -/* Include File */ -/****************************************************************/ - #include <stdlib.h> #include <stdio.h> #include <fcntl.h> @@ -62,8 +58,6 @@ using comphelper::string::getToken; using comphelper::string::getTokenCount; -/*************** F o r w a r d s *****************************************/ -/*************** G l o b a l e V a r i a b l e n **********************/ rtl::OString* pStdParType = NULL; rtl::OString* pStdPar1 = NULL; rtl::OString* pStdPar2 = NULL; @@ -74,14 +68,6 @@ sal_uInt32 nRefDeep = 10; AtomContainer* pHS = NULL; -/*************** R s c C m d L i n e ************************************/ -/************************************************************************* -|* -|* RscCmdLine::Init() -|* -|* Beschreibung Kommandozeile interpretierten -|* -*************************************************************************/ void RscCmdLine::Init() { nCommands = 0; @@ -92,22 +78,15 @@ void RscCmdLine::Init() m_aOutputFiles.push_back( OutputFile() ); } -/************************************************************************* -|* -|* RscCmdLine::RscCmdLine() -|* -|* Beschreibung Kommandozeile interpretierten -|* -*************************************************************************/ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) { char * pStr; char ** ppStr; - RscPtrPtr aCmdLine; // Kommandozeile + RscPtrPtr aCmdLine; sal_uInt32 i; sal_Bool bOutputSrsIsSet = sal_False; - Init(); // Defaults setzen + Init(); pStr = ::ResponseFile( &aCmdLine, argv, argc ); if( pStr ) @@ -126,24 +105,15 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) { if( !rsc_stricmp( (*ppStr) + 1, "h" ) || !strcmp( (*ppStr) + 1, "?" ) ) - { // Hilfe + { // Write help to standard output nCommands |= HELP_FLAG; } - else if( !rsc_stricmp( (*ppStr) + 1, "syntax" ) ) - { // Hilfe - nCommands |= PRINTSYNTAX_FLAG; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "RefDeep", 7 ) ) - { - // maximale Aufloesungtiefe fuer Referenzen - nRefDeep = rtl::OString((*ppStr) + 1 + RTL_CONSTASCII_LENGTH("RefDeep")).toInt32(); - } else if( !rsc_stricmp( (*ppStr) + 1, "p" ) ) - { // kein Preprozessor + { // No preprocessor nCommands |= NOPREPRO_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "s" ) ) - { // nicht linken + { // Syntax analysis, creates .srs file nCommands |= NOLINK_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "l" ) ) @@ -181,16 +151,12 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) { // Byte Ordnung beim Schreiben nByteOrder = RSC_BIGENDIAN; } - else if( !rsc_stricmp( (*ppStr) + 1, "SMART" ) ) - { // Byte Ordnung beim Schreiben - nCommands |= SMART_FLAG; - } else if( !rsc_strnicmp( (*ppStr) + 1, "d", 1 ) ) { // Symbole definieren nCommands |= DEFINE_FLAG; } else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) ) - { // Include-Pfade definieren + { // define include path nCommands |= INCLUDE_FLAG; rtl::OStringBuffer aBuffer(aPath); if (aBuffer.getLength()) @@ -199,7 +165,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) aPath = aBuffer.makeStringAndClear(); } else if( !rsc_strnicmp( (*ppStr) + 1, "fs=", 3 ) ) - { // anderer Name fuer .rc-file + { // define name of .res file if( m_aOutputFiles.back().aOutputRc.getLength() ) m_aOutputFiles.push_back( OutputFile() ); m_aOutputFiles.back().aOutputRc = (*ppStr) + 4; @@ -226,34 +192,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } } else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) - { // anderer Name fuer .srs-file + { // define name of .srs file aOutputSrs = (*ppStr) + 4; bOutputSrsIsSet = sal_True; } - else if( !rsc_strnicmp( (*ppStr) + 1, "fl=", 3 ) ) - { // Name fuer listing-file - aOutputLst = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fh=", 3 ) ) - { // Name fuer .hxx-file - aOutputHxx = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fc=", 3 ) ) - { // Name fuer .cxx-file - aOutputCxx = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fr=", 3 ) ) - { // Name fuer .cxx-file der Resource Konstruktoren - aOutputRcCtor = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fx=", 3 ) ) - { // Name fuer .src-file - aOutputSrc = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "ft=", 3 ) ) - { // touch file - aTouchFile = (*ppStr) + 4; - } else if( !rsc_strnicmp( (*ppStr) + 1, "oil=", 4 ) ) { aILDir = (*ppStr) + 5; @@ -263,13 +205,9 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) nCommands |= NOSYSRESTEST_FLAG; } else if( !rsc_stricmp( (*ppStr) + 1, "SrsDefault" ) ) - { // Bitmap, Pointers, Icons nicht ueberpruefen + { // Only write one language to srs file nCommands |= SRSDEFAULT_FLAG; } - else if( !rsc_strnicmp( (*ppStr) + 1, "CHARSET_", 8 ) ) - { - // ignore (was an option once) - } else if( !rsc_stricmp( (*ppStr) + 1, "lg" ) ) { m_aOutputFiles.back().aLangName = rtl::OString(); @@ -306,17 +244,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) if( ! bOutputSrsIsSet ) aOutputSrs = ::OutputFile( *aInputList.front(), "srs" ); } - else if( !(nCommands & PRINTSYNTAX_FLAG) ) + else pEH->FatalError( ERR_NOINPUT, RscId() ); } -/************************************************************************* -|* -|* RscCmdLine::~RscCmdLine() -|* -|* Beschreibung dtor -|* -*************************************************************************/ RscCmdLine::~RscCmdLine() { for ( size_t i = 0, n = aInputList.size(); i < n; ++i ) @@ -324,12 +255,6 @@ RscCmdLine::~RscCmdLine() aInputList.clear(); } -/************************************************************************* -|* -|* RscCmdLine::substitutePaths() -|* -*************************************************************************/ - OString RscCmdLine::substitutePaths( const OString& rIn ) { // prepare return value @@ -360,41 +285,16 @@ OString RscCmdLine::substitutePaths( const OString& rIn ) return aRet.makeStringAndClear(); } -/*************** 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( RscCmdLine * pLine, RscTypCont * pTypCont ) { fListing = NULL; fExitFile = NULL; - //Kommandozeile setzen, TypContainer setzen + //Set Command Line, set Type Container pCL = pLine; pTC = pTypCont; - - if( !pCL->aOutputLst.isEmpty() ) - { - if ( NULL == (fListing = fopen( pCL->aOutputLst.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputLst.getStr() ); - pTC->pEH->SetListFile( fListing ); - } } -/************************************************************************* -|* -|* RscCompiler :: RscCompiler() -|* -*************************************************************************/ RscCompiler::~RscCompiler() { pTC->pEH->SetListFile( NULL ); @@ -404,36 +304,13 @@ RscCompiler::~RscCompiler() if( fExitFile ) fclose( fExitFile ); - if( !aTmpOutputHxx.isEmpty() ) - unlink( aTmpOutputHxx.getStr() ); - if( !aTmpOutputCxx.isEmpty() ) - unlink( aTmpOutputCxx.getStr() ); - if( !aTmpOutputRcCtor.isEmpty() ) - unlink( aTmpOutputRcCtor.getStr() ); - if( !aTmpOutputSrc.isEmpty() ) - unlink( aTmpOutputSrc.getStr() ); } -/************************************************************************* -|* -|* RscCompiler::Start() -|* -|* Beschreibung Datei in Kommandozeile aendern -|* -*************************************************************************/ ERRTYPE RscCompiler::Start() { ERRTYPE aError; RscFile* pFName; - if( PRINTSYNTAX_FLAG & pCL->nCommands ) - { - pTC->WriteSyntax( stdout ); - printf( "khg\n" ); - return ERR_OK; - } - - // Kein Parameter, dann Hilfe if( pCL->aInputList.empty() ) pTC->pEH->FatalError( ERR_NOINPUT, RscId() ); @@ -489,13 +366,7 @@ ERRTYPE RscCompiler::Start() return( aError ); } -/************************************************************************* -|* -|* RscCmdLine::EndCompile() -|* -|* Beschreibung Datei in Kommandozeile aendern -|* -*************************************************************************/ + void RscCompiler::EndCompile() { if( !pCL->aOutputSrs.isEmpty() && (pCL->nCommands & NOLINK_FLAG) ) @@ -531,73 +402,8 @@ void RscCompiler::EndCompile() }; }; } - - if ( !aTmpOutputHxx.isEmpty() ) - { - pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose ); - pTC->pEH->StdOut( pCL->aOutputHxx.getStr(), RscVerbosityVerbose ); - pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); - - // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputHxx.getStr() ); // Zieldatei loeschen - Append( pCL->aOutputHxx, aTmpOutputHxx ); - unlink( aTmpOutputHxx.getStr() );// TempDatei loeschen - aTmpOutputHxx = rtl::OString(); - } - - if( !aTmpOutputCxx.isEmpty() ) - { - pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose ); - pTC->pEH->StdOut( pCL->aOutputCxx.getStr(), RscVerbosityVerbose ); - pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); - - // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputCxx.getStr() ); // Zieldatei loeschen - Append( pCL->aOutputCxx, aTmpOutputCxx ); - unlink( aTmpOutputCxx.getStr() );// TempDatei loeschen - aTmpOutputCxx = rtl::OString(); - } - - if( !aTmpOutputRcCtor.isEmpty() ) - { - pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose ); - pTC->pEH->StdOut( pCL->aOutputRcCtor.getStr(), RscVerbosityVerbose ); - pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); - - // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputRcCtor.getStr() ); // Zieldatei loeschen - Append( pCL->aOutputRcCtor, aTmpOutputRcCtor ); - unlink( aTmpOutputRcCtor.getStr() );// TempDatei loeschen - aTmpOutputRcCtor = rtl::OString(); - } - - if( !aTmpOutputSrc.isEmpty() ) - { - // kopiere von TMP auf richtigen Namen - unlink( pCL->aOutputSrc.getStr() ); // Zieldatei loeschen - Append( pCL->aOutputSrc, aTmpOutputSrc ); - unlink( aTmpOutputSrc.getStr() );// TempDatei loeschen - aTmpOutputSrc = rtl::OString(); - } - - if( !pCL->aTouchFile.isEmpty() ) - { - FILE* fp = fopen( pCL->aTouchFile.getStr(), "w" ); - if( fp ) - { - fprintf( fp, "Done\n" ); - fclose( fp ); - } - else - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aTouchFile.getStr() ); - } } -/************************************************************************* -|* -|* RscCompiler::IncludeParser() -|* -*************************************************************************/ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) { FILE * finput; @@ -657,11 +463,6 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey ) return aError; } -/************************************************************************* -|* -|* RscCompiler :: ParseOneFile() -|* -*************************************************************************/ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ) @@ -732,12 +533,6 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey, return( aError ); } -/************************************************************************* -|* -|* RscCompiler :: Link() -|* -*************************************************************************/ - namespace { using namespace ::osl; @@ -949,87 +744,9 @@ ERRTYPE RscCompiler::Link() }; } - // hxx-Datei schreiben - if( !pCL->aOutputHxx.isEmpty() && aError.IsOk() ) - { - aTmpOutputHxx = ::GetTmpFileName(); - if ( NULL == (fExitFile = foutput = fopen( aTmpOutputHxx.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputHxx.getStr() ); - - pTC->pEH->StdOut( "Generating .hxx file\n" ); - - // Schreibe Datei - aError = pTC->WriteHxx( foutput, NOFILE_INDEX ); - - fclose( foutput ); - fExitFile = NULL; - } - - // cxx-Datei schreiben - if( !pCL->aOutputCxx.isEmpty() && aError.IsOk() ) - { - aTmpOutputCxx = ::GetTmpFileName(); - if ( NULL == (fExitFile = foutput = fopen( aTmpOutputCxx.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputCxx.getStr() ); - - pTC->pEH->StdOut( "Generating .cxx file\n" ); - - rtl::OString aHxx = pCL->aOutputHxx; - if( aHxx.isEmpty() ) - { - rtl::OUString aUniOutputCxx(rtl::OStringToOUString(pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US)); - aHxx = rtl::OStringBuffer(rtl::OUStringToOString(DirEntry(aUniOutputCxx).GetBase(), - RTL_TEXTENCODING_ASCII_US)).append(".hxx").makeStringAndClear(); - } - - // Schreibe Datei - aError = pTC->WriteCxx( foutput, NOFILE_INDEX, aHxx ); - - fclose( foutput ); - fExitFile = NULL; - } - - // RcCtor-Datei schreiben - if( !pCL->aOutputRcCtor.isEmpty() && aError.IsOk() ) - { - aTmpOutputRcCtor = ::GetTmpFileName(); - if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputRcCtor.getStr() ); - - pTC->pEH->StdOut( "Generating .cxx resource constructor file\n" ); - - // Schreibe Datei - pTC->WriteRcCtor( foutput ); - - fclose( foutput ); - fExitFile = NULL; - } - - // src-Datei schreiben - if( !pCL->aOutputSrc.isEmpty() && aError.IsOk() ) - { - aTmpOutputSrc = ::GetTmpFileName(); - if ( NULL == (fExitFile = foutput = fopen( aTmpOutputSrc.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputSrc.getStr() ); - - // Schreibe Datei - pTC->WriteSrc( foutput, NOFILE_INDEX ); - - fclose( foutput ); - fExitFile = NULL; - }; - return( aError ); } -/********************************************************************/ -/* */ -/* Function : Append( ) */ -/* */ -/* Parameters : psw - pointer to a preprocessor switch */ -/* */ -/* Description : appends text files */ -/********************************************************************/ void RscCompiler::Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile ) { @@ -1041,12 +758,6 @@ void RscCompiler::Append( const rtl::OString& rOutputSrs, } } -/************************************************************************* -|* -|* GetImageFilePath() -|* -|*************************************************************************/ - bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, const rtl::OString& rBaseFileName, @@ -1130,8 +841,6 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, return bFound; } -// ------------------------------------------------------------------------------ - void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, const DirEntry& rSrsInPath, diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index fd37ec551ef8..526e695d6edc 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -17,26 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ #include <stdio.h> #include <string.h> #include <ctype.h> -// Solar Definitionen -#include <tools/solar.h> #include <rsctools.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> #include <rtl/alloc.h> -/************************************************************************* -|* -|* RscChar::MakeChar() -|* -|* Beschreibung Der String wird nach C-Konvention umgesetzt -|* -*************************************************************************/ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) { sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1; @@ -103,7 +93,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) } if( nChar > 255 ) { - // Wert zu gross, oder kein 3 Ziffern + // value is too big, or more than 3 digits delete [] pOrgStr; return( NULL ); } @@ -160,7 +150,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) delete[] pOrgStr, pOrgStr = 0; hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 ); - // factor fo 6 is the maximum size of an UNICODE character as utf8 + // factor of 6 is the maximum size of an UNICODE character as utf8 char * pUtf8 = (char *)rtl_allocateMemory( nUniSize * 6 ); rtl_convertUnicodeToText( hConv, 0, pUniCode, nUniSize, diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index d9e1afdda29a..04a5dcd7e8fd 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -17,39 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ // Programmuebergreifende Includes. #include <rscdef.hxx> -/****************** C o d e **********************************************/ -/****************** R s c I d ********************************************/ sal_Bool RscId::bNames = sal_True; -/************************************************************************* -|* -|* static RscId::SetNames -|* static RscId::SetNoNames -|* -*************************************************************************/ void RscId::SetNames( sal_Bool bSet ) { bNames = bSet; } -/************************************************************************* -|* -|* RscId::GetNumber -|* -*************************************************************************/ sal_Int32 RscId::GetNumber() const{ sal_Int32 lVal; aExp.Evaluate( &lVal ); return lVal; } -/************************************************************************* -|* -|* RscId::Create() -|* -*************************************************************************/ void RscId::Create( const RscExpType & rExpType ) { aExp = rExpType; @@ -63,33 +44,18 @@ void RscId::Create( const RscExpType & rExpType ) } } -/************************************************************************* -|* -|* RscId::Destroy() -|* -*************************************************************************/ void RscId::Destroy(){ if( aExp.IsDefinition() ) aExp.aExp.pDef->DecRef(); aExp.cType = RSCEXP_NOTHING; } -/************************************************************************* -|* -|* RscId::RscId() -|* -*************************************************************************/ RscId::RscId( const RscId& rRscId ){ aExp = rRscId.aExp; if( aExp.IsDefinition() ) aExp.aExp.pDef->IncRef(); } -/************************************************************************* -|* -|* RscId::RscId() -|* -*************************************************************************/ RscId::RscId( RscDefine * pDef ){ RscExpType aExpType; @@ -98,11 +64,6 @@ RscId::RscId( RscDefine * pDef ){ Create( aExpType ); } -/************************************************************************* -|* -|* RscId:: = -|* -*************************************************************************/ RscId& RscId::operator = ( const RscId& rRscId ){ if( rRscId.aExp.IsDefinition() ) rRscId.aExp.aExp.pDef->IncRef(); @@ -111,51 +72,26 @@ RscId& RscId::operator = ( const RscId& rRscId ){ return *this; } -/************************************************************************* -|* -|* RscId::operator == -|* -*************************************************************************/ sal_Bool RscId::operator == ( const RscId& rRscId ) const { return( GetNumber() == rRscId.GetNumber() ); } -/************************************************************************* -|* -|* RscId::operator < -|* -*************************************************************************/ sal_Bool RscId::operator < ( const RscId& rRscId ) const { return( GetNumber() < rRscId.GetNumber() ); } -/************************************************************************* -|* -|* RscId::operator > -|* -*************************************************************************/ sal_Bool RscId::operator > ( const RscId& rRscId ) const { return( GetNumber() > rRscId.GetNumber() ); } -/************************************************************************* -|* -|* RscId::sal_Int32() -|* -*************************************************************************/ RscId::operator sal_Int32() const { return( GetNumber() ); } -/************************************************************************* -|* -|* RscId::GetNames() -|* -*************************************************************************/ rtl::OString RscId::GetName() const { rtl::OStringBuffer aStr; @@ -171,12 +107,6 @@ rtl::OString RscId::GetName() const return aStr.makeStringAndClear(); } -/****************** R s c D e f i n e ************************************/ -/************************************************************************* -|* -|* RscDefine::RscDefine() -|* -*************************************************************************/ RscDefine::RscDefine( sal_uLong lKey, const rtl::OString& rDefName, sal_Int32 lDefId ) : StringNode( rDefName ) { @@ -196,11 +126,6 @@ RscDefine::RscDefine( sal_uLong lKey, const rtl::OString& rDefName, pExp = pExpression; } -/************************************************************************* -|* -|* RscDefine::~RscDefine() -|* -*************************************************************************/ RscDefine::~RscDefine(){ if( pExp ) delete pExp; @@ -208,11 +133,6 @@ RscDefine::~RscDefine(){ RscExit( 14 ); } -/************************************************************************* -|* -|* RscDefine::DecRef() -|* -*************************************************************************/ void RscDefine::DecRef(){ nRefCount--; if( 0 == nRefCount ){ @@ -220,11 +140,6 @@ void RscDefine::DecRef(){ } } -/************************************************************************* -|* -|* RscDefine::DefineToNumber() -|* -*************************************************************************/ void RscDefine::DefineToNumber() { if( pExp ) @@ -233,11 +148,6 @@ void RscDefine::DefineToNumber() SetName(rtl::OString::valueOf(lId)); } -/************************************************************************* -|* -|* RscDefine::Evaluate() -|* -*************************************************************************/ sal_Bool RscDefine::Evaluate(){ sal_Bool bRet = sal_True; @@ -247,20 +157,10 @@ sal_Bool RscDefine::Evaluate(){ return bRet; } -/************************************************************************* -|* -|* RscDefine::Search() -|* -*************************************************************************/ RscDefine * RscDefine::Search( const char * pStr ){ return (RscDefine *)StringNode::Search( pStr ); } -/************************************************************************* -|* -|* RscDefine::GetMacro() -|* -*************************************************************************/ rtl::OString RscDefine::GetMacro() { if( pExp ) @@ -268,12 +168,6 @@ rtl::OString RscDefine::GetMacro() return rtl::OString::valueOf(lId); } -/****************** R s c D e f i n e L i s t ****************************/ -/************************************************************************* -|* -|* RscDefineList::New() -|* -*************************************************************************/ RscDefine * RscDefineList::New( sal_uLong lFileKey, const rtl::OString& rDefName, sal_Int32 lDefId, size_t lPos ) { @@ -320,11 +214,6 @@ sal_Bool RscDefineList::Remove() { return sal_True; } -/************************************************************************* -|* -|* RscDefineList::WriteAll() -|* -*************************************************************************/ void RscDefineList::WriteAll( FILE * fOutput ) { for ( size_t i = 0, n = maList.size(); i < n; ++i ) { @@ -336,12 +225,6 @@ void RscDefineList::WriteAll( FILE * fOutput ) }; } -/****************** R s c E x p T y p e **********************************/ -/************************************************************************* -|* -|* RscExpType::Evaluate() -|* -*************************************************************************/ sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{ if( IsDefinition() ){ aExp.pDef->Evaluate(); @@ -369,12 +252,6 @@ void RscExpType::AppendMacro(rtl::OStringBuffer& rStr) const } -/****************** R s c E x p r e s s i o n ****************************/ -/************************************************************************* -|* -|* RscExpression::RscExpression() -|* -*************************************************************************/ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) { aLeftExp = aLE; @@ -386,11 +263,6 @@ RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) aRightExp.aExp.pDef->IncRef(); } -/************************************************************************* -|* -|* RscExpression::~RscExpression() -|* -*************************************************************************/ RscExpression::~RscExpression(){ if( aLeftExp.IsDefinition() ) aLeftExp.aExp.pDef->DecRef(); @@ -403,11 +275,6 @@ RscExpression::~RscExpression(){ delete aRightExp.aExp.pExp; } -/************************************************************************* -|* -|* RscExpression::Evaluate() -|* -*************************************************************************/ sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ sal_Int32 lLeft; sal_Int32 lRight; @@ -438,11 +305,6 @@ sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ return sal_False; } -/************************************************************************* -|* -|* RscExpression::GetMacro() -|* -*************************************************************************/ rtl::OString RscExpression::GetMacro() { rtl::OStringBuffer aLeft; @@ -479,12 +341,6 @@ rtl::OString RscExpression::GetMacro() return aLeft.makeStringAndClear(); } -/****************** R s c F i l e ****************************************/ -/************************************************************************* -|* -|* RscFile::RscFile() -|* -*************************************************************************/ RscFile :: RscFile(){ bLoaded = sal_False; bIncFile = sal_False; @@ -492,11 +348,6 @@ RscFile :: RscFile(){ bScanned = sal_False; } -/************************************************************************* -|* -|* RscFile::~RscFile() -|* -*************************************************************************/ RscFile :: ~RscFile() { for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) delete aDepLst[ i ]; @@ -507,15 +358,6 @@ RscFile :: ~RscFile() { while( aDefLst.Remove() ) ; } -/************************************************************************* -|* -|* RscFile::Depend() -|* -|* Beschreibung Diese Methode gibt sal_True zurueck, wenn lDepend -|* existiert und hinter lFree steht, oder wenn -|* lDepend nicht existiert. -|* -*************************************************************************/ sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){ RscDepend * pDep; @@ -535,11 +377,6 @@ sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){ return sal_True; } -/************************************************************************* -|* -|* RscFile::InsertDependFile() -|* -*************************************************************************/ sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos ) { for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) @@ -562,21 +399,10 @@ sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos ) return sal_True; } -/****************** R s c D e f T r e e **********************************/ -/************************************************************************* -|* -|* RscDefTree::~RscDefTree() -|* -*************************************************************************/ RscDefTree::~RscDefTree(){ Remove(); } -/************************************************************************* -|* -|* RscDefTree::Remove() -|* -*************************************************************************/ void RscDefTree::Remove(){ RscDefine * pDef; while( pDefRoot ){ @@ -586,22 +412,12 @@ void RscDefTree::Remove(){ } } -/************************************************************************* -|* -|* RscDefTree::~Search() -|* -*************************************************************************/ RscDefine * RscDefTree::Search( const char * pName ){ if( pDefRoot ) return pDefRoot->Search( pName ); return NULL; } -/************************************************************************* -|* -|* RscDefTree::Insert() -|* -*************************************************************************/ void RscDefTree::Insert( RscDefine * pDef ){ if( pDefRoot ) pDefRoot->Insert( pDef ); @@ -610,11 +426,6 @@ void RscDefTree::Insert( RscDefine * pDef ){ pDef->IncRef(); } -/************************************************************************* -|* -|* RscDefTree::Remove() -|* -*************************************************************************/ void RscDefTree::Remove( RscDefine * pDef ){ if( pDefRoot ){ //falls pDef == pDefRoot @@ -623,11 +434,6 @@ void RscDefTree::Remove( RscDefine * pDef ){ pDef->DecRef(); } -/************************************************************************* -|* -|* RscDefTree::Evaluate() -|* -*************************************************************************/ sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){ if( pDef ){ if( !Evaluate( (RscDefine *)pDef->Left() ) ) @@ -638,20 +444,9 @@ sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){ return sal_True; } -/****************** R s c F i l e T a b **********************************/ -/************************************************************************* -|* -|* RscFileTab::RscFileTab() -|* -*************************************************************************/ RscFileTab::RscFileTab(){ } -/************************************************************************* -|* -|* RscFileTab::~RscFileTab() -|* -*************************************************************************/ RscFileTab :: ~RscFileTab(){ aDefTree.Remove(); @@ -663,11 +458,6 @@ RscFileTab :: ~RscFileTab(){ }; } -/************************************************************************* -|* -|* RscFileTab::Find() -|* -*************************************************************************/ sal_uLong RscFileTab :: Find( const rtl::OString& rName ) { sal_uIntPtr aIndex = FirstIndex(); @@ -680,20 +470,12 @@ sal_uLong RscFileTab :: Find( const rtl::OString& rName ) return NOFILE_INDEX; } -/************************************************************************* -|* -|* RscFileTab::FindDef() -|* -*************************************************************************/ RscDefine * RscFileTab::FindDef( const char * pName ){ return aDefTree.Search( pName ); } -/************************************************************************* -|* -|* RscFileTab::Depend() -|* -*************************************************************************/ +/* This method gives back sal_True when lDepend + exists and is behind lFree, or when lDepend does not exist. */ sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){ if( lDepend == lFree ) return sal_True; @@ -711,11 +493,6 @@ sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){ return sal_True; } -/************************************************************************* -|* -|* RscFileTab::TestDef() -|* -*************************************************************************/ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, const RscDefine * pDefDec ) { @@ -731,11 +508,6 @@ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, return TestDef( lFileKey, lPos, pDefDec->pExp ); } -/************************************************************************* -|* -|* RscFileTab::TestDef() -|* -*************************************************************************/ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, const RscExpression * pExpDec ) { @@ -761,11 +533,6 @@ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, return sal_True; } -/************************************************************************* -|* -|* RscFileTab::NewDef() -|* -*************************************************************************/ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName, sal_Int32 lId, sal_uLong lPos ) { @@ -785,11 +552,6 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName return( pDef ); } -/************************************************************************* -|* -|* RscFileTab::NewDef() -|* -*************************************************************************/ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName, RscExpression * pExp, sal_uLong lPos ) { @@ -817,11 +579,6 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName return( pDef ); } -/************************************************************************* -|* -|* RscFileTab::DeleteFileContext() -|* -*************************************************************************/ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ RscFile * pFName; @@ -837,11 +594,6 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ } } -/************************************************************************* -|* -|* RscFileTab::NewCodeFile() -|* -*************************************************************************/ sal_uLong RscFileTab :: NewCodeFile( const rtl::OString& rName ) { sal_uLong lKey = Find( rName ); @@ -856,11 +608,6 @@ sal_uLong RscFileTab :: NewCodeFile( const rtl::OString& rName ) return lKey; } -/************************************************************************* -|* -|* RscFileTab::NewIncFile() -|* -*************************************************************************/ sal_uLong RscFileTab :: NewIncFile(const rtl::OString& rName, const rtl::OString& rPath) { diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index dd378e482396..136019e6dcdc 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #if defined (WNT ) @@ -28,25 +26,13 @@ #include <string.h> #include <ctype.h> -// Include #include <rscdef.hxx> #include <rsctools.hxx> #include <osl/file.h> #include <rtl/alloc.h> -using ::rtl::OUString; -using ::rtl::OUStringToOString; - -/****************** C o d e **********************************************/ -/************************************************************************* -|* -|* rsc_strnicmp() -|* -|* Beschreibung Vergleicht zwei Strings Case-Unabhaengig bis zu -|* einer bestimmten Laenge -|* -*************************************************************************/ +/* case insensitive compare of two strings up to a given length */ int rsc_strnicmp( const char *string1, const char *string2, size_t count ) { size_t i; @@ -67,13 +53,7 @@ int rsc_strnicmp( const char *string1, const char *string2, size_t count ) return( 0 ); } -/************************************************************************* -|* -|* rsc_strnicmp() -|* -|* Beschreibung Vergleicht zwei Strings Case-Unabhaengig -|* -*************************************************************************/ +/* case insensitive compare of two strings */ int rsc_stricmp( const char *string1, const char *string2 ){ int i; @@ -98,15 +78,6 @@ char* rsc_strdup( const char* pStr ) return pBuffer; } -/************************************************************************* -|* -|* GetTmpFileName() -|* -|* Beschreibung Gibt einen String eines eindeutigen Dateinamens -|* zurueck. Der Speicher fuer den String wird mit -|* malloc allokiert -|* -*************************************************************************/ rtl::OString GetTmpFileName() { OUString aTmpURL, aTmpFile; @@ -115,14 +86,6 @@ rtl::OString GetTmpFileName() return OUStringToOString( aTmpFile, RTL_TEXTENCODING_MS_1252 ); } -/********************************************************************/ -/* */ -/* Function : Append( ) */ -/* */ -/* Parameters : psw - pointer to a preprocessor switch */ -/* */ -/* Description : appends text files */ -/********************************************************************/ sal_Bool Append(FILE * fDest, const rtl::OString &rTmpFile) { #define MAX_BUF 4096 @@ -138,7 +101,7 @@ sal_Bool Append(FILE * fDest, const rtl::OString &rTmpFile) char szBuf[ MAX_BUF ]; size_t nItems; - do //appemd + do //append { nItems = fread( szBuf, 1, MAX_BUF, fSource ); bSuccess = (nItems == fwrite(szBuf, 1, nItems, fDest)); @@ -161,15 +124,7 @@ sal_Bool Append(const rtl::OString &rOutputSrs, const rtl::OString &rTmpFile) return bRet; } -/************************************************************************* -|* -|* OutputFile -|* -|* Beschreibung Ersetzt Extension durch eine andere -|* Parameter: input, der Input-Dateiname. -|* pExt, die Extension des Ausgabenamens -|* -*************************************************************************/ +/* replaces extension of a file name */ rtl::OString OutputFile(const rtl::OString &rInput, const char * pExt) { sal_Int32 nSepInd = rInput.lastIndexOf("."); @@ -182,13 +137,6 @@ rtl::OString OutputFile(const rtl::OString &rInput, const char * pExt) return rInput.concat(OString(".")).concat(OString(pExt)); } -/************************************************************************* -|* -|* ::ResonseFile() -|* -|* Beschreibung Kommandozeile aufbereiten -|* -*************************************************************************/ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) { FILE *fFile; @@ -197,11 +145,11 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) sal_uInt32 i; bool bInQuotes = false; - // Programmname + // program name ppCmd->Append( rsc_strdup( *ppArgv ) ); for( i = 1; i < nArgc; i++ ) { - if( '@' == **(ppArgv +i) ){ // wenn @, dann Response-Datei + if( '@' == **(ppArgv +i) ){ // when @, then response file if( NULL == (fFile = fopen( (*(ppArgv +i)) +1, "r" )) ) return( (*(ppArgv +i)) ); nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile ); @@ -241,36 +189,15 @@ char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) } -/*************** R s c P t r P t r **************************************/ -/************************************************************************* -|* -|* RscPtrPtr :: RscPtrPtr() -|* -|* Beschreibung Eine Tabelle mit Zeigern -|* -*************************************************************************/ RscPtrPtr :: RscPtrPtr(){ nCount = 0; pMem = NULL; } -/************************************************************************* -|* -|* RscPtrPtr :: ~RscPtrPtr() -|* -|* Beschreibung Zerst�rt eine Tabelle mit Zeigern, die Zeiger werde -|* ebenfalls freigegebn -|* -*************************************************************************/ RscPtrPtr :: ~RscPtrPtr(){ Reset(); } -/************************************************************************* -|* -|* RscPtrPtr :: Reset() -|* -*************************************************************************/ void RscPtrPtr :: Reset(){ sal_uInt32 i; @@ -285,13 +212,6 @@ void RscPtrPtr :: Reset(){ pMem = NULL; } -/************************************************************************* -|* -|* RscPtrPtr :: Append() -|* -|* Beschreibung Haengt einen Eintrag an. -|* -*************************************************************************/ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ if( !pMem ) pMem = (void **)rtl_allocateMemory( (nCount +1) * sizeof( void * ) ); @@ -303,25 +223,12 @@ sal_uInt32 RscPtrPtr :: Append( void * pBuffer ){ return( nCount++ ); } -/************************************************************************* -|* -|* RscPtrPtr :: GetEntry() -|* -|* Beschreibung Liefert einen Eintrag, NULL wenn nicht vorhanden. -|* -*************************************************************************/ void * RscPtrPtr :: GetEntry( sal_uInt32 nEntry ){ if( nEntry < nCount ) return( pMem[ nEntry ] ); return( NULL ); } -/****************** R S C W R I T E R C **********************************/ -/************************************************************************* -|* -|* RscWriteRc :: RscWriteRc() -|* -*************************************************************************/ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) { short nSwapTest = 1; @@ -341,22 +248,12 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) pMem = NULL; } -/************************************************************************* -|* -|* RscWriteRc :: ~RscWriteRc() -|* -*************************************************************************/ RscWriteRc :: ~RscWriteRc() { if( pMem ) rtl_freeMemory( pMem ); } -/************************************************************************* -|* -|* RscWriteRc :: IncSize() -|* -*************************************************************************/ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) { sal_uInt32 nOrigPos = nLen; @@ -368,11 +265,6 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) return nOrigPos; } -/************************************************************************* -|* -|* RscWriteRc :: GetPointer() -|* -*************************************************************************/ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) { if( !pMem ) @@ -381,11 +273,6 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) } -/************************************************************************* -|* -|* RscWriteRc :: Put() -|* -*************************************************************************/ void RscWriteRc :: Put( sal_uInt16 nVal ) { sal_uInt32 nOldLen; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index f424d43d3ef8..b174bc1153b6 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -17,42 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/****************** I N C L U D E S **************************************/ -// C and C++ Includes. #include <stdlib.h> #include <stdio.h> #include <string.h> -// Programmabh�ngige Includes. #include <tools/link.hxx> #include <rsctree.hxx> -/****************** C O D E **********************************************/ -/****************** B i N o d e ******************************************/ -/************************************************************************* -|* -|* BiNode::BiNode() -|* -*************************************************************************/ BiNode::BiNode(){ pLeft = pRight = NULL; } -/************************************************************************* -|* -|* BiNode::~BiNode() -|* -*************************************************************************/ BiNode::~BiNode(){ } -/************************************************************************* -|* -|* BiNode::EnumNodes() -|* -*************************************************************************/ void BiNode::EnumNodes( Link aLink ) const{ if( Left() ) Left()->EnumNodes( aLink ); @@ -61,11 +41,6 @@ void BiNode::EnumNodes( Link aLink ) const{ Right()->EnumNodes( aLink ); } -/************************************************************************* -|* -|* BiNode::ChangeDLListBTree() -|* -*************************************************************************/ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ BiNode * pMiddle; BiNode * pTmp; @@ -100,11 +75,6 @@ BiNode * BiNode::ChangeDLListBTree( BiNode * pList ){ return( pList ); } -/************************************************************************* -|* -|* BiNode::ChangeBTreeDLList() -|* -*************************************************************************/ BiNode * BiNode::ChangeBTreeDLList(){ BiNode * pList; BiNode * pLL_RN; // linke Liste rechter Knoten @@ -125,12 +95,6 @@ BiNode * BiNode::ChangeBTreeDLList(){ return( pList ); } -/****************** N a m e N o d e **************************************/ -/************************************************************************* -|* -|* NameNode::Remove() -|* -*************************************************************************/ NameNode * NameNode::Remove( NameNode * pRemove ){ NameNode * pRoot = this; NameNode * pParent = SearchParent( pRemove ); @@ -165,11 +129,6 @@ NameNode * NameNode::Remove( NameNode * pRemove ){ } -/************************************************************************* -|* -|* NameNode::Compare -|* -*************************************************************************/ COMPARE NameNode::Compare( const NameNode * pCompare ) const{ if( (long)this < (long)pCompare ) return LESS; @@ -188,11 +147,6 @@ COMPARE NameNode::Compare( const void * pCompare ) const{ return EQUAL; } -/************************************************************************* -|* -|* NameNode::SearchParent -|* -*************************************************************************/ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ // search for a parent node. // return a pointer to the parent node if found. @@ -216,11 +170,6 @@ NameNode* NameNode::SearchParent( const NameNode * pSearch ) const{ return( (NameNode *)NULL ); } -/************************************************************************* -|* -|* NameNode::Search -|* -*************************************************************************/ NameNode* NameNode::Search( const NameNode * pSearch ) const{ // search for a node. // return a pointer to the node if found. @@ -261,11 +210,6 @@ NameNode* NameNode::Search( const void * pSearch ) const{ return( NULL ); } -/************************************************************************* -|* -|* NameNode::Insert() -|* -*************************************************************************/ sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ // Ein Knoten wird in den Baum eingefuegt // Gibt es einen Knoten mit dem gleichen Namen, dann return sal_False @@ -292,11 +236,6 @@ sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){ return( bRet ); } -/************************************************************************* -|* -|* NameNode::Insert() -|* -*************************************************************************/ sal_Bool NameNode::Insert( NameNode * pTN ){ // insert a node in the tree. // if the node with the same name is in, return sal_False and no insert. @@ -317,11 +256,6 @@ sal_Bool NameNode::Insert( NameNode * pTN ){ return( bRet ); } -/************************************************************************* -|* -|* NameNode::OrderTree() -|* -*************************************************************************/ void NameNode::OrderTree(){ NameNode * pTmpLeft = (NameNode *)Left(); NameNode * pTmpRight = (NameNode *)Right(); @@ -344,21 +278,10 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){ } } -/****************** I d N o d e ******************************************/ -/************************************************************************* -|* -|* IdNode::Search() -|* -*************************************************************************/ IdNode * IdNode::Search( sal_uInt32 nTypeName ) const{ return( (IdNode *)NameNode::Search( (const void *)&nTypeName ) ); } -/************************************************************************* -|* -|* IdNode::Compare() -|* -*************************************************************************/ COMPARE IdNode::Compare( const NameNode * pSearch ) const { if( GetId() < (sal_uInt32)(((const IdNode *)pSearch)->GetId()) ) @@ -380,30 +303,15 @@ COMPARE IdNode::Compare( const void * pSearch ) const{ return EQUAL; } -/************************************************************************* -|* -|* IdNode::GetId() -|* -*************************************************************************/ sal_uInt32 IdNode::GetId() const { return( 0xFFFFFFFF ); } -/************************************************************************* -|* -|* StringNode::Search() -|* -*************************************************************************/ StringNode * StringNode::Search( const char * pSearch ) const{ return (StringNode *)NameNode::Search( (const void *)pSearch ); } -/************************************************************************* -|* -|* StringNode::Compare() -|* -*************************************************************************/ COMPARE StringNode::Compare( const NameNode * pSearch ) const { int nCmp = strcmp( m_aName.getStr(), |