1 files changed, 27 insertions, 27 deletions

diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index 20b2400cf5a2..a94ef5abe715 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -71,42 +71,42 @@ class DifParser
 public:
     String              aData;
     double              fVal;
-    UINT32              nVector;
-    UINT32              nVal;
-    UINT32              nNumFormat;
+    sal_uInt32              nVector;
+    sal_uInt32              nVal;
+    sal_uInt32              nNumFormat;
     CharSet             eCharSet;
 private:
     SvNumberFormatter*  pNumFormatter;
     SvStream&           rIn;
-    BOOL                bPlain;
+    sal_Bool                bPlain;
     String              aLookAheadLine;
 
     bool                ReadNextLine( String& rStr );
     bool                LookAhead();
     DATASET             GetNumberDataset( const sal_Unicode* pPossibleNumericData );
-    static inline BOOL  IsBOT( const sal_Unicode* pRef );
-    static inline BOOL  IsEOD( const sal_Unicode* pRef );
-    static inline BOOL  Is1_0( const sal_Unicode* pRef );
+    static inline sal_Bool  IsBOT( const sal_Unicode* pRef );
+    static inline sal_Bool  IsEOD( const sal_Unicode* pRef );
+    static inline sal_Bool  Is1_0( const sal_Unicode* pRef );
 public:
-                        DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet );
+                        DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, CharSet );
 
     TOPIC               GetNextTopic( void );
 
     DATASET             GetNextDataset( void );
 
-    const sal_Unicode*  ScanIntVal( const sal_Unicode* pStart, UINT32& rRet );
-    BOOL                ScanFloatVal( const sal_Unicode* pStart );
+    const sal_Unicode*  ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet );
+    sal_Bool                ScanFloatVal( const sal_Unicode* pStart );
 
-    inline BOOL         IsNumber( const sal_Unicode cChar );
-    inline BOOL         IsNumberEnding( const sal_Unicode cChar );
+    inline sal_Bool         IsNumber( const sal_Unicode cChar );
+    inline sal_Bool         IsNumberEnding( const sal_Unicode cChar );
 
-    static inline BOOL  IsV( const sal_Unicode* pRef );
+    static inline sal_Bool  IsV( const sal_Unicode* pRef );
 
-    inline BOOL         IsPlain( void ) const;
+    inline sal_Bool         IsPlain( void ) const;
 };
 
 
-inline BOOL DifParser::IsBOT( const sal_Unicode* pRef )
+inline sal_Bool DifParser::IsBOT( const sal_Unicode* pRef )
 {
     return  (   pRef[ 0 ] == pKeyBOT[0] &&
                 pRef[ 1 ] == pKeyBOT[1] &&
@@ -115,7 +115,7 @@ inline BOOL DifParser::IsBOT( const sal_Unicode* pRef )
 }
 
 
-inline BOOL DifParser::IsEOD( const sal_Unicode* pRef )
+inline sal_Bool DifParser::IsEOD( const sal_Unicode* pRef )
 {
     return  (   pRef[ 0 ] == pKeyEOD[0] &&
                 pRef[ 1 ] == pKeyEOD[1] &&
@@ -124,7 +124,7 @@ inline BOOL DifParser::IsEOD( const sal_Unicode* pRef )
 }
 
 
-inline BOOL DifParser::Is1_0( const sal_Unicode* pRef )
+inline sal_Bool DifParser::Is1_0( const sal_Unicode* pRef )
 {
     return  (   pRef[ 0 ] == pKey1_0[0] &&
                 pRef[ 1 ] == pKey1_0[1] &&
@@ -133,26 +133,26 @@ inline BOOL DifParser::Is1_0( const sal_Unicode* pRef )
 }
 
 
-inline BOOL DifParser::IsV( const sal_Unicode* pRef )
+inline sal_Bool DifParser::IsV( const sal_Unicode* pRef )
 {
     return  (   pRef[ 0 ] == pKeyV[0] &&
                 pRef[ 1 ] == pKeyV[1]   );
 }
 
 
-inline BOOL DifParser::IsNumber( const sal_Unicode cChar )
+inline sal_Bool DifParser::IsNumber( const sal_Unicode cChar )
 {
     return ( cChar >= '0' && cChar <= '9' );
 }
 
 
-inline BOOL DifParser::IsNumberEnding( const sal_Unicode cChar )
+inline sal_Bool DifParser::IsNumberEnding( const sal_Unicode cChar )
 {
     return ( cChar == 0x00 );
 }
 
 
-inline BOOL DifParser::IsPlain( void ) const
+inline sal_Bool DifParser::IsPlain( void ) const
 {
     return bPlain;
 }
@@ -170,7 +170,7 @@ private:
     friend class DifAttrCache;
     struct ENTRY
     {
-        UINT32          nNumFormat;
+        sal_uInt32          nNumFormat;
 
         SCROW           nStart;
         SCROW           nEnd;
@@ -181,8 +181,8 @@ private:
     inline              DifColumn( void );
                         ~DifColumn();
     void                SetLogical( SCROW nRow );
-    void                SetNumFormat( SCROW nRow, const UINT32 nNumFormat );
-    void                NewEntry( const SCROW nPos, const UINT32 nNumFormat );
+    void                SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat );
+    void                NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat );
     void                Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& );
     void                Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab );
 public:     // geht niemanden etwas an...
@@ -201,12 +201,12 @@ class DifAttrCache
 {
 private:
     DifColumn**         ppCols;
-    BOOL                bPlain;
+    sal_Bool                bPlain;
 public:
-                        DifAttrCache( const BOOL bPlain );
+                        DifAttrCache( const sal_Bool bPlain );
                         ~DifAttrCache();
     inline void         SetLogical( const SCCOL nCol, const SCROW nRow );
-    void                SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat );
+    void                SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_uInt32 nNumFormat );
     void                Apply( ScDocument&, SCTAB nTab );
 };