mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sligh mis-merge, and favor bool over sal_Bool for internal stuff

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-03-12 20:59:25 -06:00
parent e350588a2d
commit 824daba411
4 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
formula/inc/formula/token.hxx
View File

@@ -110,8 +110,8 @@ public:
inline void Delete() { delete this; } inline void Delete() { delete this; }
inline StackVar GetType() const { return eType; } inline StackVar GetType() const { return eType; }
sal_Bool IsFunction() const; // pure functions, no operators bool IsFunction() const; // pure functions, no operators
sal_Bool IsMatrixFunction() const; // if a function _always_ returns a Matrix bool IsMatrixFunction() const; // if a function _always_ returns a Matrix
bool IsExternalRef() const; bool IsExternalRef() const;
sal_uInt8 GetParamCount() const; sal_uInt8 GetParamCount() const;
inline void IncRef() const { nRefCnt++; } inline void IncRef() const { nRefCnt++; }
@@ -155,9 +155,9 @@ public:
virtual FormulaToken* Clone() const { return new FormulaToken(*this); } virtual FormulaToken* Clone() const { return new FormulaToken(*this); }
virtual sal_Bool Is3DRef() const; // reference with 3D flag set virtual bool Is3DRef() const; // reference with 3D flag set
virtual sal_Bool TextEqual( const formula::FormulaToken& rToken ) const; virtual bool TextEqual( const formula::FormulaToken& rToken ) const;
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
virtual bool isFunction() const virtual bool isFunction() const
{ {
@@ -217,7 +217,7 @@ public:
virtual void SetByte( sal_uInt8 n ); virtual void SetByte( sal_uInt8 n );
virtual bool HasForceArray() const; virtual bool HasForceArray() const;
virtual void SetForceArray( bool b ); virtual void SetForceArray( bool b );
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
}; };
@@ -238,7 +238,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaFAPToken(*this); } virtual FormulaToken* Clone() const { return new FormulaFAPToken(*this); }
virtual FormulaToken* GetFAPOrigToken() const; virtual FormulaToken* GetFAPOrigToken() const;
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken
@@ -254,7 +254,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaDoubleToken(*this); } virtual FormulaToken* Clone() const { return new FormulaDoubleToken(*this); }
virtual double GetDouble() const; virtual double GetDouble() const;
virtual double& GetDoubleAsReference(); virtual double& GetDoubleAsReference();
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
}; };
@@ -272,7 +272,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaStringToken(*this); } virtual FormulaToken* Clone() const { return new FormulaStringToken(*this); }
virtual const String& GetString() const; virtual const String& GetString() const;
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
}; };
@@ -292,7 +292,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaStringOpToken(*this); } virtual FormulaToken* Clone() const { return new FormulaStringOpToken(*this); }
virtual const String& GetString() const; virtual const String& GetString() const;
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
@@ -308,7 +308,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); } virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); }
virtual sal_uInt16 GetIndex() const; virtual sal_uInt16 GetIndex() const;
virtual void SetIndex( sal_uInt16 n ); virtual void SetIndex( sal_uInt16 n );
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
@@ -332,7 +332,7 @@ public:
virtual const String& GetExternal() const; virtual const String& GetExternal() const;
virtual sal_uInt8 GetByte() const; virtual sal_uInt8 GetByte() const;
virtual void SetByte( sal_uInt8 n ); virtual void SetByte( sal_uInt8 n );
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
@@ -347,7 +347,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaMissingToken(*this); } virtual FormulaToken* Clone() const { return new FormulaMissingToken(*this); }
virtual double GetDouble() const; virtual double GetDouble() const;
virtual const String& GetString() const; virtual const String& GetString() const;
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken
@@ -369,7 +369,7 @@ public:
} }
virtual ~FormulaJumpToken(); virtual ~FormulaJumpToken();
virtual short* GetJump() const; virtual short* GetJump() const;
virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const; virtual bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new FormulaJumpToken(*this); } virtual FormulaToken* Clone() const { return new FormulaJumpToken(*this); }
}; };
@@ -383,7 +383,7 @@ public:
FormulaToken( r ) {} FormulaToken( r ) {}
virtual FormulaToken* Clone() const { return new FormulaUnknownToken(*this); } virtual FormulaToken* Clone() const { return new FormulaUnknownToken(*this); }
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
@@ -399,7 +399,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaErrorToken(*this); } virtual FormulaToken* Clone() const { return new FormulaErrorToken(*this); }
virtual sal_uInt16 GetError() const; virtual sal_uInt16 GetError() const;
virtual void SetError( sal_uInt16 nErr ); virtual void SetError( sal_uInt16 nErr );
virtual sal_Bool operator==( const FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const;
}; };
// ============================================================================= // =============================================================================

26
formula/inc/formula/tokenarray.hxx
View File

@@ -81,7 +81,7 @@ protected:
sal_uInt16 nError; // Error code sal_uInt16 nError; // Error code
short nRefs; // Count of cell references short nRefs; // Count of cell references
ScRecalcMode nMode; // Flags to indicate when to recalc this code ScRecalcMode nMode; // Flags to indicate when to recalc this code
sal_Bool bHyperLink; // If HYPERLINK() occurs in the formula. bool bHyperLink; // If HYPERLINK() occurs in the formula.
protected: protected:
void Assign( const FormulaTokenArray& ); void Assign( const FormulaTokenArray& );
@@ -128,10 +128,10 @@ public:
FormulaToken* PrevRPN(); FormulaToken* PrevRPN();
bool HasExternalRef() const; bool HasExternalRef() const;
sal_Bool HasOpCode( OpCode ) const; bool HasOpCode( OpCode ) const;
sal_Bool HasOpCodeRPN( OpCode ) const; bool HasOpCodeRPN( OpCode ) const;
/// Token of type svIndex or opcode ocColRowName /// Token of type svIndex or opcode ocColRowName
sal_Bool HasNameOrColRowName() const; bool HasNameOrColRowName() const;
FormulaToken** GetArray() const { return pCode; } FormulaToken** GetArray() const { return pCode; }
FormulaToken** GetCode() const { return pRPN; } FormulaToken** GetCode() const { return pRPN; }
@@ -142,8 +142,8 @@ public:
void SetCodeError( sal_uInt16 n ) { nError = n; } void SetCodeError( sal_uInt16 n ) { nError = n; }
short GetRefs() const { return nRefs; } short GetRefs() const { return nRefs; }
void IncrementRefs() { ++nRefs; } void IncrementRefs() { ++nRefs; }
void SetHyperLink( sal_Bool bVal ) { bHyperLink = bVal; } void SetHyperLink( bool bVal ) { bHyperLink = bVal; }
sal_Bool IsHyperLink() const { return bHyperLink; } bool IsHyperLink() const { return bHyperLink; }
inline ScRecalcMode GetRecalcMode() const { return nMode; } inline ScRecalcMode GetRecalcMode() const { return nMode; }
/** Bits aren't set directly but validated and /** Bits aren't set directly but validated and
@@ -168,17 +168,17 @@ public:
{ nMode |= RECALCMODE_ONREFMOVE; } { nMode |= RECALCMODE_ONREFMOVE; }
inline void ClearRecalcModeOnRefMove() inline void ClearRecalcModeOnRefMove()
{ nMode &= ~RECALCMODE_ONREFMOVE; } { nMode &= ~RECALCMODE_ONREFMOVE; }
inline sal_Bool IsRecalcModeNormal() const inline bool IsRecalcModeNormal() const
{ return (nMode & RECALCMODE_NORMAL) != 0; } { return (nMode & RECALCMODE_NORMAL) != 0; }
inline sal_Bool IsRecalcModeAlways() const inline bool IsRecalcModeAlways() const
{ return (nMode & RECALCMODE_ALWAYS) != 0; } { return (nMode & RECALCMODE_ALWAYS) != 0; }
inline sal_Bool IsRecalcModeOnLoad() const inline bool IsRecalcModeOnLoad() const
{ return (nMode & RECALCMODE_ONLOAD) != 0; } { return (nMode & RECALCMODE_ONLOAD) != 0; }
inline sal_Bool IsRecalcModeOnLoadOnce() const inline bool IsRecalcModeOnLoadOnce() const
{ return (nMode & RECALCMODE_ONLOAD_ONCE) != 0; } { return (nMode & RECALCMODE_ONLOAD_ONCE) != 0; }
inline sal_Bool IsRecalcModeForced() const inline bool IsRecalcModeForced() const
{ return (nMode & RECALCMODE_FORCED) != 0; } { return (nMode & RECALCMODE_FORCED) != 0; }
inline sal_Bool IsRecalcModeOnRefMove() const inline bool IsRecalcModeOnRefMove() const
{ return (nMode & RECALCMODE_ONREFMOVE) != 0; } { return (nMode & RECALCMODE_ONREFMOVE) != 0; }
/** Get OpCode of the most outer function */ /** Get OpCode of the most outer function */
@@ -186,7 +186,7 @@ public:
/** Operators +,-,*,/,^,&,=,<>,<,>,<=,>= /** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
with DoubleRef in Formula? */ with DoubleRef in Formula? */
sal_Bool HasMatrixDoubleRefOps(); bool HasMatrixDoubleRefOps();
virtual FormulaToken* AddOpCode(OpCode e); virtual FormulaToken* AddOpCode(OpCode e);

4
formula/source/core/api/FormulaCompiler.cxx
View File

@@ -810,8 +810,8 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r )
delete mpHashMap; delete mpHashMap;
mpHashMap = new OpCodeHashMap(mnSymbols); mpHashMap = new OpCodeHashMap(mnSymbols);
USHORT n = r.getSymbolCount(); sal_uInt16 n = r.getSymbolCount();
for (USHORT i = 0; i < n; ++i) for (sal_uInt16 i = 0; i < n; ++i)
{ {
OpCode eOp = OpCode(i); OpCode eOp = OpCode(i);
const String& rSymbol = r.getSymbol(eOp); const String& rSymbol = r.getSymbol(eOp);

39
formula/source/core/api/token.cxx
View File

@@ -79,12 +79,12 @@ FormulaToken::~FormulaToken()
{ {
} }
sal_Bool FormulaToken::Is3DRef() const bool FormulaToken::Is3DRef() const
{ {
return sal_False; return sal_False;
} }
sal_Bool FormulaToken::IsFunction() const bool FormulaToken::IsFunction() const
{ {
// OpCode eOp = GetOpCode(); // OpCode eOp = GetOpCode();
return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName && return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName &&
@@ -130,7 +130,7 @@ sal_uInt8 FormulaToken::GetParamCount() const
} }
sal_Bool FormulaToken::IsMatrixFunction() const bool FormulaToken::IsMatrixFunction() const
{ {
return formula::FormulaCompiler::IsMatrixFunction(GetOpCode()); return formula::FormulaCompiler::IsMatrixFunction(GetOpCode());
} }
@@ -239,7 +239,8 @@ void FormulaToken::SetError( sal_uInt16 )
{ {
DBG_ERRORFILE( "FormulaToken::SetError: virtual dummy called" ); DBG_ERRORFILE( "FormulaToken::SetError: virtual dummy called" );
} }
sal_Bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
{ {
return *this == rToken; return *this == rToken;
} }
@@ -252,7 +253,7 @@ sal_uInt8 FormulaByteToken::GetByte() const { return nByte
void FormulaByteToken::SetByte( sal_uInt8 n ) { nByte = n; } void FormulaByteToken::SetByte( sal_uInt8 n ) { nByte = n; }
bool FormulaByteToken::HasForceArray() const { return bHasForceArray; } bool FormulaByteToken::HasForceArray() const { return bHasForceArray; }
void FormulaByteToken::SetForceArray( bool b ) { bHasForceArray = b; } void FormulaByteToken::SetForceArray( bool b ) { bHasForceArray = b; }
sal_Bool FormulaByteToken::operator==( const FormulaToken& r ) const bool FormulaByteToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && nByte == r.GetByte() && return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
bHasForceArray == r.HasForceArray(); bHasForceArray == r.HasForceArray();
@@ -260,12 +261,12 @@ sal_Bool FormulaByteToken::operator==( const FormulaToken& r ) const
FormulaToken* FormulaFAPToken::GetFAPOrigToken() const { return pOrigToken.get(); } FormulaToken* FormulaFAPToken::GetFAPOrigToken() const { return pOrigToken.get(); }
sal_Bool FormulaFAPToken::operator==( const FormulaToken& r ) const bool FormulaFAPToken::operator==( const FormulaToken& r ) const
{ {
return FormulaByteToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken(); return FormulaByteToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken();
} }
short* FormulaJumpToken::GetJump() const { return pJump; } short* FormulaJumpToken::GetJump() const { return pJump; }
sal_Bool FormulaJumpToken::operator==( const FormulaToken& r ) const bool FormulaJumpToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && pJump[0] == r.GetJump()[0] && return FormulaToken::operator==( r ) && pJump[0] == r.GetJump()[0] &&
memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0; memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0;
@@ -554,7 +555,7 @@ FormulaToken* FormulaTokenArray::PeekPrevNoSpaces()
bool FormulaTokenArray::HasExternalRef() const bool FormulaTokenArray::HasExternalRef() const
{ {
for ( USHORT j=0; j < nLen; j++ ) for ( sal_uInt16 j=0; j < nLen; j++ )
{ {
if (pCode[j]->IsExternalRef()) if (pCode[j]->IsExternalRef())
return true; return true;
@@ -572,7 +573,7 @@ bool FormulaTokenArray::HasOpCode( OpCode eOp ) const
return sal_False; return sal_False;
} }
sal_Bool FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const bool FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
{ {
for ( sal_uInt16 j=0; j < nRPN; j++ ) for ( sal_uInt16 j=0; j < nRPN; j++ )
{ {
@@ -582,7 +583,7 @@ sal_Bool FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
return sal_False; return sal_False;
} }
sal_Bool FormulaTokenArray::HasNameOrColRowName() const bool FormulaTokenArray::HasNameOrColRowName() const
{ {
for ( sal_uInt16 j=0; j < nLen; j++ ) for ( sal_uInt16 j=0; j < nLen; j++ )
{ {
@@ -814,7 +815,7 @@ void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits )
} }
sal_Bool FormulaTokenArray::HasMatrixDoubleRefOps() bool FormulaTokenArray::HasMatrixDoubleRefOps()
{ {
if ( pRPN && nRPN ) if ( pRPN && nRPN )
{ {
@@ -1312,35 +1313,35 @@ bool FormulaTokenIterator::IsEndOfPath() const
double FormulaDoubleToken::GetDouble() const { return fDouble; } double FormulaDoubleToken::GetDouble() const { return fDouble; }
double & FormulaDoubleToken::GetDoubleAsReference() { return fDouble; } double & FormulaDoubleToken::GetDoubleAsReference() { return fDouble; }
sal_Bool FormulaDoubleToken::operator==( const FormulaToken& r ) const bool FormulaDoubleToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && fDouble == r.GetDouble(); return FormulaToken::operator==( r ) && fDouble == r.GetDouble();
} }
const String& FormulaStringToken::GetString() const { return aString; } const String& FormulaStringToken::GetString() const { return aString; }
sal_Bool FormulaStringToken::operator==( const FormulaToken& r ) const bool FormulaStringToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && aString == r.GetString(); return FormulaToken::operator==( r ) && aString == r.GetString();
} }
const String& FormulaStringOpToken::GetString() const { return aString; } const String& FormulaStringOpToken::GetString() const { return aString; }
sal_Bool FormulaStringOpToken::operator==( const FormulaToken& r ) const bool FormulaStringOpToken::operator==( const FormulaToken& r ) const
{ {
return FormulaByteToken::operator==( r ) && aString == r.GetString(); return FormulaByteToken::operator==( r ) && aString == r.GetString();
} }
sal_uInt16 FormulaIndexToken::GetIndex() const { return nIndex; } sal_uInt16 FormulaIndexToken::GetIndex() const { return nIndex; }
void FormulaIndexToken::SetIndex( sal_uInt16 n ) { nIndex = n; } void FormulaIndexToken::SetIndex( sal_uInt16 n ) { nIndex = n; }
sal_Bool FormulaIndexToken::operator==( const FormulaToken& r ) const bool FormulaIndexToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && nIndex == r.GetIndex(); return FormulaToken::operator==( r ) && nIndex == r.GetIndex();
} }
const String& FormulaExternalToken::GetExternal() const { return aExternal; } const String& FormulaExternalToken::GetExternal() const { return aExternal; }
sal_uInt8 FormulaExternalToken::GetByte() const { return nByte; } sal_uInt8 FormulaExternalToken::GetByte() const { return nByte; }
void FormulaExternalToken::SetByte( sal_uInt8 n ) { nByte = n; } void FormulaExternalToken::SetByte( sal_uInt8 n ) { nByte = n; }
sal_Bool FormulaExternalToken::operator==( const FormulaToken& r ) const bool FormulaExternalToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && nByte == r.GetByte() && return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
aExternal == r.GetExternal(); aExternal == r.GetExternal();
@@ -1349,7 +1350,7 @@ sal_Bool FormulaExternalToken::operator==( const FormulaToken& r ) const
sal_uInt16 FormulaErrorToken::GetError() const { return nError; } sal_uInt16 FormulaErrorToken::GetError() const { return nError; }
void FormulaErrorToken::SetError( sal_uInt16 nErr ) { nError = nErr; } void FormulaErrorToken::SetError( sal_uInt16 nErr ) { nError = nErr; }
sal_Bool FormulaErrorToken::operator==( const FormulaToken& r ) const bool FormulaErrorToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ) && return FormulaToken::operator==( r ) &&
nError == static_cast< const FormulaErrorToken & >(r).GetError(); nError == static_cast< const FormulaErrorToken & >(r).GetError();
@@ -1360,13 +1361,13 @@ const String& FormulaMissingToken::GetString() const
static String aDummyString; static String aDummyString;
return aDummyString; return aDummyString;
} }
sal_Bool FormulaMissingToken::operator==( const FormulaToken& r ) const bool FormulaMissingToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ); return FormulaToken::operator==( r );
} }
sal_Bool FormulaUnknownToken::operator==( const FormulaToken& r ) const bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
{ {
return FormulaToken::operator==( r ); return FormulaToken::operator==( r );
} }