diff options
Diffstat (limited to 'sc/inc/conditio.hxx')
| -rw-r--r-- | sc/inc/conditio.hxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 18816f4cb313..f541e247e7d8 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -79,7 +79,7 @@ class SC_DLLPUBLIC ScConditionEntry { // stored data: ScConditionMode eOp; - USHORT nOptions; + sal_uInt16 nOptions; double nVal1; // input or calculated double nVal2; String aStrVal1; // input or calculated @@ -88,8 +88,8 @@ class SC_DLLPUBLIC ScConditionEntry String aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar1; // grammar to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar2; // grammar to be used on (re)compilation, e.g. in XML import - BOOL bIsStr1; // for recognition of empty strings - BOOL bIsStr2; + sal_Bool bIsStr1; // for recognition of empty strings + sal_Bool bIsStr2; ScTokenArray* pFormula1; // entered formula ScTokenArray* pFormula2; ScAddress aSrcPos; // source position for formulas @@ -98,20 +98,20 @@ class SC_DLLPUBLIC ScConditionEntry ScFormulaCell* pFCell1; ScFormulaCell* pFCell2; ScDocument* pDoc; - BOOL bRelRef1; - BOOL bRelRef2; - BOOL bFirstRun; + sal_Bool bRelRef1; + sal_Bool bRelRef2; + sal_Bool bFirstRun; void MakeCells( const ScAddress& rPos ); void Compile( const String& rExpr1, const String& rExpr2, const String& rExprNmsp1, const String& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2, - BOOL bTextToReal ); + sal_Bool bTextToReal ); void Interpret( const ScAddress& rPos ); - BOOL IsValid( double nArg, const ScAddress& rAddr ) const; - BOOL IsValidStr( const String& rArg, const ScAddress& rAddr ) const; + sal_Bool IsValid( double nArg, const ScAddress& rAddr ) const; + sal_Bool IsValidStr( const String& rArg, const ScAddress& rAddr ) const; public: ScConditionEntry( ScConditionMode eOper, @@ -132,11 +132,11 @@ public: void SetParent( ScConditionalFormat* pNew ) { pCondFormat = pNew; } - BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + sal_Bool IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; ScConditionMode GetOperation() const { return eOp; } - BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } - void SetIgnoreBlank(BOOL bSet); + sal_Bool IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } + void SetIgnoreBlank(sal_Bool bSet); ScAddress GetSrcPos() const { return aSrcPos; } ScAddress GetValidSrcPos() const; // adjusted to allow textual representation of expressions @@ -146,10 +146,10 @@ public: void SetFormula1( const ScTokenArray& rArray ); void SetFormula2( const ScTokenArray& rArray ); - String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, + String GetExpression( const ScAddress& rCursor, sal_uInt16 nPos, sal_uLong nNumFmt = 0, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - ScTokenArray* CreateTokenArry( USHORT nPos ) const; + ScTokenArray* CreateTokenArry( sal_uInt16 nPos ) const; void CompileAll(); void CompileXML(); @@ -213,8 +213,8 @@ class SC_DLLPUBLIC ScConditionalFormat ScRangeList* pAreas; // area for Paint sal_uInt32 nKey; // Index in attributes ScCondFormatEntry** ppEntries; - USHORT nEntryCount; - BOOL bIsUsed; // temporary at Save + sal_uInt16 nEntryCount; + sal_Bool bIsUsed; // temporary at Save ScRangeListRef pRanges; // Ranges for conditional format public: @@ -229,8 +229,8 @@ public: void AddRangeInfo( const ScRangeListRef& rRanges ); const ScRangeListRef& GetRangeInfo() const { return pRanges; } - BOOL IsEmpty() const { return (nEntryCount == 0); } - USHORT Count() const { return nEntryCount; } + sal_Bool IsEmpty() const { return (nEntryCount == 0); } + sal_uInt16 Count() const { return nEntryCount; } void CompileAll(); void CompileXML(); @@ -241,11 +241,11 @@ public: void SourceChanged( const ScAddress& rAddr ); - const ScCondFormatEntry* GetEntry( USHORT nPos ) const; + const ScCondFormatEntry* GetEntry( sal_uInt16 nPos ) const; const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; - BOOL EqualEntries( const ScConditionalFormat& r ) const; + sal_Bool EqualEntries( const ScConditionalFormat& r ) const; void DoRepaint( const ScRange* pModified ); void InvalidateArea(); @@ -253,15 +253,15 @@ public: sal_uInt32 GetKey() const { return nKey; } void SetKey(sal_uInt32 nNew) { nKey = nNew; } // only if not inserted! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(sal_Bool bSet) { bIsUsed = bSet; } + sal_Bool IsUsed() const { return bIsUsed; } bool MarkUsedExternalReferences() const; // sorted (via PTRARR) by Index // operator== only for sorting - BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } + sal_Bool operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } + sal_Bool operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } }; // @@ -299,7 +299,7 @@ public: * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScConditionalFormatList& r ) const; // for Ref-Undo + sal_Bool operator==( const ScConditionalFormatList& r ) const; // for Ref-Undo }; #endif |