[Libreoffice-commits] core.git: 2 commits - rsc/inc rsc/source
Andras Timar
atimar at suse.com
Wed Mar 27 01:32:34 PDT 2013
rsc/inc/rscall.h | 1
rsc/inc/rscarray.hxx | 3
rsc/inc/rscclass.hxx | 6
rsc/inc/rscconst.hxx | 5
rsc/inc/rsccont.hxx | 12 -
rsc/inc/rscdb.hxx | 8
rsc/inc/rscerror.h | 2
rsc/inc/rscmgr.hxx | 8
rsc/inc/rscrange.hxx | 15 -
rsc/inc/rscrsc.hxx | 16 -
rsc/inc/rscstr.hxx | 3
rsc/inc/rsctop.hxx | 20 --
rsc/inc/rsctree.hxx | 4
rsc/inc/vclrsc.hxx | 1
rsc/source/parser/erscerr.cxx | 66 ------
rsc/source/parser/rscdb.cxx | 281 ----------------------------
rsc/source/parser/rscibas.cxx | 99 ----------
rsc/source/parser/rscicpx.cxx | 209 ---------------------
rsc/source/parser/rscinit.cxx | 103 ----------
rsc/source/parser/rsckey.cxx | 28 --
rsc/source/parser/rsclex.cxx | 4
rsc/source/parser/rscpar.cxx | 34 ---
rsc/source/parser/rscyacc.y | 5
rsc/source/prj/gui.cxx | 9
rsc/source/prj/start.cxx | 16 -
rsc/source/res/rscall.cxx | 3
rsc/source/res/rscarray.cxx | 148 ---------------
rsc/source/res/rscclass.cxx | 288 -----------------------------
rsc/source/res/rscclobj.cxx | 50 -----
rsc/source/res/rscconst.cxx | 133 -------------
rsc/source/res/rsccont.cxx | 301 -------------------------------
rsc/source/res/rscflag.cxx | 92 ---------
rsc/source/res/rscmgr.cxx | 290 -----------------------------
rsc/source/res/rscrange.cxx | 259 --------------------------
rsc/source/res/rscstr.cxx | 73 -------
rsc/source/res/rsctop.cxx | 342 -----------------------------------
rsc/source/rsc/rsc.cxx | 407 +++++-------------------------------------
rsc/source/tools/rscchar.cxx | 14 -
rsc/source/tools/rscdef.cxx | 257 --------------------------
rsc/source/tools/rsctools.cxx | 125 ------------
rsc/source/tools/rsctree.cxx | 92 ---------
41 files changed, 73 insertions(+), 3759 deletions(-)
New commits:
commit fee08758d149b6d681952c3ac95e195da7cfa6bc
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 26 22:30:28 2013 +0100
fdo#39445 writing out tools/fsys.hxx (rsc)
Change-Id: Iacab9b8a16d8278ae9a41249d36ca1aaad2d5794
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 6a06d04..92ffe0d 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -26,7 +26,6 @@
#include <list>
class RscTypCont;
-class DirEntry;
/****************** T Y P E S ********************************************/
@@ -83,8 +82,8 @@ private:
FILE* pSysListFile );
void PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext,
- const DirEntry& rSrsInPath,
- const DirEntry& rSrsOutPath );
+ const OUString& rSrsInPath,
+ const OUString& rSrsOutPath );
public:
RscTypCont* pTC; // String und Id-Verwalter
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 133daec..7537796 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -35,7 +35,6 @@
#include <ctype.h>
#include <errno.h>
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <rscerror.h>
#include <rsctop.hxx>
@@ -132,11 +131,8 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
;
if( *pEqual )
{
- const rtl::OString aSPath( pEqual + 1 );
- DirEntry aSDir(rtl::OStringToOUString(aSPath, RTL_TEXTENCODING_ASCII_US));
-
m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
- rtl::OUStringToOString(aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US) ) );
+ OString( pEqual + 1 ) ) );
}
}
else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
@@ -160,7 +156,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
nCommands |= INCLUDE_FLAG;
rtl::OStringBuffer aBuffer(aPath);
if (aBuffer.getLength())
- aBuffer.append(rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US));
+ aBuffer.append(SAL_PATHSEPARATOR);
aBuffer.append((*ppStr) + 2);
aPath = aBuffer.makeStringAndClear();
}
@@ -177,14 +173,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
// ignore empty -lip= arguments that we get lots of these days
if (!aSysSearchDir.isEmpty())
{
- DirEntry aSysDir(rtl::OStringToOUString(aSysSearchDir, RTL_TEXTENCODING_ASCII_US));
- m_aOutputFiles.back().aSysSearchDirs.push_back(
- rtl::OUStringToOString(aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US) );
+ m_aOutputFiles.back().aSysSearchDirs.push_back(aSysSearchDir);
rtl::OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath;
if( !aLangSearchPath.isEmpty() )
{
- aLangSearchPath = aLangSearchPath +
- rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US);
+ aLangSearchPath = aLangSearchPath + OString( SAL_PATHSEPARATOR );
}
aLangSearchPath = aLangSearchPath + aSysSearchDir;
@@ -280,7 +273,10 @@ OString RscCmdLine::substitutePaths( const OString& rIn )
aRet.append( "%" );
nIndex = last_match->second.getLength();
}
- aRet.append( rIn.copy( nIndex ) );
+ if( rIn.match( "/", nIndex ) )
+ aRet.append( rIn.copy( nIndex ) );
+ else
+ aRet.append( rIn.copy( nIndex - 1 ) );
return aRet.makeStringAndClear();
}
@@ -446,15 +442,7 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
// Kein Pfad und Include Datei
if( pFNTmp && !pFNTmp->bLoaded )
{
- rtl::OUString aUniFileName(rtl::OStringToOUString(pFNTmp->aFileName, RTL_TEXTENCODING_ASCII_US));
- DirEntry aFullName(aUniFileName);
- if ( aFullName.Find(rtl::OStringToOUString(pCL->aPath, RTL_TEXTENCODING_ASCII_US)) )
- {
- pFNTmp->aPathName = rtl::OUStringToOString(
- aFullName.GetFull(), RTL_TEXTENCODING_ASCII_US);
- }
- else
- aError = ERR_OPENFILE;
+ pFNTmp->aPathName = pFNTmp->aFileName;
}
};
};
@@ -491,20 +479,20 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
pFName->bLoaded = sal_False; //bei Fehler nicht geladenen
else
{
- rtl::OUString aTmpName(rtl::OStringToOUString(::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US));
- DirEntry aTmpPath( aTmpName ), aSrsPath(rtl::OStringToOUString(pFName->aPathName, RTL_TEXTENCODING_ASCII_US));
+ OUString aTmpPath;
+ OUString aSrsPath = OStringToOUString( pFName->aPathName, RTL_TEXTENCODING_ASCII_US );
- aTmpPath.ToAbs();
- aSrsPath.ToAbs();
+ osl::FileBase::createTempFile( 0, 0, &aTmpPath );
+ osl::FileBase::getFileURLFromSystemPath( aSrsPath, aSrsPath );
if( pContext && pOutputFile )
PreprocessSrsFile( *pOutputFile, *pContext, aSrsPath, aTmpPath );
else
- aSrsPath.CopyTo( aTmpPath, FSYS_ACTION_COPYFILE );
+ osl::File::copy( aSrsPath, aTmpPath );
- rtl::OString aParseFile(rtl::OUStringToOString(aTmpPath.GetFull(),
- RTL_TEXTENCODING_ASCII_US));
- finput = fopen(aParseFile.getStr(), "r");
+ OUString aParseFile;
+ osl::FileBase::getSystemPathFromFileURL( aTmpPath, aParseFile );
+ finput = fopen(OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), "r");
if( !finput )
{
@@ -516,7 +504,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose );
- pTC->pEH->StdOut( aParseFile.getStr(), RscVerbosityVerbose );
+ pTC->pEH->StdOut( OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), RscVerbosityVerbose );
pTC->pEH->StdOut( " ", RscVerbosityVerbose );
aError = ::parser( &aFileInst );
@@ -526,7 +514,7 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
fclose( finput );
};
- aTmpPath.Kill();
+ osl::File::remove( aTmpPath );
};
};
@@ -637,8 +625,8 @@ ERRTYPE RscCompiler::Link()
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
// Schreibe Datei
- sal_Char cSearchDelim = rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US)[0];
- sal_Char cAccessDelim = rtl::OUStringToOString(DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US)[0];
+ sal_Char cSearchDelim = SAL_PATHSEPARATOR;
+ sal_Char cAccessDelim = SAL_PATHDELIMITER;
pTC->ChangeLanguage( it->aLangName );
pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
pTC->ClearSysNames();
@@ -778,22 +766,28 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound )
{
- const DirEntry aPath( rtl::OStringToOUString(*aDirIter, RTL_TEXTENCODING_ASCII_US) );
- DirEntry aRelPath( aPath );
- DirEntry aAbsPath( aRelPath += DirEntry(rtl::OStringToOUString(*aFileIter, RTL_TEXTENCODING_ASCII_US)) );
+ const OString aSysPath = *aDirIter + "/" + *aFileIter;
+ OUString aAbsPath = OStringToOUString( aSysPath, RTL_TEXTENCODING_ASCII_US );
- aAbsPath.ToAbs();
- const FileStat aFS( aAbsPath.GetFull() );
+
+ osl::FileBase::getFileURLFromSystemPath( aAbsPath, aAbsPath );
+ osl::DirectoryItem aDirectoryItem;
+ bool bFile = false;
+ if (osl::DirectoryItem::E_None == osl::DirectoryItem::get( aAbsPath, aDirectoryItem ))
+ {
+ osl::FileStatus aFS(osl_FileStatus_Mask_Type);
+ if (osl::DirectoryItem::E_None == aDirectoryItem.getFileStatus( aFS ))
+ bFile = aFS.isRegular();
+ }
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "Searching image: %s\n", rtl::OUStringToOString(aRelPath.GetFull(), RTL_TEXTENCODING_ASCII_US).getStr() );
+ fprintf( stderr, "Searching image: %s\n", aSysPath.getStr() );
#endif
- if( aFS.IsKind( FSYS_KIND_FILE ) )
+ if( bFile )
{
std::list< std::pair< OString, OString > >::const_iterator aReplIter( rContext.pCmdLine->m_aReplacements.begin() );
- String aStr( aRelPath.GetFull() );
- OString aRelPathStr( aStr.GetBuffer(), aStr.Len(), RTL_TEXTENCODING_ASCII_US );
+ OString aRelPathStr( aSysPath );
while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound )
{
@@ -820,11 +814,7 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
if( bFound && pSysListFile )
{
- DirEntry aSysPath(rtl::OStringToOUString(*aDirIter, RTL_TEXTENCODING_ASCII_US));
- String aSysPathFull( ( aSysPath += DirEntry( rtl::OStringToOUString( *aFileIter, RTL_TEXTENCODING_ASCII_US ) ) ).GetFull() );
- OString aSysPathStr( aSysPathFull.GetBuffer(), aSysPathFull.Len(), RTL_TEXTENCODING_ASCII_US );
-
- fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPathStr ).getStr() );
+ fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPath ).getStr() );
}
#if OSL_DEBUG_LEVEL > 1
@@ -843,11 +833,11 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
const WriteRcContext& rContext,
- const DirEntry& rSrsInPath,
- const DirEntry& rSrsOutPath )
+ const OUString& rSrsInPath,
+ const OUString& rSrsOutPath )
{
- SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ );
- SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
+ SvFileStream aIStm( rSrsInPath, STREAM_READ );
+ SvFileStream aOStm( rSrsOutPath, STREAM_WRITE | STREAM_TRUNC );
::std::vector< rtl::OString > aMissingImages;
FILE* pSysListFile = rContext.aOutputSysList.isEmpty() ? NULL : fopen( rContext.aOutputSysList.getStr(), "ab" );
commit 73ff49f47dda14391f0c118f62002cb42680624e
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 26 11:10:45 2013 +0100
remove unused functionality from Resource Compiler
and remove ASCII art comments and other useless comments
Change-Id: Iafa5eb5aa421b38b325bdc7cea6045b43a5c582a
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 1108fcf..3d2ab4a 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 1ab0f2e..9d036a5 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 8bcca4d..609d288 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 f402232..05eb843 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 fbca3d8..fe7ad87 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 905a2fc..89404d6 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 28b70162..6b8a579 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 d4716cd..838533b 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 d1a8c97..e9adb1c 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 42c1998..6a06d04 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 cbad207..87da46f 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 91fd720..4f5b784 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 ddedf12..600db98 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 bd090b6..998eaee 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 691f02c..34e5f38 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 21c61e7..0b70e09 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 d162f1e..a2a5d15 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 bb1fa3b..d302dee 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 541af05..8803a01 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 ***************************************/
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list