summaryrefslogtreecommitdiff
path: root/sc/source/filter/lotus/lotform.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/lotus/lotform.cxx')
-rw-r--r--sc/source/filter/lotus/lotform.cxx84
1 files changed, 42 insertions, 42 deletions
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index e39891568e33..ecb7eece8b2d 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -45,21 +45,21 @@
extern WKTYP eTyp;
-static const sal_Char* GetAddInName( const UINT8 nIndex );
+static const sal_Char* GetAddInName( const sal_uInt8 nIndex );
static DefTokenId lcl_KnownAddIn( const ByteString& sTest );
-//extern double decipher_Number123( UINT32 nValue );
+//extern double decipher_Number123( sal_uInt32 nValue );
-void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
+void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtString )
{
TokenId eParam[ 256 ];
- INT32 nLauf;
+ sal_Int32 nLauf;
TokenId nMerk0, nMerk1;
- BOOL bAddIn = FALSE;
- BOOL bNeg = FALSE;
+ sal_Bool bAddIn = sal_False;
+ sal_Bool bNeg = sal_False;
DBG_ASSERT( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" );
@@ -88,7 +88,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
if( eOc == ocNoName )
{
- bAddIn = TRUE;
+ bAddIn = sal_True;
nMerk0 = aPool.Store( eOc, String( t, eSrcChar ) );
aPool << nMerk0;
@@ -165,10 +165,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
if( nAnz > 0 )
{
- INT16 nNull = -1; // gibt einen auszulassenden Parameter an
+ sal_Int16 nNull = -1; // gibt einen auszulassenden Parameter an
// ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste
- INT16 nLast = nAnz - 1;
+ sal_Int16 nLast = nAnz - 1;
if( eOc == ocRMZ )
{ // Extrawurst ocRMZ letzter Parameter negiert!
@@ -222,12 +222,12 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
}
-void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD )
+void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD )
{
// Col-Bemachung
if( nCol & 0x8000 )
{
- rSRD.SetColRel( TRUE );
+ rSRD.SetColRel( sal_True );
if( nCol & 0x0080 )
nCol |= 0xFF00;
else
@@ -237,14 +237,14 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
}
else
{
- rSRD.SetColRel( FALSE );
+ rSRD.SetColRel( sal_False );
rSRD.nCol = static_cast< SCsCOL >( nCol & 0x00FF );
}
// Row-Bemachung
if( nRow & 0x8000 )
{
- rSRD.SetRowRel( TRUE );
+ rSRD.SetRowRel( sal_True );
// vorzeichenrichtige Erweiterung
switch( eTyp )
{
@@ -271,7 +271,7 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
}
else
{
- rSRD.SetRowRel( FALSE );
+ rSRD.SetRowRel( sal_False );
switch( eTyp )
{
// 5432 1098 7654 3210
@@ -301,16 +301,16 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
}
-void LotusToSc::ReadSRD( ScSingleRefData& rSRD, BYTE nRelBit )
+void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit )
{
- BYTE nTab, nCol;
- UINT16 nRow;
+ sal_uInt8 nTab, nCol;
+ sal_uInt16 nRow;
Read( nRow );
Read( nTab );
Read( nCol );
- BOOL b3D = ( static_cast< SCTAB >( nTab ) != aEingPos.Tab() );
+ sal_Bool b3D = ( static_cast< SCTAB >( nTab ) != aEingPos.Tab() );
rSRD.SetColRel( ( nRelBit & 0x01 ) != 0 );
rSRD.nCol = static_cast< SCsCOL >( nCol );
@@ -364,27 +364,27 @@ void LotusToSc::Reset( const ScAddress& rEingPos )
}
-LotusToSc::LotusToSc( SvStream &rStream, CharSet e, BOOL b ) :
+LotusToSc::LotusToSc( SvStream &rStream, CharSet e, sal_Bool b ) :
LotusConverterBase( rStream, 128 )
{
eSrcChar = e;
- bWK3 = FALSE;
+ bWK3 = sal_False;
bWK123 = b;
}
-typedef FUNC_TYPE ( FuncType1 ) ( BYTE );
-typedef DefTokenId ( FuncType2 ) ( BYTE );
+typedef FUNC_TYPE ( FuncType1 ) ( sal_uInt8 );
+typedef DefTokenId ( FuncType2 ) ( sal_uInt8 );
-ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
+ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
const FORMULA_TYPE /*eFT*/ )
{
- BYTE nOc;
- BYTE nAnz;
- BYTE nRelBits;
- UINT16 nStrLen;
- UINT16 nRngIndex;
+ sal_uInt8 nOc;
+ sal_uInt8 nAnz;
+ sal_uInt8 nRelBits;
+ sal_uInt16 nStrLen;
+ sal_uInt16 nRngIndex;
FUNC_TYPE eType = FT_NOP;
TokenId nMerk0;
DefTokenId eOc;
@@ -418,10 +418,10 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
pIndexToType = IndexToType;
pIndexToToken = IndexToToken;
- rR.SetTabRel( TRUE );
+ rR.SetTabRel( sal_True );
rR.nTab = aEingPos.Tab();
rR.nRelTab = 0;
- rR.SetFlag3D( FALSE );
+ rR.SetFlag3D( sal_False );
}
aCRD.Ref2 = rR;
@@ -479,7 +479,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_Variable:
{
- UINT16 nCol, nRow;
+ sal_uInt16 nCol, nRow;
Read( nCol );
Read( nRow );
@@ -495,7 +495,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
// kein Range dazu
nNewId = aPool.Store( rR );
else
- nNewId = aPool.Store( ( UINT16 ) nId );
+ nNewId = aPool.Store( ( sal_uInt16 ) nId );
}
aStack << nNewId;
@@ -503,7 +503,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_Range:
{
- UINT16 nColS, nRowS, nColE, nRowE;
+ sal_uInt16 nColS, nRowS, nColE, nRowE;
Read( nColS );
Read( nRowS );
Read( nColE );
@@ -523,7 +523,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
// kein Range dazu
nNewId = aPool.Store( aCRD );
else
- nNewId = aPool.Store( ( UINT16 ) nId );
+ nNewId = aPool.Store( ( sal_uInt16 ) nId );
}
aStack << nNewId;
@@ -535,7 +535,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_ConstInt:
{
- INT16 nVal;
+ sal_Int16 nVal;
Read( nVal );
aStack << aPool.Store( ( double ) nVal );
}
@@ -633,7 +633,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
case FT_Snum:
if ( bWK123 )
{
- UINT32 nValue;
+ sal_uInt32 nValue;
Read( nValue );
double fValue = Snum32ToDouble( nValue );
@@ -641,7 +641,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
}
else
{
- INT16 nVal;
+ sal_Int16 nVal;
Read( nVal );
aStack << aPool.Store( SnumToDouble( nVal ) );
}
@@ -665,7 +665,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
}
-FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
+FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
{
static const FUNC_TYPE pType[ 256 ] =
{ // Code Bezeichnung
@@ -930,7 +930,7 @@ FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
}
-DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
+DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
{
static const DefTokenId pToken[ 256 ] =
{ // Code Bezeichnung
@@ -1196,7 +1196,7 @@ DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
}
-FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
+FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
{
static const FUNC_TYPE pType[ 256 ] =
{ // Code Bezeichnung
@@ -1461,7 +1461,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
}
-DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
+DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
{
static const DefTokenId pToken[ 256 ] =
{ // Code Bezeichnung
@@ -1729,7 +1729,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
-const sal_Char* GetAddInName( const UINT8 n )
+const sal_Char* GetAddInName( const sal_uInt8 n )
{
static const sal_Char* pNames[ 256 ] =
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 08:20:02 +0000