/sal/inc/

nk'>aoo/trunk LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:55:08 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:55:08 +0100
commit4fdd55226d2972e3a256426db3122ac23b0615c6 (patch)
tree23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /rsc
parentc3d5444d84e18fa82235bb9d419861ac5e54f544 (diff)
parente1028d9225bc47922c387aa462887c7643bc6c40 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: comphelper/source/misc/servicedecl.cxx i18npool/source/breakiterator/breakiteratorImpl.cxx l10ntools/scripts/localize.pl svl/source/items/itemset.cxx svl/source/memtools/svarray.cxx svl/source/numbers/zformat.cxx svtools/source/brwbox/brwbox1.cxx tools/source/stream/strmwnt.cxx vcl/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_layout.hxx vcl/inc/vcl/graphite_serverfont.hxx vcl/source/control/imgctrl.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev3.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/graphite_adaptors.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/window/winproc.cxx vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rsc/rscsfx.hxx (renamed from rsc/inc/rscsfx.hxx)0
-rw-r--r--rsc/inc/rscall.h2
-rw-r--r--rsc/inc/rscarray.hxx14
-rw-r--r--rsc/inc/rscclass.hxx34
-rw-r--r--rsc/inc/rscclobj.hxx16
-rw-r--r--rsc/inc/rscconst.hxx26
-rw-r--r--rsc/inc/rsccont.hxx36
-rw-r--r--rsc/inc/rscdb.hxx46
-rw-r--r--rsc/inc/rscdef.hxx138
-rw-r--r--rsc/inc/rscerror.h6
-rw-r--r--rsc/inc/rscflag.hxx28
-rw-r--r--rsc/inc/rscinst.hxx60
-rw-r--r--rsc/inc/rsckey.hxx8
-rw-r--r--rsc/inc/rsclst.hxx8
-rw-r--r--rsc/inc/rscmgr.hxx16
-rw-r--r--rsc/inc/rscpar.hxx24
-rw-r--r--rsc/inc/rscrange.hxx90
-rw-r--r--rsc/inc/rscrsc.hxx4
-rw-r--r--rsc/inc/rscstr.hxx12
-rw-r--r--rsc/inc/rsctools.hxx12
-rw-r--r--rsc/inc/rsctop.hxx30
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/inc/vclrsc.hxx179
-rw-r--r--rsc/prj/d.lst2
-rw-r--r--rsc/source/misc/rscdbl.cxx6
-rw-r--r--rsc/source/misc/rsclst.cxx4
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/rscdb.cxx79
-rw-r--r--rsc/source/parser/rscibas.cxx32
-rw-r--r--rsc/source/parser/rscicpx.cxx61
-rw-r--r--rsc/source/parser/rscinit.cxx108
-rw-r--r--rsc/source/parser/rsckey.cxx10
-rwxr-xr-x[-rw-r--r--]rsc/source/parser/rsclex.cxx43
-rw-r--r--rsc/source/parser/rsclex.hxx2
-rw-r--r--rsc/source/parser/rscpar.cxx12
-rw-r--r--rsc/source/parser/rscyacc.cxx22
-rw-r--r--rsc/source/parser/rscyacc.y42
-rw-r--r--rsc/source/prj/start.cxx38
-rw-r--r--rsc/source/res/rscall.cxx4
-rw-r--r--rsc/source/res/rscarray.cxx40
-rw-r--r--rsc/source/res/rscclass.cxx142
-rw-r--r--rsc/source/res/rscclobj.cxx24
-rw-r--r--rsc/source/res/rscconst.cxx38
-rw-r--r--rsc/source/res/rsccont.cxx66
-rw-r--r--rsc/source/res/rscflag.cxx54
-rw-r--r--rsc/source/res/rscmgr.cxx30
-rw-r--r--rsc/source/res/rscrange.cxx102
-rw-r--r--rsc/source/res/rscstr.cxx28
-rw-r--r--rsc/source/res/rsctop.cxx38
-rw-r--r--rsc/source/rsc/rsc.cxx188
-rw-r--r--rsc/source/tools/rscchar.cxx10
-rw-r--r--rsc/source/tools/rscdef.cxx187
-rw-r--r--rsc/source/tools/rsctools.cxx20
-rw-r--r--rsc/source/tools/rsctree.cxx28
54 files changed, 1032 insertions, 1225 deletions
diff --git a/rsc/inc/rscsfx.hxx b/rsc/inc/rsc/rscsfx.hxx
index 36babfb8c520..36babfb8c520 100644
--- a/rsc/inc/rscsfx.hxx
+++ b/rsc/inc/rsc/rscsfx.hxx
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index d66f3aa325d6..fed155cc90d3 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -96,7 +96,7 @@ struct RSCINST {
pClass = pCl;
pData = pClassData;
}
- BOOL IsInst() const { return( pData != NULL ); }
+ sal_Bool IsInst() const { return( pData != NULL ); }
};
/********************** S U B I N F O S T R U C T ************************/
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 9d91534728ce..52ef742b55f7 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -81,9 +81,9 @@ public:
pTypeClass = pClass;
}
virtual RscTop * GetTypeClass() const;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
- virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue,
+ virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst );
virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
@@ -93,10 +93,10 @@ public:
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return( nSize ); };
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
virtual void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab,
@@ -104,7 +104,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
@@ -122,7 +122,7 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * );
virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, BOOL bExtra );
+ sal_uInt32 nDeep, sal_Bool bExtra );
};
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 49d8250af0a7..7dc3e95488ad 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -38,7 +38,7 @@ class RscClass : public RscTop
{
protected:
struct RscClassInst{
- ULONG nVarDflt;
+ sal_uLong nVarDflt;
};
struct VARTYPE_STRUCT {
Atom nVarName; // Variablenname
@@ -55,13 +55,13 @@ protected:
sal_uInt32 nEntries; // Eintraege in pVarTypeList
VARTYPE_STRUCT * pVarTypeList; // Variablenliste
RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle,
- BOOL bGetCopy = FALSE );
+ sal_Bool bGetCopy = sal_False );
CLASS_DATA GetDfltData( sal_uInt32 nEle );
- BOOL IsDflt( CLASS_DATA pData, sal_uInt32 nEle );
- BOOL IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle );
+ sal_Bool IsDflt( CLASS_DATA pData, sal_uInt32 nEle );
+ sal_Bool IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle );
void SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle,
- BOOL bSet );
- INT32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos,
+ sal_Bool bSet );
+ sal_Int32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos,
sal_uInt32 nTupelIdx, RscTypCont * pTC );
public:
RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
@@ -77,29 +77,29 @@ public:
virtual void EnumVariables( void * pData, VarEnumCallbackProc );
RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
- BOOL nInitDflt = FALSE,
+ sal_Bool nInitDflt = sal_False,
RscTop * pCreateClass = NULL );
RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return( nSize ); };
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
void SetDefault( const RSCINST & rData, Atom nVarId );
using RscTop::GetDefault;
RSCINST GetDefault( Atom nVarId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void WriteSyntax( FILE * fOutput, RscTypCont * pTC );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
@@ -112,10 +112,10 @@ class RscSysDepend : public RscClass
public:
RscSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper );
ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra,
- BOOL bFirst = FALSE );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra,
+ sal_Bool bFirst = sal_False );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
class RscFirstSysDepend : public RscSysDepend
@@ -124,7 +124,7 @@ public:
RscFirstSysDepend( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
class RscTupel : public RscClass
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index b75ab715feb6..3a6006501b7a 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -36,23 +36,23 @@
class ObjNode : public IdNode{
RscId aRscId; // Id der Resource
CLASS_DATA pRscObj;// pointer to a resourceobject
- ULONG lFileKey;// Dateischluessel
+ sal_uLong lFileKey;// Dateischluessel
protected:
using NameNode::Search;