summaryrefslogtreecommitdiff
path: root/rsc/inc
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-03-26 11:10:45 +0100
committerAndras Timar <atimar@suse.com>2013-03-27 09:33:00 +0100
commit73ff49f47dda14391f0c118f62002cb42680624e (patch)
tree361fb6fecc7ce1e3466036f967614cd5afe3122d /rsc/inc
parent95c586d5c034115fd252c5fb0e4637bf9dc68a4d (diff)
remove unused functionality from Resource Compiler
and remove ASCII art comments and other useless comments Change-Id: Iafa5eb5aa421b38b325bdc7cea6045b43a5c582a
Diffstat (limited to 'rsc/inc')
-rw-r--r--rsc/inc/rscall.h1
-rw-r--r--rsc/inc/rscarray.hxx3
-rw-r--r--rsc/inc/rscclass.hxx6
-rw-r--r--rsc/inc/rscconst.hxx5
-rw-r--r--rsc/inc/rsccont.hxx12
-rw-r--r--rsc/inc/rscdb.hxx8
-rw-r--r--rsc/inc/rscerror.h2
-rw-r--r--rsc/inc/rscmgr.hxx8
-rw-r--r--rsc/inc/rscrange.hxx15
-rw-r--r--rsc/inc/rscrsc.hxx11
-rw-r--r--rsc/inc/rscstr.hxx3
-rw-r--r--rsc/inc/rsctop.hxx20
-rw-r--r--rsc/inc/rsctree.hxx4
-rw-r--r--rsc/inc/vclrsc.hxx1
14 files changed, 0 insertions, 99 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>