summaryrefslogtreecommitdiff
path: root/rsc/source/res
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-07-03 02:35:31 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-07-03 20:53:12 +0000
commitbb45bdf359c65c174fd557d615f77ceb46fa685c (patch)
tree1f87575ee1d0471b14f5078a99d3a589d955d56d /rsc/source/res
parent27a4d5597c0757611d0e2e682d0c05441859cc4e (diff)
module rsc: String, bool and other clean-up.
Change-Id: I2dcde42e6068631a5a643961a764df86dc63dca2 Reviewed-on: https://gerrit.libreoffice.org/4690 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'rsc/source/res')
-rw-r--r--rsc/source/res/rscarray.cxx82
-rw-r--r--rsc/source/res/rscclass.cxx303
-rw-r--r--rsc/source/res/rscclobj.cxx58
-rw-r--r--rsc/source/res/rscconst.cxx101
-rw-r--r--rsc/source/res/rsccont.cxx306
-rw-r--r--rsc/source/res/rscflag.cxx154
-rw-r--r--rsc/source/res/rscmgr.cxx83
-rw-r--r--rsc/source/res/rscrange.cxx164
-rw-r--r--rsc/source/res/rscstr.cxx116
-rw-r--r--rsc/source/res/rsctop.cxx205
10 files changed, 853 insertions, 719 deletions
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index f10b9c0bf018..75ab08bff8f8 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.cxx
@@ -46,7 +46,7 @@ sal_uInt32 RscInstNode::GetId() const
}
RscArray::RscArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, RscEnum * pTypeCl )
- : RscTop( nId, nTypeId, pSuper )
+ : RscTop( nId, nTypeId, pSuper )
{
pTypeClass = pTypeCl;
nOffInstData = RscTop::Size();
@@ -86,7 +86,7 @@ static RscInstNode * Create( RscInstNode * pNode )
}
RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
RscArrayInst * pClassData;
@@ -98,13 +98,14 @@ RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt,
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
RscTop::Create( &aInst, rDflt, bOwnClass );
- pClassData = (RscArrayInst *)(aInst.pData + nOffInstData);
- pClassData->pNode = NULL;
+ pClassData = (RscArrayInst *)(aInst.pData + nOffInstData);
+ pClassData->pNode = NULL;
if( bOwnClass )
{
RscArrayInst * pDfltClassData;
@@ -113,7 +114,7 @@ RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt,
pClassData->pNode = ::Create( pDfltClassData->pNode );
}
- return( aInst );
+ return aInst;
}
static void Destroy( RscInstNode * pNode )
@@ -138,13 +139,10 @@ void RscArray::Destroy( const RSCINST & rInst )
::Destroy( pClassData->pNode );
}
-ERRTYPE RscArray::GetValueEle
-(
- const RSCINST & rInst,
- sal_Int32 lValue,
- RscTop * pCreateClass,
- RSCINST * pGetInst
-)
+ERRTYPE RscArray::GetValueEle( const RSCINST & rInst,
+ sal_Int32 lValue,
+ RscTop * pCreateClass,
+ RSCINST * pGetInst)
{
RscArrayInst * pClassData;
RscInstNode * pNode;
@@ -171,6 +169,7 @@ ERRTYPE RscArray::GetValueEle
pNode->aInst = pCreateClass->Create( NULL, rInst );
else
pNode->aInst = GetSuperClass()->Create( NULL, rInst );
+
pNode->aInst.pClass->SetToDefault( pNode->aInst );
if( pClassData->pNode )
pClassData->pNode->Insert( pNode );
@@ -182,13 +181,10 @@ ERRTYPE RscArray::GetValueEle
return aError;
}
-ERRTYPE RscArray::GetArrayEle
-(
- const RSCINST & rInst,
- Atom nId,
- RscTop * pCreateClass,
- RSCINST * pGetInst
-)
+ERRTYPE RscArray::GetArrayEle( const RSCINST & rInst,
+ Atom nId,
+ RscTop * pCreateClass,
+ RSCINST * pGetInst)
{
sal_Int32 lValue;
if( !pTypeClass->GetConstValue( nId, &lValue ) )
@@ -199,33 +195,33 @@ ERRTYPE RscArray::GetArrayEle
return GetValueEle( rInst, lValue, pCreateClass, pGetInst );
}
-static sal_Bool IsConsistent( RscInstNode * pNode )
+static bool IsConsistent( RscInstNode * pNode )
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if( pNode )
{
bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst );
if( !IsConsistent( pNode->Left() ) )
- bRet = sal_False;
+ bRet = false;
if( !IsConsistent( pNode->Right() ) )
- bRet = sal_False;
+ bRet = false;
}
return bRet;
}
-sal_Bool RscArray::IsConsistent( const RSCINST & rInst )
+bool RscArray::IsConsistent( const RSCINST & rInst )
{
RscArrayInst * pClassData;
- sal_Bool bRet;
+ bool bRet;
bRet = RscTop::IsConsistent( rInst );
pClassData = (RscArrayInst *)(rInst.pData + nOffInstData);
if( !::IsConsistent( pClassData->pNode ) )
- bRet = sal_False;
+ bRet = false;
- return( bRet );
+ return bRet;
}
static void SetToDefault( RscInstNode * pNode )
@@ -249,9 +245,9 @@ void RscArray::SetToDefault( const RSCINST & rInst )
RscTop::SetToDefault( rInst );
}
-static sal_Bool IsDefault( RscInstNode * pNode )
+static bool IsDefault( RscInstNode * pNode )
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if( pNode )
{
@@ -264,22 +260,22 @@ static sal_Bool IsDefault( RscInstNode * pNode )
return bRet;
}
-sal_Bool RscArray::IsDefault( const RSCINST & rInst )
+bool RscArray::IsDefault( const RSCINST & rInst )
{
RscArrayInst * pClassData;
pClassData = (RscArrayInst *)(rInst.pData + nOffInstData);
- sal_Bool bRet = ::IsDefault( pClassData->pNode );
+ bool bRet = ::IsDefault( pClassData->pNode );
if( bRet )
bRet = RscTop::IsDefault( rInst );
return bRet;
}
-static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
+static bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if( pNode )
{
@@ -292,9 +288,9 @@ static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
return bRet;
}
-sal_Bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
- sal_Bool bRet = RscTop::IsValueDefault( rInst, pDef );
+ bool bRet = RscTop::IsValueDefault( rInst, pDef );
if( bRet )
{
@@ -348,8 +344,8 @@ void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
}
static void WriteSrc( RscInstNode * pNode, FILE * fOutput, RscTypCont * pTC,
- sal_uInt32 nTab, const char * pVarName,
- CLASS_DATA pDfltData, RscConst * pTypeClass )
+ sal_uInt32 nTab, const char * pVarName,
+ CLASS_DATA pDfltData, RscConst * pTypeClass )
{
if( pNode )
{
@@ -373,8 +369,8 @@ static void WriteSrc( RscInstNode * pNode, FILE * fOutput, RscTypCont * pTC,
}
void RscArray::WriteSrcArray( const RSCINST & rInst, FILE * fOutput,
- RscTypCont * pTC, sal_uInt32 nTab,
- const char * pVarName )
+ RscTypCont * pTC, sal_uInt32 nTab,
+ const char * pVarName )
{
RscArrayInst * pClassData;
@@ -392,7 +388,7 @@ void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError;
RscArrayInst * pClassData;
@@ -452,12 +448,12 @@ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, const RscId & aId,
+ sal_uInt32 nDeep, bool bExtra )
{
// Eigenen Typ schreiben
return GetSuperClass()->WriteRcHeader( rInst, aMem, pTC, aId,
- nDeep, bExtra );
+ nDeep, bExtra );
}
RscLangArray::RscLangArray( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 0205eba1e277..7e5611527782 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -71,7 +71,7 @@ RSCINST RscClass::GetInstData
(
CLASS_DATA pData,
sal_uInt32 nEle,
- sal_Bool bGetCopy
+ bool bGetCopy
)
{
RSCINST aInst;
@@ -100,16 +100,14 @@ RSCINST RscClass::GetInstData
else if( VAR_POINTER & pVarTypeList[ nEle ].nVarType )
{
if( VAR_EXTENDABLE & pVarTypeList[ nEle ].nVarType )
- aInst = *(RSCINST *)
- (pData + pVarTypeList[ nEle ].nOffset);
+ aInst = *(RSCINST *) (pData + pVarTypeList[ nEle ].nOffset);
else
- aInst.pData = *(CLASS_DATA *)
- (pData + pVarTypeList[ nEle ].nOffset);
+ aInst.pData = *(CLASS_DATA *) (pData + pVarTypeList[ nEle ].nOffset);
}
else
aInst.pData = pData + pVarTypeList[ nEle ].nOffset;
};
- return( aInst );
+ return aInst;
}
CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
@@ -120,7 +118,7 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
return pVarTypeList[ nEle ].pClass->GetDefault().pData;
}
-void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet )
+void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, bool bSet )
{
RscClassInst * pClass;
@@ -131,25 +129,17 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet )
pClass->nVarDflt &= ~((sal_uLong)1 << nEle);
}
-sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
+bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
{
RscClassInst * pClass;
- sal_Bool bRet;
pClass = (RscClassInst *)(pData + nSuperSize );
- if( pClass->nVarDflt & ((sal_uLong)1 << nEle) )
- bRet = sal_True;
- else
- bRet = sal_False;
- return bRet;
+ return pClass->nVarDflt & ((sal_uLong)1 << nEle);
}
-RSCINST RscClass::Create
-(
- RSCINST * pInst,
- const RSCINST & rDflt,
- sal_Bool bOwnClass
-)
+RSCINST RscClass::Create( RSCINST * pInst,
+ const RSCINST & rDflt,
+ bool bOwnClass)
{
sal_uInt32 i;
RSCINST aInst;
@@ -162,6 +152,7 @@ RSCINST RscClass::Create
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
@@ -175,22 +166,21 @@ RSCINST RscClass::Create
for( i = 0; i < nEntries; i++ )
{
- aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, sal_True );
+ aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, true );
- if( (VAR_POINTER & pVarTypeList[ i ].nVarType)
- && !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
+ if( (VAR_POINTER & pVarTypeList[ i ].nVarType) &&
+ !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
{
CLASS_DATA * ppData;
if( VAR_EXTENDABLE & pVarTypeList[ i ].nVarType )
{
- RSCINST * pInstance = (RSCINST *)
- (aInst.pData + pVarTypeList[ i ].nOffset );
+ RSCINST * pInstance = (RSCINST *) (aInst.pData + pVarTypeList[ i ].nOffset );
pInstance->pClass = pVarTypeList[ i ].pClass;
ppData = &pInstance->pData;
}
else
- ppData = (CLASS_DATA* )
- (aInst.pData + pVarTypeList[ i ].nOffset );
+ ppData = (CLASS_DATA* ) (aInst.pData + pVarTypeList[ i ].nOffset );
+
*ppData = NULL;
if( aDfltI.IsInst() )
{
@@ -200,12 +190,12 @@ RSCINST RscClass::Create
}
else
{
- aMemInst = GetInstData( aInst.pData, i, sal_True );
+ aMemInst = GetInstData( aInst.pData, i, true );
aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI );
};
}
- return( aInst );
+ return aInst;
}
void RscClass::Destroy( const RSCINST & rInst )
@@ -220,7 +210,7 @@ void RscClass::Destroy( const RSCINST & rInst )
{
RSCINST aTmpI;
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
{
// Objekt loeschen
@@ -235,25 +225,23 @@ void RscClass::Destroy( const RSCINST & rInst )
};
}
-ERRTYPE RscClass::SetVariable
-(
- Atom nVarName,
- RscTop * pClass,
- RSCINST * pDflt,
- RSCVAR nVarType,
- sal_uInt32 nMask,
- Atom nDataBaseName
-)
+ERRTYPE RscClass::SetVariable( Atom nVarName,
+ RscTop * pClass,
+ RSCINST * pDflt,
+ RSCVAR nVarType,
+ sal_uInt32 nMask,
+ Atom nDataBaseName)
{
if( pVarTypeList )
- pVarTypeList = (VARTYPE_STRUCT *)
- rtl_reallocateMemory( (void *)pVarTypeList,
- ((nEntries +1) * sizeof( VARTYPE_STRUCT )) );
+ {
+ pVarTypeList = (VARTYPE_STRUCT *) rtl_reallocateMemory( (void *)pVarTypeList,
+ ((nEntries +1) * sizeof( VARTYPE_STRUCT )) );
+ }
else
- pVarTypeList = (VARTYPE_STRUCT *)
- rtl_allocateMemory( ((nEntries +1)
- * sizeof( VARTYPE_STRUCT )) );
-
+ {
+ pVarTypeList = (VARTYPE_STRUCT *) rtl_allocateMemory( ((nEntries +1)
+ * sizeof( VARTYPE_STRUCT )) );
+ }
pVarTypeList[ nEntries ].nVarName = nVarName;
pVarTypeList[ nEntries ].nMask = nMask;
pVarTypeList[ nEntries ].pClass = pClass;
@@ -287,7 +275,7 @@ ERRTYPE RscClass::SetVariable
// Bereich fuer Default zu klein
RscExit( 16 );
};
- return( ERR_OK );
+ return ERR_OK;
}
void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc )
@@ -298,25 +286,22 @@ void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc )
for( i = 0; i < nEntries; i ++ )
{
if( !(pVarTypeList[ i ].nVarType & VAR_NOENUM) )
- (*pProc)( pData, pVarTypeList[ i ].pClass->GetClassType(),
- pVarTypeList[ i ].nVarName );
+ (*pProc)( pData, pVarTypeList[ i ].pClass->GetClassType(), pVarTypeList[ i ].nVarName );
}
}
-RSCINST RscClass::GetVariable
-(
- const RSCINST & rInst,
- Atom nVarName,
- const RSCINST & rInitInst,
- sal_Bool bInitDflt,
- RscTop * pCreateClass
-)
+RSCINST RscClass::GetVariable( const RSCINST & rInst,
+ Atom nVarName,
+ const RSCINST & rInitInst,
+ bool bInitDflt,
+ RscTop * pCreateClass)
{
sal_uInt32 i = 0;
RSCINST aTmpI;
while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName )
i++;
+
if( i < nEntries )
{
if( VAR_NODATAINST & pVarTypeList[ i ].nVarType )
@@ -368,19 +353,15 @@ RSCINST RscClass::GetVariable
}
};
// auf nicht Default setzen
- SetVarDflt( rInst.pData, i, sal_False );
- return( aTmpI );
+ SetVarDflt( rInst.pData, i, false );
+ return aTmpI;
};
- return( RscTop::GetVariable( rInst, nVarName, rInitInst,
- bInitDflt, pCreateClass ) );
+ return RscTop::GetVariable( rInst, nVarName, rInitInst,
+ bInitDflt, pCreateClass );
}
-RSCINST RscClass::GetCopyVar
-(
- const RSCINST & rInst,
- Atom nVarName
-)
+RSCINST RscClass::GetCopyVar( const RSCINST & rInst, Atom nVarName)
{
sal_uInt32 i = 0;
RSCINST aVarI;
@@ -400,11 +381,11 @@ RSCINST RscClass::GetCopyVar
if( IsDflt( rInst.pData, i ) )
{
// mit Variablen Default initialiaieren
- aVarI = GetVariable( rInst, nVarName, RSCINST(), sal_True );
- SetVarDflt( rInst.pData, i, sal_True );
+ aVarI = GetVariable( rInst, nVarName, RSCINST(), true );
+ SetVarDflt( rInst.pData, i, true );
}
else
- aVarI = GetInstData( rInst.pData, i, sal_True );
+ aVarI = GetInstData( rInst.pData, i, true );
};
return aVarI ;
@@ -413,11 +394,11 @@ RSCINST RscClass::GetCopyVar
return RscTop::GetCopyVar( rInst, nVarName );
}
-sal_Bool RscClass::IsConsistent( const RSCINST & rInst )
+bool RscClass::IsConsistent( const RSCINST & rInst )
{
sal_uInt32 i = 0;
RSCINST aTmpI;
- sal_Bool bRet;
+ bool bRet;
bRet = RscTop::IsConsistent( rInst );
@@ -425,15 +406,15 @@ sal_Bool RscClass::IsConsistent( const RSCINST & rInst )
{
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
- bRet = sal_False;
+ bRet = false;
}
};
- return( bRet );
+ return bRet;
}
void RscClass::SetToDefault( const RSCINST & rInst )
@@ -450,7 +431,7 @@ void RscClass::SetToDefault( const RSCINST & rInst )
// auf Default gesetzt
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
aTmpI.pClass->SetToDefault( aTmpI );
}
@@ -460,7 +441,7 @@ void RscClass::SetToDefault( const RSCINST & rInst )
RscTop::SetToDefault( rInst );
}
-sal_Bool RscClass::IsDefault( const RSCINST & rInst )
+bool RscClass::IsDefault( const RSCINST & rInst )
{
sal_uInt32 i;
RSCINST aTmpI;
@@ -471,10 +452,10 @@ sal_Bool RscClass::IsDefault( const RSCINST & rInst )
// auf Default untersucht
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
if( !IsDflt( rInst.pData, i ) )
- return( sal_False );
+ return false;
};
- return( RscTop::IsDefault( rInst ) );
+ return RscTop::IsDefault( rInst );
}
RSCINST RscClass::GetDefault( Atom nVarId )
@@ -484,70 +465,71 @@ RSCINST RscClass::GetDefault( Atom nVarId )
i = 0;
while( i < nEntries && pVarTypeList[ i ].nVarName != nVarId )
i++;
+
if( i < nEntries )
{
RSCINST aTmpI;
aTmpI.pClass = pVarTypeList[ i ].pClass;
aTmpI.pData = GetDfltData( i );
- return( aTmpI );
+ return aTmpI;
};
- return( RscTop::GetDefault( nVarId ) );
+ return RscTop::GetDefault( nVarId );
}
-sal_Bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
+bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
{
RSCINST aTmpI;
- aTmpI = GetInstData( pData, nEle, sal_True );
+ aTmpI = GetInstData( pData, nEle, true );
if( aTmpI.IsInst() )
{
if( VAR_SVDYNAMIC & pVarTypeList[ nEle ].nVarType )
- return sal_False;
+ return false;
if( aTmpI.pClass == pVarTypeList[ nEle ].pClass )
//sie haben auch die gleiche Klasse
return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) );
else
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
-sal_Bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
RSCINST aTmpI;
RSCINST aDfltI;
if( !RscTop::IsValueDefault( rInst, pDef ) )
- return sal_False;
+ return false;
if( pDef )
{
for( sal_uInt32 i = 0; i < nEntries; i++ )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
{
if( aTmpI.pClass != pVarTypeList[ i ].pClass )
//sie haben nicht die gleiche Klasse
- return sal_False;
+ return false;
- aDfltI = GetInstData( pDef, i, sal_True );
+ aDfltI = GetInstData( pDef, i, true );
if( !aDfltI.IsInst() )
aDfltI.pData = GetDfltData( i );
if( !aTmpI.pClass->IsValueDefault( aTmpI, aDfltI.pData ) )
- return sal_False;
+ return false;
}
}
}
else
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
@@ -560,12 +542,12 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
if( i < nEntries )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
{
aTmpI.pClass->Destroy( aTmpI );
aTmpI.pClass->Create( &aTmpI, RSCINST() );
- SetVarDflt( rInst.pData, i, sal_True );
+ SetVarDflt( rInst.pData, i, true );
}
}
else //In Superklasse nach Variable suchen
@@ -574,14 +556,11 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
}
-void RscClass::WriteSrc
-(
- const RSCINST & rInst,
- FILE * fOutput,
- RscTypCont * pTC,
- sal_uInt32 nTab,
- const char * pVarName
-)
+void RscClass::WriteSrc( const RSCINST & rInst,
+ FILE * fOutput,
+ RscTypCont * pTC,
+ sal_uInt32 nTab,
+ const char * pVarName)
{
sal_uInt32 i = 0, n = 0;
RSCINST aTmpI;
@@ -593,15 +572,17 @@ void RscClass::WriteSrc
if( !(VAR_HIDDEN & pVarTypeList[ i ].nVarType) )
{
// Hack wegen Position und Dimensiuon
- if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName
- || nRsc_WHMAPMODEId == pVarTypeList[ i ].nVarName )
+ if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName ||
+ nRsc_WHMAPMODEId == pVarTypeList[ i ].nVarName )
{
- if( !IsDflt( rInst.pData, i ) //MapUnit
- || !IsDflt( rInst.pData, i+1 ) //X, Width
- || !IsDflt( rInst.pData, i+2 ) )//Y, Height
- {// ein Wert ist nicht Default
+ if( !IsDflt( rInst.pData, i ) || // MapUnit
+ !IsDflt( rInst.pData, i+1 ) || //X, Width
+ !IsDflt( rInst.pData, i+2 ) ) //Y, Height
+ {
+ // ein Wert ist nicht Default
for( n = 0; n < nTab; n++ )
fputc( '\t', fOutput );
+
if( nRsc_XYMAPMODEId == pVarTypeList[ i ].nVarName )
fprintf( fOutput, "Pos = " );
else
@@ -609,22 +590,24 @@ void RscClass::WriteSrc
if( !IsDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
aTmpI.pClass->WriteSrcHeader(
aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
}
fprintf( fOutput, "( " );
- aTmpI = GetInstData( rInst.pData, i+1, sal_True );
+ aTmpI = GetInstData( rInst.pData, i+1, true );
if( !aTmpI.IsInst() )
aTmpI.pData = GetDfltData( i+1 );
- aTmpI.pClass->WriteSrcHeader(
- aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
+
+ aTmpI.pClass->WriteSrcHeader( aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
fprintf( fOutput, ", " );
- aTmpI = GetInstData( rInst.pData, i+2, sal_True );
+ aTmpI = GetInstData( rInst.pData, i+2, true );
+
if( !aTmpI.IsInst() )
aTmpI.pData = GetDfltData( i+2 );
+
aTmpI.pClass->WriteSrcHeader(
aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
fprintf( fOutput, " );\n" );
@@ -632,9 +615,9 @@ void RscClass::WriteSrc
i += 2; //_X, _Y oder _Widht, Height ueberlesen
}
else if( !IsDflt( rInst.pData, i )
- && !IsValueDflt( rInst.pData, i ) )
+ && !IsValueDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
{
@@ -642,6 +625,7 @@ void RscClass::WriteSrc
for( n = 0; n < nTab; n++ )
fputc( '\t', fOutput );
+
fprintf( fOutput, "%s", pName );
fprintf( fOutput, " = " );
aTmpI.pClass->WriteSrcHeader(
@@ -655,19 +639,16 @@ void RscClass::WriteSrc
return;
}
-sal_Int32 RscClass::GetCorrectValues
-(
- const RSCINST & rInst,
- sal_uInt32 nVarPos,
- sal_uInt32 nTupelIdx,
- RscTypCont * pTC
-)
+sal_Int32 RscClass::GetCorrectValues( const RSCINST & rInst,
+ sal_uInt32 nVarPos,
+ sal_uInt32 nTupelIdx,
+ RscTypCont * pTC)
{
sal_Int32 nLang = 0;
sal_Int32 nBaseValue;
// Basiswert holen
- RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, sal_True );
+ RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, true );
aTmpI.pClass->GetNumber( aTmpI, &nBaseValue );
// Sprach Delta holen
@@ -675,21 +656,18 @@ sal_Int32 RscClass::GetCorrectValues
if( aTmpI.IsInst() )
{
RscWriteRc aMem;
- aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, sal_False );
+ aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, false );
nLang = (sal_Int32)aMem.GetShort( nTupelIdx * sizeof(sal_uInt16) );
}
return nLang + nBaseValue;
}
-ERRTYPE RscClass::WriteInstRc
-(
- const RSCINST & rInst,
- RscWriteRc & rMem,
- RscTypCont * pTC,
- sal_uInt32 nDeep,
- sal_Bool bExtra
-)
+ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst,
+ RscWriteRc & rMem,
+ RscTypCont * pTC,
+ sal_uInt32 nDeep,
+ bool bExtra)
{
sal_uInt32 i = 0;
ERRTYPE aError;
@@ -737,52 +715,49 @@ ERRTYPE RscClass::WriteInstRc
}
else
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
- // Nur an Variable Extradata bExtra nicht auf sal_False
+ aTmpI = GetInstData( rInst.pData, i, true );
+ // Nur an Variable Extradata bExtra nicht auf false
// setzen
aError = aTmpI.pClass->
WriteRcHeader( aTmpI, rMem, pTC,
- RscId(), nDeep,
- (nRsc_EXTRADATA
- == pVarTypeList[ i ].nVarName)
- ? bExtra : sal_False );
+ RscId(), nDeep,
+ (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName)
+ ? bExtra : false );
}
sal_uInt32 nMask = rMem.GetLong( nMaskOff );
nMask |= pVarTypeList[ i ].nMask;
rMem.PutAt( nMaskOff, nMask );
}
}
- else{
+ else
+ {
if( IsDflt( rInst.pData, i ) )
{
aTmpI.pClass = pVarTypeList[ i ].pClass;
aTmpI.pData = GetDfltData( i );
}
else
- aTmpI = GetInstData( rInst.pData, i, sal_True );
- // Nur an Variable Extradata bExtra nicht auf sal_False
+ aTmpI = GetInstData( rInst.pData, i, true );
+
+ // Nur an Variable Extradata bExtra nicht auf false
// setzen
aError = aTmpI.pClass->
WriteRcHeader( aTmpI, rMem, pTC,
RscId(), nDeep,
- (nRsc_EXTRADATA
- == pVarTypeList[ i ].nVarName)
- ? bExtra : sal_False );
+ (nRsc_EXTRADATA == pVarTypeList[ i ].nVarName)
+ ? bExtra : false );
}
}
}
- return( aError );
+ return aError;
}
-ERRTYPE RscClass::WriteRc
-(
- const RSCINST & rInst,
- RscWriteRc & rMem,
- RscTypCont * pTC,
- sal_uInt32 nDeep,
- sal_Bool bExtra
-)
+ERRTYPE RscClass::WriteRc( const RSCINST & rInst,
+ RscWriteRc & rMem,
+ RscTypCont * pTC,
+ sal_uInt32 nDeep,
+ bool bExtra)
{
ERRTYPE aError;
@@ -790,15 +765,16 @@ ERRTYPE RscClass::WriteRc
if( aError.IsOk() )
aError = WriteInstRc( rInst, rMem, pTC, nDeep, bExtra );
- return( aError );
+ return aError;
}
RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
: RscClass( nId, nTypeId, pSuper )
-{}
+{
+}
ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra, sal_Bool bFirst )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra, bool bFirst )
{
ERRTYPE aError;
RSCINST aFileName;
@@ -828,26 +804,29 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
else
aError = ERR_ERROR;
- return( aError );
+ return aError;
}
ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
if( this == rInst.pClass )
+ {
// nur wenn es eigen Klasse ist
aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra );
+ }
return aError;
}
RscTupel::RscTupel( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
: RscClass( nId, nTypeId, pSuper )
-{}
+{
+}
RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,
- const RSCINST & rInitInst )
+ const RSCINST & rInitInst )
{
if( nPos >= nEntries )
{
@@ -874,7 +853,7 @@ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput,
if( !IsDflt( rInst.pData, i )
&& !IsValueDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, sal_True );
+ aTmpI = GetInstData( rInst.pData, i, true );
if( aTmpI.IsInst() )
aTmpI.pClass->WriteSrcHeader(
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index d11ce80195bd..908030cd4b3c 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.cxx
@@ -22,46 +22,50 @@
#include <rsctop.hxx>
-RefNode::RefNode( Atom nTyp ){
+RefNode::RefNode( Atom nTyp )
+{
pObjBiTree = 0;
nTypNameId = nTyp;
}
sal_uInt32 RefNode::GetId() const
{
- return( nTypNameId );
+ return nTypNameId;
}
-sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){
// insert a node in the b-tree pObjBiTree
// if the node with the same name is in pObjBiTree,
// return sal_False and no insert,
+bool RefNode::PutObjNode( ObjNode * pPutObject )
+{
if( pObjBiTree )
- return( pObjBiTree->Insert( pPutObject ) );
+ return pObjBiTree->Insert( pPutObject );
pObjBiTree = pPutObject;
- return( sal_True );
+ return true;
}
-ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){
// insert a node in the b-tree pObjBiTree
// if the node with the same name is in pObjBiTree,
// return NULL and no insert,
// if not return the pointer to the Object
-
+ObjNode * RefNode :: GetObjNode( const RscId & rRscId )
+{
if( pObjBiTree )
- return( pObjBiTree->Search( rRscId ) );
- return( NULL );
+ return pObjBiTree->Search( rRscId );
+ return NULL;
}
-ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){
+ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey )
+{
pRscObj = pData;
aRscId = rId;
lFileKey = lKey;
}
-ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){
+ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey )
+{
ObjNode * pRetNode = this;
if( Right() )
@@ -69,18 +73,22 @@ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){
if( Left() )
pLeft = ((ObjNode *)Left())->DelObjNode( pClass, nFileKey );
- if( GetFileKey() == nFileKey ){
- if( GetRscObj() ){
+ if( GetFileKey() == nFileKey )
+ {
+ if( GetRscObj() )
+ {
pClass->Destroy( RSCINST( pClass, GetRscObj() ) );
rtl_freeMemory( GetRscObj() );
}
pRetNode = (ObjNode *)Right();
- if( pRetNode ){
+ if( pRetNode )
+ {
if( Left() )
pRetNode->Insert( (ObjNode *)Left() );
}
else
pRetNode = (ObjNode *)Left();
+
delete this;
}
return pRetNode;
@@ -88,40 +96,44 @@ ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){
sal_uInt32 ObjNode::GetId() const
{
- return( (sal_uInt32)(long)aRscId );
+ return (sal_uInt32)(long)aRscId;
}
-sal_Bool ObjNode::IsConsistent()
+bool ObjNode::IsConsistent()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
if( (long)aRscId > 0x7FFF || (long)aRscId < 1 )
{
- bRet = sal_False;
+ bRet = false;
}
else
{
if( Left() )
{
if( !((ObjNode *)Left())->IsConsistent() )
- bRet = sal_False;
+ {
+ bRet = false;
+ }
if( ((ObjNode *)Left())->aRscId >= aRscId )
{
- bRet = sal_False;
+ bRet = false;
}
};
if( Right() )
{
if( ((ObjNode *)Right())->aRscId <= aRscId )
{
- bRet = sal_False;
+ bRet = false;
}
if( !((ObjNode *)Right())->IsConsistent() )
- bRet = sal_False;
+ {
+ bRet = false;
+ }
};
};
- return( bRet );
+ return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 2564c69f9e15..6f714958f013 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.cxx
@@ -44,51 +44,55 @@ RSCCLASS_TYPE RscConst::GetClassType() const
return RSCCLASS_CONST;
}
-ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){
+ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue )
+{
if( pVarArray )
- pVarArray = (VarEle *)
- rtl_reallocateMemory( (void *)pVarArray,
- ((nEntries +1) * sizeof( VarEle )) );
+ pVarArray = (VarEle *) rtl_reallocateMemory( (void *)pVarArray,
+ ((nEntries +1) * sizeof( VarEle )) );
else
- pVarArray = (VarEle *)
- rtl_allocateMemory( ((nEntries +1) * sizeof( VarEle )) );
+ pVarArray = (VarEle *) rtl_allocateMemory( ((nEntries +1) * sizeof( VarEle )) );
pVarArray[ nEntries ].nId = nVarName;
pVarArray[ nEntries ].lValue = lValue;
nEntries++;
- return( ERR_OK );
+ return ERR_OK;
}
-Atom RscConst::GetConstant( sal_uInt32 nPos ){
+Atom RscConst::GetConstant( sal_uInt32 nPos )
+{
if( nPos < nEntries )
return pVarArray[ nPos ].nId;
- return( InvalidAtom );
+ return InvalidAtom;
}
-sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const
+bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const
{
sal_uInt32 i = 0;
for( i = 0; i < nEntries; i++ )
+ {
if( pVarArray[ i ].nId == nConst )
{
*pValue = pVarArray[ i ].lValue;
- return sal_True;
+ return true;
}
- return sal_False;
+ }
+ return false;
}
-sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const
+bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const
{
sal_uInt32 i = 0;
for( i = 0; i < nEntries; i++ )
+ {
if( pVarArray[ i ].lValue == lValue )
{
*pConst = pVarArray[ i ].nId;
- return sal_True;
+ return true;
}
- return sal_False;
+ }
+ return false;
}
sal_uInt32 RscConst::GetConstPos( Atom nConst )
@@ -98,14 +102,14 @@ sal_uInt32 RscConst::GetConstPos( Atom nConst )
for( i = 0; i < nEntries; i++ )
{
if( pVarArray[ i ].nId == nConst )
- return( i );
+ return i;
}
- return( nEntries );
+ return nEntries;
}
RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId )
- : RscConst( nId, nTypeId )
+ : RscConst( nId, nTypeId )
{
nSize = ALIGNED_SIZE( sizeof( RscEnumInst ) );
}
@@ -117,87 +121,86 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*
if( nEntries != (i = GetConstPos( nConst )) )
{
((RscEnumInst *)rInst.pData)->nValue = i;
- ((RscEnumInst *)rInst.pData)->bDflt = sal_False;
- return( ERR_OK );
+ ((RscEnumInst *)rInst.pData)->bDflt = false;
+ return ERR_OK;
};
- return( ERR_RSCENUM );
+ return ERR_RSCENUM;
}
ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
{
sal_uInt32 i = 0;
- for( i = 0; i < nEntries; i++ ){
+ for( i = 0; i < nEntries; i++ )
+ {
if( (sal_Int32)pVarArray[ i ].lValue == lValue )
- return( SetConst( rInst, pVarArray[ i ].nId, lValue ) );
+ return SetConst( rInst, pVarArray[ i ].nId, lValue );
};
- return( ERR_RSCENUM );
+ return ERR_RSCENUM;
}
-ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){
+ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH )
+{
*pH = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId;
- return( ERR_OK );
+ return ERR_OK;
}
ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){
*pNumber = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue;
- return( ERR_OK );
+ return ERR_OK;
}
-RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
+RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
+{
RSCINST aInst;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA)
rtl_allocateMemory( sizeof( RscEnumInst ) );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
if( bOwnClass )
memmove( aInst.pData, rDflt.pData, Size() );
- else{
+ else
+ {
((RscEnumInst *)aInst.pData)->nValue = 0;
- ((RscEnumInst *)aInst.pData)->bDflt = sal_True;
+ ((RscEnumInst *)aInst.pData)->bDflt = true;
}
- return( aInst );
+ return aInst;
}
-sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
- if( pDef ){
- if( ((RscEnumInst*)rInst.pData)->nValue ==
- ((RscEnumInst*)pDef)->nValue )
- {
- return sal_True;
- }
- }
-
- return sal_False;
+bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+{
+ return pDef && (((RscEnumInst*)rInst.pData)->nValue == ((RscEnumInst*)pDef)->nValue );
}
void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput,
- RscTypCont *, sal_uInt32, const char * )
+ RscTypCont *, sal_uInt32, const char * )
{
- fprintf( fOutput, "%s", pHS->getString(
- pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId ).getStr() );
+ fprintf( fOutput, "%s",
+ pHS->getString( pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].nId ).getStr() );
}
ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
aMem.Put( (sal_Int32)pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue );
- return( ERR_OK );
+ return ERR_OK;
}
RscLangEnum::RscLangEnum()
- : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ),
- mnLangId( 0x400 )
+ : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ),
+ mnLangId( 0x400 )
{
}
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index 2919a00a8e54..b818e95663e6 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -28,16 +28,17 @@
void ENTRY_STRUCT::Destroy()
{
aName.Destroy();
- if( aInst.IsInst() ){
+ if( aInst.IsInst() )
+ {
aInst.pClass->Destroy( aInst );
rtl_freeMemory( aInst.pData );
};
}
RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
- sal_Bool bNoIdent )
- : RscTop( nId, nTypeId, pSuper ),
- nSize( 0 )
+ bool bNoIdent )
+ : RscTop( nId, nTypeId, pSuper )
+ , nSize( 0 )
{
pTypeClass = NULL;
pTypeClass1 = NULL;
@@ -57,7 +58,8 @@ RSCCLASS_TYPE RscBaseCont::GetClassType() const
void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
{
- if( pClassData->nEntries ){
+ if( pClassData->nEntries )
+ {
for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ )
{
pClassData->pEntries[ i ].Destroy();
@@ -69,17 +71,19 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
}
RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
RscBaseContInst * pClassData;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
@@ -88,19 +92,21 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
pClassData = (RscBaseContInst *)(aInst.pData + nOffInstData);
pClassData->nEntries = 0;
pClassData->pEntries = NULL;
- pClassData->bDflt = sal_True;
+ pClassData->bDflt = true;
- if( bOwnClass ){
+ if( bOwnClass )
+ {
RscBaseContInst * pDfltClassData;
RSCINST aDfltI;
pDfltClassData = (RscBaseContInst *)(rDflt.pData + nOffInstData);
- if( 0 != pDfltClassData->nEntries ){
+ if( 0 != pDfltClassData->nEntries )
+ {
*pClassData = *pDfltClassData;
pClassData->pEntries =
(ENTRY_STRUCT *)rtl_allocateMemory( sizeof( ENTRY_STRUCT )
- * pClassData->nEntries );
+ * pClassData->nEntries );
for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ )
{
pClassData->pEntries[ i ].Create();
@@ -113,10 +119,11 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
};
}
- return( aInst );
+ return aInst;
}
-void RscBaseCont::Destroy( const RSCINST & rInst ){
+void RscBaseCont::Destroy( const RSCINST & rInst )
+{
RscBaseContInst * pClassData;
RscTop::Destroy( rInst);
@@ -134,11 +141,12 @@ RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName
if( !pClass )
pClass = pTypeClass;
- if( rEleName.IsId() ){
+ if( rEleName.IsId() )
+ {
for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ )
{
- if( pClassData->pEntries[ i ].aName == rEleName
- && pClassData->pEntries[ i ].aInst.pClass == pClass )
+ if( pClassData->pEntries[ i ].aName == rEleName &&
+ pClassData->pEntries[ i ].aInst.pClass == pClass )
{
return( pClassData->pEntries[ i ].aInst );
};
@@ -163,16 +171,22 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
if( !bNoId && !rEleName.IsId() )
aError = WRN_CONT_NOID;
+
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- if( pCreateClass ){
- if( !pCreateClass->InHierarchy( pTypeClass ) ){
- if( pTypeClass1 ){
- if( !pCreateClass->InHierarchy( pTypeClass1 ) ){
+ if( pCreateClass )
+ {
+ if( !pCreateClass->InHierarchy( pTypeClass ) )
+ {
+ if( pTypeClass1 )
+ {
+ if( !pCreateClass->InHierarchy( pTypeClass1 ) )
+ {
return ERR_CONT_INVALIDTYPE;
}
}
- else{
+ else
+ {
return ERR_CONT_INVALIDTYPE;
};
};
@@ -180,24 +194,30 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
else
pCreateClass = pTypeClass;
- pClassData->bDflt = sal_False;
+ pClassData->bDflt = false;
+
if( !bNoId )
aTmpI = SearchEle( rInst, rEleName, pCreateClass );
// Eintrag gefunden
- if( aTmpI.IsInst() ){
+ if( aTmpI.IsInst() )
+ {
aError = WRN_CONT_DOUBLEID;
- if( rCreateInst.IsInst() ){
+ if( rCreateInst.IsInst() )
+ {
aTmpI.pClass->Destroy( aTmpI );
aTmpI.pClass->Create( &aTmpI, rCreateInst );
};
}
- else {
- if( pClassData->pEntries ){
+ else
+ {
+ if( pClassData->pEntries )
+ {
pClassData->pEntries =
(ENTRY_STRUCT *)rtl_reallocateMemory( pClassData->pEntries,
sizeof( ENTRY_STRUCT ) * (pClassData->nEntries +1) );
}
- else {
+ else
+ {
pClassData->pEntries =
(ENTRY_STRUCT *)rtl_allocateMemory( sizeof( ENTRY_STRUCT )
* (pClassData->nEntries +1) );
@@ -206,14 +226,16 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
pClassData->pEntries[ pClassData->nEntries ].Create();
pClassData->pEntries[ pClassData->nEntries ].aName = rEleName;
- if( rCreateInst.IsInst() ){
+ if( rCreateInst.IsInst() )
+ {
// Instanz mit CreateInst-Daten initialisieren
pClassData->pEntries[ pClassData->nEntries ].aInst =
- pCreateClass->Create( NULL, rCreateInst );
+ pCreateClass->Create( NULL, rCreateInst );
}
- else {
+ else
+ {
pClassData->pEntries[ pClassData->nEntries ].aInst =
- pCreateClass->Create( NULL, RSCINST() );
+ pCreateClass->Create( NULL, RSCINST() );
};
pClassData->nEntries++;
@@ -224,14 +246,16 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
return aError;
}
-sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ){
+sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst )
+{
RscBaseContInst * pClassData;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- return( pClassData->nEntries );
+ return pClassData->nEntries;
}
-RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
+RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos )
+{
RscBaseContInst * pClassData;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -249,10 +273,11 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) ){
+ if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) )
+ {
ENTRY_STRUCT aEntry;
- int nInc = 1;
- sal_uInt32 i = 0;
+ int nInc = 1;
+ sal_uInt32 i = 0;
// Quelle Merken
aEntry = pClassData->pEntries[ nSourcePos ];
@@ -268,18 +293,21 @@ ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
}
else
aError = ERR_RSCCONT;
+
return aError;
}
ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
- const RscId & rId ){
+ const RscId & rId )
+{
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- if( nPos < pClassData->nEntries ){
+ if( nPos < pClassData->nEntries )
+ {
if( ! (rId == pClassData->pEntries[ nPos ].aName) )
aTmpI = SearchEle( rInst, rId,
pClassData->pEntries[ nPos ].aInst.pClass );
@@ -290,21 +318,24 @@ ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
}
else
aError = ERR_RSCCONT;
- return( aError );
+
+ return aError;
}
-SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){
+SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos )
+{
RscBaseContInst * pClassData;
SUBINFO_STRUCT aInfo;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- if( nPos < pClassData->nEntries ){
- aInfo.aId = pClassData->pEntries[ nPos ].aName;
- aInfo.nPos = nPos;
+ if( nPos < pClassData->nEntries )
+ {
+ aInfo.aId = pClassData->pEntries[ nPos ].aName;
+ aInfo.nPos = nPos;
aInfo.pClass = pClassData->pEntries[ nPos ].aInst.pClass;
}
- return( aInfo );
+ return aInfo;
}
ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
@@ -316,13 +347,16 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
-// otherwise infinite recursion is possible
- if( RSC_NOTYPE == pTypeClass->GetTypId() ){
+ // otherwise infinite recursion is possible
+ if( RSC_NOTYPE == pTypeClass->GetTypId() )
+ {
aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr );
+
if( aError.IsOk() )
aError = aTmpI.pClass->SetString( aTmpI, pStr );
- else {
+ else
+ {
aError.Clear();
DeletePos( rInst, pClassData->nEntries -1 );
aError = GetElement( rInst, RscId(), pTypeClass1, RSCINST(), &aTmpI );
@@ -330,16 +364,18 @@ ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr )
if( aError.IsOk() )
aError = aTmpI.pClass->SetString( aTmpI, pStr );
}
+
if( aError.IsError() )
DeletePos( rInst, pClassData->nEntries -1 );
}
else
aError = ERR_UNKNOWN_METHOD;
- return( aError );
+ return aError;
}
-ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
+ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
+{
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
@@ -347,13 +383,16 @@ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
-// otherwise infinite recursion is possible
- if( RSC_NOTYPE == pTypeClass->GetTypId() ){
+ // otherwise infinite recursion is possible
+ if( RSC_NOTYPE == pTypeClass->GetTypId() )
+ {
aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber );
+
if( aError.IsOk() )
aError = aTmpI.pClass->SetNumber( aTmpI, lValue );
- else {
+ else
+ {
aError.Clear();
DeletePos( rInst, pClassData->nEntries -1 );
aError = GetElement( rInst, RscId(), pTypeClass1, RSCINST(), &aTmpI );
@@ -367,19 +406,16 @@ ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
else
aError = ERR_UNKNOWN_METHOD;
- return( aError );
+ return aError;
}
-ERRTYPE RscBaseCont::SetBool
-(
- const RSCINST & rInst,
- sal_Bool bValue
-)
+ERRTYPE RscBaseCont::SetBool( const RSCINST & rInst,
+ bool bValue)
{
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
- sal_Bool bBool;
+ bool bBool;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -388,9 +424,11 @@ ERRTYPE RscBaseCont::SetBool
{
aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
aError = aTmpI.pClass->GetBool( aTmpI, &bBool );
+
if( aError.IsOk() )
aError = aTmpI.pClass->SetBool( aTmpI, bValue );
- else {
+ else
+ {
aError.Clear();
DeletePos( rInst, pClassData->nEntries -1 );
aError = GetElement( rInst, RscId(), pTypeClass1, RSCINST(), &aTmpI );
@@ -398,21 +436,19 @@ ERRTYPE RscBaseCont::SetBool
if( aError.IsOk() )
aError = aTmpI.pClass->SetBool( aTmpI, bValue );
}
+
if( aError.IsError() )
DeletePos( rInst, pClassData->nEntries -1 );
}
else
aError = ERR_UNKNOWN_METHOD;
- return( aError );
+ return aError;
}
-ERRTYPE RscBaseCont::SetConst
-(
- const RSCINST & rInst,
- Atom nValueId,
- sal_Int32 lValue
-)
+ERRTYPE RscBaseCont::SetConst( const RSCINST & rInst,
+ Atom nValueId,
+ sal_Int32 lValue)
{
RscBaseContInst * pClassData;
RSCINST aTmpI;
@@ -422,12 +458,15 @@ ERRTYPE RscBaseCont::SetConst
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
// otherwise infinite recursion is possible
- if( RSC_NOTYPE == pTypeClass->GetTypId() ){
+ if( RSC_NOTYPE == pTypeClass->GetTypId() )
+ {
aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
aError = aTmpI.pClass->GetConst( aTmpI, &nConst );
+
if( aError.IsOk() )
aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue );
- else {
+ else
+ {
aError.Clear();
DeletePos( rInst, pClassData->nEntries -1 );
aError = GetElement( rInst, RscId(), pTypeClass1, RSCINST(), &aTmpI );
@@ -435,16 +474,18 @@ ERRTYPE RscBaseCont::SetConst
if( aError.IsOk() )
aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue );
}
+
if( aError.IsError() )
DeletePos( rInst, pClassData->nEntries -1 );
}
else
aError = ERR_UNKNOWN_METHOD;
- return( aError );
+ return aError;
}
-ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){
+ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId )
+{
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
@@ -453,12 +494,15 @@ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
// otherwise infinite recursion is possible
- if( RSC_NOTYPE == pTypeClass->GetTypId() ){
+ if( RSC_NOTYPE == pTypeClass->GetTypId() )
+ {
aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI );
aError = aTmpI.pClass->GetRef( aTmpI, &aId );
+
if( aError.IsOk() )
aError = aTmpI.pClass->SetRef( aTmpI, rRefId );
- else {
+ else
+ {
aError.Clear();
DeletePos( rInst, pClassData->nEntries -1 );
aError = GetElement( rInst, RscId(), pTypeClass1, RSCINST(), &aTmpI );
@@ -466,19 +510,21 @@ ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ){
if( aError.IsOk() )
aError = aTmpI.pClass->SetNumber( aTmpI, rRefId );
}
+
if( aError.IsError() )
DeletePos( rInst, pClassData->nEntries -1 );
}
else
aError = ERR_UNKNOWN_METHOD;
- return( aError );
+ return aError;
}
-sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) {
+bool RscBaseCont::IsConsistent( const RSCINST & rInst )
+{
sal_uInt32 i = 0;
RscBaseContInst * pClassData;
- sal_Bool bRet;
+ bool bRet;
bRet = RscTop::IsConsistent( rInst );
@@ -486,24 +532,29 @@ sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) {
// auf doppelten Id Testen und Reihenfolge beibehalten
// Komplexitaet = n^2 / 2
- for( i = 0; i < pClassData->nEntries; i++ ){
- if( !bNoId ){
- if( (sal_Int32)pClassData->pEntries[ i ].aName > 0x7FFF
- || (sal_Int32)pClassData->pEntries[ i ].aName < 1 ){
- bRet = sal_False;
+ for( i = 0; i < pClassData->nEntries; i++ )
+ {
+ if( !bNoId )
+ {
+ if( (sal_Int32)pClassData->pEntries[ i ].aName > 0x7FFF ||
+ (sal_Int32)pClassData->pEntries[ i ].aName < 1 )
+ {
+ bRet = false;
}
else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName,
- pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
+ pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
{
- bRet = sal_False;
- };
+ bRet = false;
+ };
}
if( ! pClassData->pEntries[ i ].aInst.pClass->
- IsConsistent( pClassData->pEntries[ i ].aInst ) )
- bRet = sal_False;
+ IsConsistent( pClassData->pEntries[ i ].aInst ) )
+ {
+ bRet = false;
+ }
};
- return( bRet );
+ return bRet;
}
void RscBaseCont::SetToDefault( const RSCINST & rInst )
@@ -522,39 +573,41 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst )
RscTop::SetToDefault( rInst );
}
-sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){
+bool RscBaseCont::IsDefault( const RSCINST & rInst )
+{
sal_uInt32 i = 0;
RscBaseContInst * pClassData;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
if( !pClassData->bDflt )
- return sal_False;
+ return false;
- for( i = 0; i < pClassData->nEntries; i++ ){
+ for( i = 0; i < pClassData->nEntries; i++ )
+ {
if( ! pClassData->pEntries[ i ].aInst.pClass->
- IsDefault( pClassData->pEntries[ i ].aInst ) )
+ IsDefault( pClassData->pEntries[ i ].aInst ) )
{
- return( sal_False );
+ return( false );
};
};
- return( RscTop::IsDefault( rInst ) );
+ return RscTop::IsDefault( rInst );
}
-sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
RscBaseContInst * pClassData;
if( !RscTop::IsValueDefault( rInst, pDef ) )
- return sal_False;
+ return false;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
if( pClassData->nEntries )
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
@@ -567,29 +620,38 @@ void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass,
if( !pClass )
pClass = pTypeClass;
- for( i = 0; i < pClassData->nEntries; i++ ){
+ for( i = 0; i < pClassData->nEntries; i++ )
+ {
if( pClassData->pEntries[ i ].aName == rId )
- if( pClassData->pEntries[ i ].aInst.pClass == pClass || !pClass ){
+ {
+ if( pClassData->pEntries[ i ].aInst.pClass == pClass || !pClass )
+ {
DeletePos( rInst, i );
return;
};
+ };
};
}
-void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ){
+void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
+{
RscBaseContInst * pClassData;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
- if( nPos < pClassData->nEntries ){
+ if( nPos < pClassData->nEntries )
+ {
if( 1 == pClassData->nEntries )
DestroyElements( pClassData );
- else{
+ else
+ {
pClassData->pEntries[ nPos ].Destroy();
pClassData->nEntries--;
+
for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ )
pClassData->pEntries[ i ] = pClassData->pEntries[ i + 1 ];
+
};
};
}
@@ -607,6 +669,7 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
{
for( t = 0; t < nTab; t++ )
fputc( '\t', fOutput );
+
pClassData->pEntries[ i ].aInst.pClass->
WriteSrcHeader( pClassData->pEntries[ i ].aInst,
fOutput, pTC, nTab,
@@ -616,13 +679,13 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
RscBaseContInst * pClassData;
ERRTYPE aError;
if( bExtra || bNoId )
- { // Nur Subresourcen schreiben, wenn bExtra == sal_True
+ { // Nur Subresourcen schreiben, wenn bExtra == true
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
for (sal_uInt32 i = 0; i < pClassData->nEntries && aError.IsOk(); i++ )
@@ -635,7 +698,7 @@ ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
}
}
- return( aError );
+ return aError ;
}
void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -647,7 +710,7 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError;
@@ -655,13 +718,14 @@ ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
if( aError.IsOk() )
aError = ContWriteRc( rInst, rMem, pTC, nDeep, bExtra );
- return( aError );
+ return aError;
}
RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
- RscTop * pSuper, sal_Bool bNoIdent )
- : RscBaseCont( nId, nTypeId, pSuper, bNoIdent )
-{}
+ RscTop * pSuper, bool bNoIdent )
+ : RscBaseCont( nId, nTypeId, pSuper, bNoIdent )
+{
+}
void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab,
@@ -674,21 +738,24 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "\n" );
for( i = 0; i < nTab; i++ )
fputc( '\t', fOutput );
+
fprintf( fOutput, "{\n" );
ContWriteSrc( rInst, fOutput, pTC, nTab +1, pVarName );
for( i = 0; i < nTab; i++ )
fputc( '\t', fOutput );
+
fprintf( fOutput, "}" );
}
-RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent )
- : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
-{}
+RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, bool bNoIdent )
+ : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
+{
+}
ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
RscBaseContInst * pClassData;
ERRTYPE aError;
@@ -706,12 +773,13 @@ ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
}
RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
- RscTop * pSuper, sal_Bool bNoIdent )
- : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
-{}
+ RscTop * pSuper, bool bNoIdent )
+ : RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
+{
+}
ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError;
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index c37e377b9a7e..0aa1efd75f1d 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.cxx
@@ -25,60 +25,66 @@
#include <rscflag.hxx>
RscFlag::RscFlag( Atom nId, sal_uInt32 nTypeId )
- : RscConst( nId, nTypeId )
-{}
+ : RscConst( nId, nTypeId )
+{
+}
sal_uInt32 RscFlag::Size()
{
- return( ALIGNED_SIZE( sizeof( RscFlagInst ) *
- ( 1 + (nEntries -1) / (sizeof( sal_uInt32 ) * 8) ) ) );
+ return ALIGNED_SIZE( sizeof( RscFlagInst ) *
+ ( 1 + (nEntries -1) / (sizeof( sal_uInt32 ) * 8) ) );
}
ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst )
{
sal_uInt32 i = 0;
- if( nEntries != (i = GetConstPos( nConst )) ){
+ if( nEntries != (i = GetConstPos( nConst )) )
+ {
sal_uInt32 nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
+
i = i / (sizeof( sal_uInt32 ) * 8);
((RscFlagInst *)rInst.pData)[ i ].nFlags &= ~nFlag;
((RscFlagInst *)rInst.pData)[ i ].nDfltFlags &= ~nFlag;
- return( ERR_OK );
+ return ERR_OK;
};
- return( ERR_RSCFLAG );
+ return ERR_RSCFLAG;
}
ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ )
{
sal_uInt32 i = 0;
- if( nEntries != (i = GetConstPos( nConst )) ){
+ if( nEntries != (i = GetConstPos( nConst )) )
+ {
sal_uInt32 nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
+
i = i / (sizeof( sal_uInt32 ) * 8);
((RscFlagInst *)rInst.pData)[ i ].nFlags |= nFlag;
((RscFlagInst *)rInst.pData)[ i ].nDfltFlags &= ~nFlag;
- return( ERR_OK );
+ return ERR_OK;
};
- return( ERR_RSCFLAG );
+ return ERR_RSCFLAG;
}
RSCINST RscFlag::CreateBasic( RSCINST * pInst )
{
RSCINST aInst;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() );
}
else
aInst = *pInst;
- return( aInst );
+ return aInst;
}
-RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass )
+RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
{
RSCINST aInst = CreateBasic( pInst );
@@ -96,11 +102,11 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCl
}
};
- return( aInst );
+ return aInst;
}
RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI,
- sal_Bool bOwnClass, Atom nConstId )
+ bool bOwnClass, Atom nConstId )
{
RSCINST aInst = CreateBasic( pInst );
sal_uInt32 i = 0;
@@ -112,19 +118,21 @@ RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI,
{
sal_uInt32 nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
- if( bOwnClass ){
+ if( bOwnClass )
+ {
((RscFlagInst *)aInst.pData)[ i ].nFlags &=
- ~nFlag | ((RscFlagInst *)rDfltI.pData)[ i ].nFlags;
+ ~nFlag | ((RscFlagInst *)rDfltI.pData)[ i ].nFlags;
((RscFlagInst *)aInst.pData)[ i ].nDfltFlags &=
- ~nFlag | ((RscFlagInst *)rDfltI.pData)[ i ].nDfltFlags;
+ ~nFlag | ((RscFlagInst *)rDfltI.pData)[ i ].nDfltFlags;
}
- else{
+ else
+ {
((RscFlagInst *)aInst.pData)[ i ].nFlags &= ~nFlag;
((RscFlagInst *)aInst.pData)[ i ].nDfltFlags |= nFlag;
}
}
- return( aInst );
+ return aInst;
}
void RscFlag::SetToDefault( const RSCINST & rInst )
@@ -135,64 +143,73 @@ void RscFlag::SetToDefault( const RSCINST & rInst )
((RscFlagInst *)rInst.pData)[ i ].nDfltFlags = 0xFFFFFFFF;
}
-sal_Bool RscFlag::IsDefault( const RSCINST & rInst )
+bool RscFlag::IsDefault( const RSCINST & rInst )
{
sal_uInt32 i = 0;
for( i = 0; i < Size() / sizeof( RscFlagInst ); i++ )
+ {
if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags != 0xFFFFFFFF )
- return( sal_False );
- return( sal_True );
+ return false;
+ }
+ return true;
}
-sal_Bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
+bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
- if( nEntries != (i = GetConstPos( nConstId )) ){
+ if( nEntries != (i = GetConstPos( nConstId )) )
+ {
nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
+
if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags & nFlag )
- return( sal_True );
+ return true ;
else
- return( sal_False );
+ return false;
};
- return( sal_True );
+ return true;
}
-sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
+bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
- if( nEntries != (i = GetConstPos( nConstId )) ){
+ if( nEntries != (i = GetConstPos( nConstId )) )
+ {
nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
- if( pDef ){
- if( (((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag)
- == (((RscFlagInst *)pDef)[ i ].nFlags & nFlag) )
+ if( pDef )
+ {
+ if( (((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag) ==
+ (((RscFlagInst *)pDef)[ i ].nFlags & nFlag) )
{
- return sal_True;
+ return true;
}
}
};
- return sal_False;
+ return false;
}
-sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
- if( pDef ){
+ if( pDef )
+ {
sal_uInt32 Flag = 0, nIndex = 0;
Flag = 1;
- for( sal_uInt32 i = 0; i < nEntries; i++ ){
+ for( sal_uInt32 i = 0; i < nEntries; i++ )
+ {
nIndex = i / (sizeof( sal_uInt32 ) * 8);
- if( (((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag)
- != (((RscFlagInst *)pDef)[ nIndex ].nFlags & Flag) )
+
+ if( (((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag) !=
+ (((RscFlagInst *)pDef)[ nIndex ].nFlags & Flag) )
{
- return sal_False;
+ return false;
}
Flag <<= 1;
if( !Flag )
@@ -200,45 +217,51 @@ sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
};
}
else
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
-sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
+bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
- if( nEntries != (i = GetConstPos( nConstId )) ){
+ if( nEntries != (i = GetConstPos( nConstId )) )
+ {
nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
+
if( ((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag )
- return( sal_True );
+ return true;
else
- return( sal_False );
+ return false;
};
- return( sal_True );
+ return true;
}
void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont *, sal_uInt32, const char * )
{
sal_uInt32 i = 0, Flag = 0, nIndex = 0;
- sal_Bool bComma = sal_False;
+ bool bComma = false;
Flag = 1;
- for( i = 0; i < nEntries; i++ ){
+ for( i = 0; i < nEntries; i++ )
+ {
nIndex = i / (sizeof( sal_uInt32 ) * 8);
- if( !( ((RscFlagInst *)rInst.pData)[ nIndex ].nDfltFlags & Flag) ){
+ if( !( ((RscFlagInst *)rInst.pData)[ nIndex ].nDfltFlags & Flag) )
+ {
if( bComma )
fprintf( fOutput, ", " );
+
if( ((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag )
fprintf( fOutput, "%s", pHS->getString( pVarArray[ i ].nId ).getStr() );
- else{
+ else
+ {
fprintf( fOutput, "not " );
fprintf( fOutput, "%s", pHS->getString( pVarArray[ i ].nId ).getStr() );
}
- bComma = sal_True;
+ bComma = true;
}
Flag <<= 1;
if( !Flag )
@@ -247,14 +270,16 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
sal_Int32 lVal = 0;
sal_uInt32 i = 0, Flag = 0, nIndex = 0;
Flag = 1;
- for( i = 0; i < nEntries; i++ ){
+ for( i = 0; i < nEntries; i++ )
+ {
nIndex = i / (sizeof( sal_uInt32 ) * 8);
+
if( ((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag )
lVal |= pVarArray[ i ].lValue;
@@ -264,12 +289,12 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
};
aMem.Put( (sal_Int32)lVal );
- return( ERR_OK );
+ return ERR_OK;
}
RscClient::RscClient( Atom nId, sal_uInt32 nTypeId, RscFlag * pClass,
- Atom nConstantId )
- : RscTop ( nId, nTypeId )
+ Atom nConstantId )
+ : RscTop ( nId, nTypeId )
{
pRefClass = pClass;
nConstId = nConstantId;
@@ -290,18 +315,21 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aTmpI, aDfltI;
- if( pInst ){
+ if( pInst )
+ {
aTmpI.pClass = pRefClass;
aTmpI.pData = pInst->pData;
}
- if( !bOwnClass && rDflt.IsInst() ){
+ if( !bOwnClass && rDflt.IsInst() )
+ {
bOwnClass = rDflt.pClass->InHierarchy( this );
- if( bOwnClass ){
+ if( bOwnClass )
+ {
aDfltI.pClass = pRefClass;
aDfltI.pData = rDflt.pData;
}
@@ -315,7 +343,7 @@ RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt,
bOwnClass, nConstId );
aTmpI.pClass = this;
- return( aTmpI );
+ return aTmpI;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 3058e01c4c20..41ff63a68401 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -27,7 +27,7 @@
#include <rscdb.hxx>
RscMgr::RscMgr( Atom nId, sal_uInt32 nTypeId, RscTop * pSuperCl )
- : RscClass( nId, nTypeId, pSuperCl )
+ : RscClass( nId, nTypeId, pSuperCl )
{
}
@@ -36,16 +36,19 @@ sal_uInt32 RscMgr::Size()
return RscClass::Size() + ALIGNED_SIZE( sizeof( RscMgrInst ) );
}
-RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
+RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
+{
RSCINST aInst;
RscMgrInst * pClassData;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
@@ -54,15 +57,17 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnCla
pClassData = (RscMgrInst *)(aInst.pData + RscClass::Size() );
pClassData->Create();
- if( bOwnClass ){
+ if( bOwnClass )
+ {
RscMgrInst * pDfltData = (RscMgrInst *)(rDflt.pData + RscClass::Size());
*pClassData = *pDfltData;
};
- return( aInst );
+ return aInst;
}
-void RscMgr::Destroy( const RSCINST & rInst ){
+void RscMgr::Destroy( const RSCINST & rInst )
+{
RscMgrInst * pClassData;
RscClass::Destroy( rInst );
@@ -76,35 +81,39 @@ void RscMgr::SetToDefault( const RSCINST & rInst )
RscMgrInst * pClassData;
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
- pClassData->bDflt = sal_True;
+ pClassData->bDflt = true;
RscClass::SetToDefault( rInst );
}
-sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){
+bool RscMgr::IsDefault( const RSCINST & rInst )
+{
RscMgrInst * pClassData;
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
if( !pClassData->bDflt )
- return( sal_False );
+ return false;
- return( RscClass::IsDefault( rInst ) );
+ return RscClass::IsDefault( rInst );
}
-sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+{
if( !RscClass::IsValueDefault( rInst, pDef ) )
- return sal_False;
+ return false;
- if( pDef ){
+ if( pDef )
+ {
RscMgrInst * pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
RscMgrInst * pDfltData = (RscMgrInst *)(pDef + RscClass::Size());
- if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() ){
- return sal_True;
+ if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() )
+ {
+ return true;
}
}
- return sal_False;
+ return false;
}
@@ -120,6 +129,7 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "%s %s",
pHS->getString( rInst.pClass->GetId() ).getStr(),
(rId.GetName()).getStr() );
+
if( pClassData->aRefId.IsId() )
fprintf( fOutput, ",%s", pClassData->aRefId.GetName().getStr() );
else
@@ -127,6 +137,7 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "\n" );
for( i = 0; i < nTab; i++ )
fputc( '\t', fOutput );
+
fprintf( fOutput, "{\n" );
rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab +1, pVarName );
@@ -135,18 +146,19 @@ void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
for( i = 0; i < nTab; i++ )
fputc( '\t', fOutput );
+
fprintf( fOutput, "}" );
}
}
void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
- const char * )
+ const char * )
{
}
ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
RscTypCont * pTC, const RscId &rId,
- sal_uInt32 nDeep, sal_Bool bExtra )
+ sal_uInt32 nDeep, bool bExtra )
{
RscMgrInst * pClassData;
ERRTYPE aError;
@@ -163,6 +175,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
else
pObjNode = rInst.pClass->GetRefClass()->
GetObjNode( pClassData->aRefId );
+
if( !pObjNode && pTC )
{
OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId()));
@@ -228,36 +241,37 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
};
};
- return( aError );
+ return aError;
}
ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
- return( ERR_OK );
+ return ERR_OK;
}
-sal_Bool RscMgr::IsConsistent( const RSCINST & rInst )
+bool RscMgr::IsConsistent( const RSCINST & rInst )
{
- sal_Bool bRet;
+ bool bRet;
RscMgrInst * pClassData;
bRet = RscClass::IsConsistent( rInst );
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
if( pClassData->aRefId.IsId() &&
- ((pClassData->aRefId.GetNumber() < 1)
- || (pClassData->aRefId.GetNumber() > 0x7FFF)
- || IsToDeep( rInst ).IsError()) )
+ ((pClassData->aRefId.GetNumber() < 1) ||
+ (pClassData->aRefId.GetNumber() > 0x7FFF) ||
+ IsToDeep( rInst ).IsError()) )
{
- bRet = sal_False;
+ bRet = false;
}
- return( bRet );
+ return bRet;
}
-ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ){
+ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId )
+{
RscMgrInst * pClassData;
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
@@ -287,7 +301,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
aTmpI.pData = pObjNode->GetRscObj();
nDeep++;
}
- else //aTmpI.IsInst() wird sal_False, Schleife beenden
+ else //aTmpI.IsInst() wird false, Schleife beenden
aTmpI.pData = NULL;
}
@@ -297,7 +311,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
aError = ERR_REFTODEEP;
}
- return( aError );
+ return aError;
}
ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
@@ -307,7 +321,8 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
ERRTYPE aError;
if( rRefId.IsId() &&
- ((rRefId.GetNumber() < 1) || (rRefId.GetNumber() > 0x7FFF)) )
+ ((rRefId.GetNumber() < 1) ||
+ (rRefId.GetNumber() > 0x7FFF)) )
{
aError = ERR_IDRANGE;
}
@@ -321,12 +336,12 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
aError = IsToDeep( rInst );
if( aError.IsOk() )
- pClassData->bDflt = sal_False;
+ pClassData->bDflt = false;
else
pClassData->aRefId = aOldId;
}
- return( aError );
+ return aError;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index fe06d341e2ae..031dc23d6963 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -25,7 +25,7 @@
#include <rscrange.hxx>
RscRange::RscRange( Atom nId, sal_uInt32 nTypeId )
- : RscTop( nId, nTypeId )
+ : RscTop( nId, nTypeId )
{
nMin = nMax = 0;
nSize = ALIGNED_SIZE( sizeof( RscRangeInst ) );
@@ -49,51 +49,52 @@ ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
nMin = nMinimum;
};
- return( ERR_OK );
+ return ERR_OK;
}
-sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
if( pDef )
{
if( ((RscRangeInst*)rInst.pData)->nValue ==
((RscRangeInst*)pDef)->nValue )
{
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
- return( ERR_RSCRANGE_OUTDEFSET );
+ return ERR_RSCRANGE_OUTDEFSET;
+
((RscRangeInst *)rInst.pData)->nValue = (sal_uInt16)( nValue - nMin );
- ((RscRangeInst *)rInst.pData)->bDflt = sal_False;
- return( ERR_OK );
+ ((RscRangeInst *)rInst.pData)->bDflt = false;
+ return ERR_OK;
}
ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
{
*pN = ((RscRangeInst *)rInst.pData)->nValue + nMin;
- return( ERR_OK );
+ return ERR_OK;
}
RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
if( !pInst )
{
aInst.pClass = this;
- aInst.pData = (CLASS_DATA)
- rtl_allocateMemory( sizeof( RscRangeInst ) );
+ aInst.pData = (CLASS_DATA)rtl_allocateMemory( sizeof( RscRangeInst ) );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
@@ -105,10 +106,11 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
((RscRangeInst *)aInst.pData)->nValue = (sal_uInt16)(0L - nMin);
else
((RscRangeInst *)aInst.pData)->nValue = 0;
- ((RscRangeInst *)aInst.pData)->bDflt = sal_True;
+
+ ((RscRangeInst *)aInst.pData)->bDflt = true;
}
- return( aInst );
+ return aInst;
}
void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -118,7 +120,7 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
if( nMin >= 0 )
{
@@ -133,11 +135,11 @@ ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
aMem.Put( n );
}
- return( ERR_OK );
+ return ERR_OK;
}
RscLongRange::RscLongRange( Atom nId, sal_uInt32 nTypeId )
- : RscTop( nId, nTypeId )
+ : RscTop( nId, nTypeId )
{
nMin = nMax = 0;
nSize = ALIGNED_SIZE( sizeof( RscLongRangeInst ) );
@@ -161,49 +163,50 @@ ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
nMin = nMinimum;
};
- return( ERR_OK );
+ return ERR_OK;
}
-sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
if( pDef )
return 0 == memcmp( &((RscLongRangeInst*)rInst.pData)->nValue,
&((RscLongRangeInst*)pDef)->nValue,
sizeof( sal_Int32 ) );
- return sal_False;
+ return false;
}
ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
return( ERR_RSCRANGE_OUTDEFSET );
+
void * pData = &((RscLongRangeInst*)rInst.pData)->nValue;
memcpy( pData, &nValue, sizeof( sal_Int32 ) );
- ((RscLongRangeInst *)rInst.pData)->bDflt = sal_False;
- return( ERR_OK );
+ ((RscLongRangeInst *)rInst.pData)->bDflt = false;
+ return ERR_OK;
}
ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
{
memmove( pN, &((RscLongRangeInst*)rInst.pData)->nValue,
sizeof( sal_Int32 ) );
- return( ERR_OK );
+ return ERR_OK;
}
RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
if( !pInst )
{
aInst.pClass = this;
- aInst.pData = (CLASS_DATA)
- rtl_allocateMemory( sizeof( RscLongRangeInst ) );
+ aInst.pData = (CLASS_DATA) rtl_allocateMemory( sizeof( RscLongRangeInst ) );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
@@ -216,16 +219,17 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
lDflt = 0;
else
lDflt = nMin;
+
void * pData = &((RscLongRangeInst*)aInst.pData)->nValue;
memcpy( pData, &lDflt, sizeof( sal_Int32 ) );
- ((RscLongRangeInst *)aInst.pData)->bDflt = sal_True;
+ ((RscLongRangeInst *)aInst.pData)->bDflt = true;
}
- return( aInst );
+ return aInst;
}
void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
- RscTypCont *, sal_uInt32, const char * )
+ RscTypCont *, sal_uInt32, const char * )
{
sal_Int32 lVal;
GetNumber( rInst, &lVal );
@@ -233,18 +237,18 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
sal_Int32 lVal;
GetNumber( rInst, &lVal );
aMem.Put( (sal_Int32)lVal );
- return( ERR_OK );
+ return ERR_OK;
}
RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId )
- : RscLongRange( nId, nTypeId )
+ : RscLongRange( nId, nTypeId )
{
}
@@ -255,7 +259,7 @@ ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/,
}
RscIdRange::RscIdRange( Atom nId, sal_uInt32 nTypeId )
- : RscTop( nId, nTypeId )
+ : RscTop( nId, nTypeId )
{
nSize = ALIGNED_SIZE( sizeof( RscId ) );
nMin = nMax = 0;
@@ -266,11 +270,13 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const
return RSCCLASS_NUMBER;
}
-RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
+RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass )
+{
RSCINST aInst;
RscId * pClassData;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA)rtl_allocateMemory( sizeof( RscId ) );
}
@@ -284,75 +290,86 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOw
pClassData = (RscId *)aInst.pData;
pClassData->Create();
+
if( bOwnClass )
*pClassData = *(RscId *)rDflt.pData;
- else{
- *pClassData = RscId();
+ else
+ {
+ *pClassData = RscId();
if( 0 >= nMin && 0 <= nMax )
*pClassData = RscId( (sal_Int32)0 );
else
*pClassData = RscId( nMin );
+
//cUnused wird fuer Defaultkennung verwendet
- ((RscId *)aInst.pData)->aExp.cUnused = sal_True;
+ ((RscId *)aInst.pData)->aExp.cUnused = true;
}
- return( aInst );
+ return aInst;
}
-void RscIdRange :: Destroy( const RSCINST & rInst ){
+void RscIdRange :: Destroy( const RSCINST & rInst )
+{
((RscId *)rInst.pData)->Destroy();
}
-sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
- if( pDef ){
- if( ((RscId*)rInst.pData)->aExp.IsNumber()
- && ((RscId*)pDef)->aExp.IsNumber() )
+bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+{
+ if( pDef )
+ {
+ if( ((RscId*)rInst.pData)->aExp.IsNumber() &&
+ ((RscId*)pDef)->aExp.IsNumber() )
{
if( ((RscId*)rInst.pData)->GetNumber() ==
- ((RscId*)pDef)->GetNumber() )
+ ((RscId*)pDef)->GetNumber() )
{
- return sal_True;
+ return true;
}
}
}
- return sal_False;
+ return false;
}
ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
- return( ERR_RSCRANGE_OUTDEFSET );
+ return ERR_RSCRANGE_OUTDEFSET;
*(RscId *)rInst.pData = RscId( nValue );
- ((RscId *)rInst.pData)->aExp.cUnused = sal_False;
- return( ERR_OK );
+ ((RscId *)rInst.pData)->aExp.cUnused = false;
+ return ERR_OK;
}
-ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){
+ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue )
+{
*plValue = ((RscId *)rInst.pData)->GetNumber();
- return( ERR_OK );
+ return ERR_OK;
}
-ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){
+ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId )
+{
ERRTYPE aError;
- if( rRscId.IsId() ){
+ if( rRscId.IsId() )
+ {
aError = SetNumber( rInst, rRscId );
- if( aError.IsOk() ){
+ if( aError.IsOk() )
+ {
*(RscId *)rInst.pData = rRscId;
- ((RscId *)rInst.pData)->aExp.cUnused = sal_False;
+ ((RscId *)rInst.pData)->aExp.cUnused = false;
}
}
else
aError = ERR_RSCRANGE_OUTDEFSET;
- return( aError );
+ return aError;
}
-ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId ){
+ERRTYPE RscIdRange::GetRef( const RSCINST & rInst, RscId * pRscId )
+{
*pRscId = *(RscId *)rInst.pData;
- return( ERR_OK );
+ return ERR_OK;
}
void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -362,27 +379,25 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, sal_Bool )
+ RscTypCont *, sal_uInt32, bool )
{
sal_Int32 lVal = ((RscId*)rInst.pData)->GetNumber();
aMem.Put( (sal_Int32)lVal );
- return( ERR_OK );
+ return ERR_OK;
}
-sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst )
+bool RscIdRange::IsConsistent( const RSCINST & rInst )
{
long nValue = ((RscId *)rInst.pData)->GetNumber();
- if( (nMax >= nValue) && (nMin <= nValue) )
- return sal_True;
- else {
- return sal_False;
- }
+
+ return (nMax >= nValue) && (nMin <= nValue);
+
}
RscBool::RscBool( Atom nId, sal_uInt32 nTypeId )
- : RscRange( nId, nTypeId )
+ : RscRange( nId, nTypeId )
{
RscRange::SetRange( 0, 1 );
}
@@ -405,20 +420,21 @@ void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId )
- : RscRange( nId, nTypeId )
+ : RscRange( nId, nTypeId )
{
nOutRange = 0xFFFFFFFF;
}
-ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){
+ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
+{
if( nValue == nOutRange )
- return( ERR_RSCRANGE_OUTDEFSET );
+ return ERR_RSCRANGE_OUTDEFSET;
else
- return( RscRange::SetNumber( rInst, nValue ) );
+ return RscRange::SetNumber( rInst, nValue );
}
RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
sal_Int32 l;
@@ -429,7 +445,7 @@ RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt,
if( l == nOutRange )
((RscRangeInst *)aInst.pData)->nValue++;
- return( aInst );
+ return aInst;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index 79cf3605b502..e4aacca22b48 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.cxx
@@ -29,7 +29,7 @@
#include <rtl/textenc.h>
RscString::RscString( Atom nId, sal_uInt32 nTypeId )
- : RscTop( nId, nTypeId )
+ : RscTop( nId, nTypeId )
{
nSize = ALIGNED_SIZE( sizeof( RscStringInst ) );
pRefClass = NULL;
@@ -40,20 +40,24 @@ RSCCLASS_TYPE RscString::GetClassType() const
return RSCCLASS_STRING;
}
-ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
+ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr )
+{
char * pTmp;
ERRTYPE aError;
- if( aError.IsOk() ){
- ((RscStringInst *)rInst.pData)->bDflt = sal_False;
+ if( aError.IsOk() )
+ {
+ ((RscStringInst *)rInst.pData)->bDflt = false;
pTmp = ((RscStringInst *)rInst.pData)->pStr;
- if( pTmp ){
+ if( pTmp )
+ {
rtl_freeMemory( pTmp );
pTmp = NULL;
}
- if( pStr ){
+ if( pStr )
+ {
sal_uInt32 nLen = strlen( pStr ) +1;
pTmp = (char *)rtl_allocateMemory( nLen );
memcpy( pTmp, pStr, nLen );
@@ -62,23 +66,27 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
((RscStringInst *)rInst.pData)->pStr = pTmp;
}
- return( aError );
+ return aError;
}
-ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ){
+ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr )
+{
*ppStr = ((RscStringInst *)rInst.pData)->pStr;
- return( ERR_OK );
+ return ERR_OK;
}
-ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){
+ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId )
+{
*pRscId = ((RscStringInst *)rInst.pData)->aRefId;
- return( ERR_OK );
+ return ERR_OK;
}
-ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
- if( pRefClass ){
+ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId )
+{
+ if( pRefClass )
+ {
((RscStringInst *)rInst.pData)->aRefId = rRefId;
- ((RscStringInst *)rInst.pData)->bDflt = sal_False;
+ ((RscStringInst *)rInst.pData)->bDflt = false;
}
else
return( ERR_REFNOTALLOWED );
@@ -87,82 +95,92 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
}
RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
- sal_Bool bOwnClass )
+ bool bOwnClass )
{
RSCINST aInst;
- if( !pInst ){
+ if( !pInst )
+ {
aInst.pClass = this;
aInst.pData = (CLASS_DATA)
rtl_allocateMemory( sizeof( RscStringInst ) );
}
else
aInst = *pInst;
+
if( !bOwnClass && rDflt.IsInst() )
bOwnClass = rDflt.pClass->InHierarchy( this );
((RscStringInst *)aInst.pData)->aRefId.Create();
((RscStringInst *)aInst.pData)->pStr = NULL;
- ((RscStringInst *)aInst.pData)->bDflt = sal_True;
+ ((RscStringInst *)aInst.pData)->bDflt = true;
- if( bOwnClass ){
+ if( bOwnClass )
+ {
((RscStringInst *)aInst.pData)->aRefId =
- ((RscStringInst *)rDflt.pData)->aRefId;
+ ((RscStringInst *)rDflt.pData)->aRefId;
SetString( aInst, ((RscStringInst *)rDflt.pData)->pStr );
((RscStringInst *)aInst.pData)->bDflt =
- ((RscStringInst *)rDflt.pData)->bDflt ;
+ ((RscStringInst *)rDflt.pData)->bDflt ;
}
- return( aInst );
+ return aInst;
}
-void RscString::Destroy( const RSCINST & rInst ){
+void RscString::Destroy( const RSCINST & rInst )
+{
if( ((RscStringInst *)rInst.pData)->pStr )
rtl_freeMemory( ((RscStringInst *)rInst.pData)->pStr );
((RscStringInst *)rInst.pData)->aRefId.Destroy();
}
-sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+{
RscStringInst * pData = (RscStringInst*)rInst.pData;
RscStringInst * pDefData = (RscStringInst*)pDef;
- if( pDef ){
+ if( pDef )
+ {
if( pData->aRefId.IsId() || pDefData->aRefId.IsId() )
{
- if( pData->aRefId.aExp.IsNumber()
- && pDefData->aRefId.aExp.IsNumber() )
+ if( pData->aRefId.aExp.IsNumber() &&
+ pDefData->aRefId.aExp.IsNumber() )
{
// Sind die Referenzidentifier gleich
if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() )
{
- return sal_True;
+ return true;
}
}
}
- else {
- sal_Bool bStrEmpty = sal_False;
- sal_Bool bDefStrEmpty = sal_False;
+ else
+ {
+ bool bStrEmpty = false;
+ bool bDefStrEmpty = false;
- if( pData->pStr ){
+ if( pData->pStr )
+ {
bStrEmpty = ('\0' == *pData->pStr);
}
else
- bStrEmpty = sal_True;
+ bStrEmpty = true;
- if( pDefData->pStr ){
+ if( pDefData->pStr )
+ {
bDefStrEmpty = ('\0' == *pDefData->pStr);
}
else
- bDefStrEmpty = sal_True;
+ bDefStrEmpty = true;
- if( !bStrEmpty || !bDefStrEmpty ){
- return sal_False;
+ if( !bStrEmpty || !bDefStrEmpty )
+ {
+ return false;
}
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
@@ -181,11 +199,12 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
sal_uInt32 n = 0;
sal_uInt32 nPos, nSlashPos;
- do {
+ do
+ {
fputc( '\"', fOutput );
nSlashPos = nPos = 0;
- while( pStrI->pStr[ n ]
- && (nPos < 72 || nPos - nSlashPos <= 3) )
+
+ while( pStrI->pStr[ n ] && (nPos < 72 || nPos - nSlashPos <= 3) )
{ // nach \ mindesten 3 Zeichen wegeb \xa7
fputc( pStrI->pStr[ n ], fOutput );
if( pStrI->pStr[ n ] == '\\' )
@@ -196,8 +215,11 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
fputc( '\"', fOutput );
if( pStrI->pStr[ n ] ) //nocht nicht zu ende
+ {
fputc( '\n', fOutput );
- } while( pStrI->pStr[ n ] );
+ }
+ }
+ while( pStrI->pStr[ n ] );
}
else
fprintf( fOutput, "\"\"" );
@@ -205,19 +227,21 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
}
ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
ERRTYPE aError;
ObjNode * pObjNode = NULL;
- if( ((RscStringInst *)rInst.pData)->aRefId.IsId() ){
+ if( ((RscStringInst *)rInst.pData)->aRefId.IsId() )
+ {
RscId aId( ((RscStringInst *)rInst.pData)->aRefId );
RSCINST aTmpI;
aTmpI.pClass = pRefClass;
- while( aError.IsOk() && aId.IsId() ){
+ while( aError.IsOk() && aId.IsId() )
+ {
//Erhoehen und abfragen um Endlosrekusion zu vermeiden
nDeep++;
if( nDeep > nRefDeep )
@@ -269,7 +293,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
rMem.PutUTF8( ((RscStringInst *)rInst.pData)->pStr );
};
};
- return( aError );
+ return aError;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index e8ac3fc8b5df..7c4d80cda8d7 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -50,15 +50,18 @@ RSCINST RscTop::GetDefault()
return aDfltInst;
}
-void RscTop :: Pre_dtor(){
- if( aDfltInst.IsInst() ){
+void RscTop :: Pre_dtor()
+{
+ if( aDfltInst.IsInst() )
+ {
aDfltInst.pClass->Destroy( aDfltInst );
rtl_freeMemory( aDfltInst.pData );
aDfltInst = RSCINST();
};
}
-Atom RscTop :: GetConstant( sal_uInt32 ){
+Atom RscTop :: GetConstant( sal_uInt32 )
+{
return InvalidAtom;
}
@@ -78,19 +81,21 @@ sal_uInt32 RscTop :: Size()
return 0;
}
-ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){
+ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId )
+{
if( pSuperClass )
return pSuperClass->GetRef( rInst, pRscId );
else
return ERR_UNKNOWN_METHOD;
}
-sal_Bool RscTop::InHierarchy( RscTop * pClass ){
+bool RscTop::InHierarchy( RscTop * pClass )
+{
if( this == pClass )
- return( sal_True );
+ return true;
if( pSuperClass )
- return( pSuperClass->InHierarchy( pClass ) );
- return( sal_False );
+ return pSuperClass->InHierarchy( pClass );
+ return false;
}
ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
@@ -98,9 +103,8 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
Atom nDataBaseName )
{
if( pSuperClass )
- return pSuperClass->
- SetVariable( nVarName, pClass, pDflt,
- nVarType, nMask, nDataBaseName );
+ return pSuperClass->SetVariable( nVarName, pClass, pDflt,
+ nVarType, nMask, nDataBaseName );
else
return ERR_UNKNOWN_METHOD;
}
@@ -111,18 +115,14 @@ void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc )
pSuperClass->EnumVariables( pData, pProc );
}
-RSCINST RscTop::GetVariable
-(
- const RSCINST & rInst,
- Atom nVarName,
- const RSCINST & rInitInst,
- sal_Bool bInitDflt,
- RscTop * pCreateClass
-)
+RSCINST RscTop::GetVariable( const RSCINST & rInst,
+ Atom nVarName,
+ const RSCINST & rInitInst,
+ bool bInitDflt,
+ RscTop * pCreateClass)
{
if( pSuperClass )
- return pSuperClass->
- GetVariable( rInst, nVarName, rInitInst, bInitDflt, pCreateClass );
+ return pSuperClass->GetVariable( rInst, nVarName, rInitInst, bInitDflt, pCreateClass );
else
return RSCINST();
}
@@ -130,8 +130,7 @@ RSCINST RscTop::GetVariable
RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName )
{
if( pSuperClass )
- return pSuperClass->
- GetCopyVar( rInst, nVarName );
+ return pSuperClass->GetCopyVar( rInst, nVarName );
else
return RSCINST();
}
@@ -150,21 +149,17 @@ ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName,
RSCINST * pGetInst )
{
if( pSuperClass )
- return pSuperClass->
- GetElement( rInst, rEleName,
- pCreateClass, rCreateInst,
- pGetInst );
+ return pSuperClass-> GetElement( rInst, rEleName,
+ pCreateClass, rCreateInst,
+ pGetInst );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetArrayEle
-(
- const RSCINST & rInst,
- Atom nId,
- RscTop * pCreateClass,
- RSCINST * pGetInst
-)
+ERRTYPE RscTop::GetArrayEle( const RSCINST & rInst,
+ Atom nId,
+ RscTop * pCreateClass,
+ RSCINST * pGetInst)
{
if( pSuperClass )
return pSuperClass->GetArrayEle( rInst, nId, pCreateClass, pGetInst );
@@ -172,13 +167,10 @@ ERRTYPE RscTop::GetArrayEle
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetValueEle
-(
- const RSCINST & rInst,
- sal_Int32 lValue,
- RscTop * pCreateClass,
- RSCINST * pGetInst
-)
+ERRTYPE RscTop::GetValueEle( const RSCINST & rInst,
+ sal_Int32 lValue,
+ RscTop * pCreateClass,
+ RSCINST * pGetInst)
{
if( pSuperClass )
return pSuperClass->GetValueEle( rInst, lValue, pCreateClass, pGetInst );
@@ -187,29 +179,27 @@ ERRTYPE RscTop::GetValueEle
}
RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName,
- RscTop * pClass )
+ RscTop * pClass )
{
if( pSuperClass )
- return pSuperClass->
- SearchEle( rInst, rEleName, pClass );
+ return pSuperClass->SearchEle( rInst, rEleName, pClass );
else
return RSCINST();
}
-RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ){
+RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos )
+{
if( pSuperClass )
- return pSuperClass->
- GetPosEle( rInst, nPos );
+ return pSuperClass->GetPosEle( rInst, nPos );
else
return RSCINST();
}
ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos,
- sal_uInt32 nSourcePos )
+ sal_uInt32 nSourcePos )
{
if( pSuperClass )
- return pSuperClass->
- MovePosEle( rInst, nDestPos, nSourcePos );
+ return pSuperClass->MovePosEle( rInst, nDestPos, nSourcePos );
else
return ERR_UNKNOWN_METHOD;
}
@@ -218,39 +208,39 @@ ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos,
const RscId & rRscId )
{
if( pSuperClass )
- return pSuperClass->
- SetPosRscId( rInst, nPos, rRscId );
+ return pSuperClass->SetPosRscId( rInst, nPos, rRscId );
else
return ERR_UNKNOWN_METHOD;
}
-SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ){
+SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos )
+{
if( pSuperClass )
- return pSuperClass->
- GetInfoEle( rInst, nPos );
+ return pSuperClass->GetInfoEle( rInst, nPos );
else
return SUBINFO_STRUCT();
}
-sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){
+sal_uInt32 RscTop::GetCount( const RSCINST & rInst )
+{
if( pSuperClass )
return pSuperClass->GetCount( rInst );
else
return 0;
}
-ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
+ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
+{
if( pSuperClass )
- return pSuperClass->
- SetNumber( rInst, lValue );
+ return pSuperClass->SetNumber( rInst, lValue );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){
+ERRTYPE RscTop::SetBool( const RSCINST & rInst, bool bValue )
+{
if( pSuperClass )
- return pSuperClass->
- SetBool( rInst, bValue );
+ return pSuperClass->SetBool( rInst, bValue );
else
return ERR_UNKNOWN_METHOD;
}
@@ -263,77 +253,78 @@ ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal )
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ){
+ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId )
+{
if( pSuperClass )
- return pSuperClass->
- SetNotConst( rInst, nId );
+ return pSuperClass->SetNotConst( rInst, nId );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){
+ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr )
+{
if( pSuperClass )
- return pSuperClass->
- SetString( rInst, pStr );
+ return pSuperClass->SetString( rInst, pStr );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){
+ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
+{
if( pSuperClass )
- return pSuperClass->
- GetNumber( rInst, pN );
+ return pSuperClass->GetNumber( rInst, pN );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){
- if( pSuperClass )
- return pSuperClass->
- GetBool( rInst, pB );
+ERRTYPE RscTop::GetBool( const RSCINST & rInst, bool * pB )
+{
+ if( pSuperClass )
+ return pSuperClass->GetBool( rInst, pB );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ){
+ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH )
+{
if( pSuperClass )
- return pSuperClass->
- GetConst( rInst, pH );
+ return pSuperClass->GetConst( rInst, pH );
else
return ERR_UNKNOWN_METHOD;
}
-ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){
+ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr )
+{
if( pSuperClass )
- return pSuperClass->
- GetString( rInst, ppStr );
+ return pSuperClass->GetString( rInst, ppStr );
else
return ERR_UNKNOWN_METHOD;
}
-RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwnRange )
+RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, bool bOwnRange )
{
if( pSuperClass )
- return pSuperClass->
- Create( pInst, rDefInst, bOwnRange );
- else{
+ return pSuperClass->Create( pInst, rDefInst, bOwnRange );
+ else
+ {
if( pInst )
return *pInst;
return RSCINST();
}
}
-void RscTop::Destroy( const RSCINST & rInst ){
+void RscTop::Destroy( const RSCINST & rInst )
+{
if( pSuperClass )
pSuperClass->Destroy( rInst );
}
-sal_Bool RscTop::IsConsistent( const RSCINST & rInst )
+bool RscTop::IsConsistent( const RSCINST & rInst )
{
if( pSuperClass )
return pSuperClass->IsConsistent( rInst );
else
- return sal_True;
+ return true;
}
void RscTop::SetToDefault( const RSCINST & rInst )
@@ -342,35 +333,38 @@ void RscTop::SetToDefault( const RSCINST & rInst )
pSuperClass->SetToDefault( rInst );
}
-sal_Bool RscTop::IsDefault( const RSCINST & rInst ){
+bool RscTop::IsDefault( const RSCINST & rInst )
+{
if( pSuperClass )
return pSuperClass->IsDefault( rInst );
else
- return sal_True;
+ return true;
}
-sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+{
if( pSuperClass )
return pSuperClass->IsValueDefault( rInst, pDef );
else
- return sal_True;
+ return true;
}
-void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ){
+void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId )
+{
if( pSuperClass )
pSuperClass->SetDefault( rInst, nVarId );
}
-RSCINST RscTop::GetDefault( Atom nVarId ){
+RSCINST RscTop::GetDefault( Atom nVarId )
+{
if( pSuperClass )
- return pSuperClass->
- GetDefault( nVarId );
+ return pSuperClass->GetDefault( nVarId );
else
return RSCINST();
}
void RscTop::Delete( const RSCINST & rInst, RscTop * pClass,
- const RscId & rId )
+ const RscId & rId )
{
if( pSuperClass )
pSuperClass->Delete( rInst, pClass, rId );
@@ -382,7 +376,8 @@ void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos )
pSuperClass->DeletePos( rInst, nPos );
}
-ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ){
+ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId )
+{
if( pSuperClass )
return pSuperClass->SetRef( rInst, rRefId );
else
@@ -408,23 +403,21 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
RscTypCont * pTC, const RscId & rId,
- sal_uInt32 nDeep, sal_Bool bExtra )
+ sal_uInt32 nDeep, bool bExtra )
{
if( pSuperClass )
- return( pSuperClass->
- WriteRcHeader( rInst, rMem, pTC, rId, nDeep, bExtra ) );
+ return pSuperClass->WriteRcHeader( rInst, rMem, pTC, rId, nDeep, bExtra );
else
- return( rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra ) );
+ return rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra );
}
ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, bool bExtra )
{
if( pSuperClass )
- return( pSuperClass->
- WriteRc( rInst, rMem, pTC, nDeep, bExtra ) );
+ return pSuperClass->WriteRc( rInst, rMem, pTC, nDeep, bExtra );
else
- return( ERR_OK );
+ return ERR_OK;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */