diff options
Diffstat (limited to 'sw/inc/calc.hxx')
| -rw-r--r-- | sw/inc/calc.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 0e13c010d418..69ab36a84e38 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -131,7 +131,7 @@ public: virtual ~SwSbxValue(); - BOOL GetBool() const; + sal_Bool GetBool() const; double GetDouble() const; SwSbxValue& MakeDouble(); @@ -160,9 +160,9 @@ struct SwCalcExp : public SwHash }; SwHash* Find( const String& rSrch, SwHash** ppTable, - USHORT nTblSize, USHORT* pPos = 0 ); + sal_uInt16 nTblSize, sal_uInt16* pPos = 0 ); -void DeleteHashTable( SwHash** ppTable, USHORT nTblSize ); +void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize ); // if _CalcOp != 0, this is a valid operator struct _CalcOp; @@ -187,7 +187,7 @@ class SwCalc const LocaleDataWrapper* pLclData; CharClass* pCharClass; - USHORT nListPor; + sal_uInt16 nListPor; SwCalcOper eCurrOper; SwCalcOper eCurrListOper; SwCalcError eError; @@ -198,7 +198,7 @@ class SwCalc SwSbxValue Term(); SwSbxValue Prim(); - BOOL ParseTime( USHORT*, USHORT*, USHORT* ); + sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); String GetColumnName( const String& rName ); String GetDBName( const String& rName ); @@ -212,20 +212,20 @@ public: ~SwCalc(); SwSbxValue Calculate( const String &rStr ); - String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE ); - String GetStrResult( double, BOOL bRound = TRUE ); + String GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True ); + String GetStrResult( double, sal_Bool bRound = sal_True ); SwCalcExp* VarInsert( const String& r ); - SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 ); + SwCalcExp* VarLook( const String &rStr, sal_uInt16 ins = 0 ); void VarChange( const String& rStr, const SwSbxValue& rValue ); void VarChange( const String& rStr, double ); SwHash** GetVarTable() { return VarTable; } - BOOL Push( const VoidPtr pPtr ); + sal_Bool Push( const VoidPtr pPtr ); void Pop( const VoidPtr pPtr ); void SetCalcError( SwCalcError eErr ) { eError = eErr; } - BOOL IsCalcError() const { return 0 != eError; } + sal_Bool IsCalcError() const { return 0 != eError; } static bool Str2Double( const String& rStr, xub_StrLen& rPos, double& rVal, @@ -233,7 +233,7 @@ public: static bool Str2Double( const String& rStr, xub_StrLen& rPos, double& rVal, SwDoc *const pDoc ); - SW_DLLPUBLIC static BOOL IsValidVarName( const String& rStr, + SW_DLLPUBLIC static sal_Bool IsValidVarName( const String& rStr, String* pValidName = 0 ); }; |