Skip to content

C
core
Kaydet (Commit) 880948b2 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

sal_Bool->bool 

Change-Id: I65bcdf1d09f58fbfcde055ccb6b4842e3f95f973
üst 389c4289
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
sc/source/filter/dif/difimp.cxx
Dosyayı görüntüle @ 880948b2
...@@ -631,17 +631,17 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& ...@@ -631,17 +631,17 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32&
} }
sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
{ {
sal_Bool bNeg = false; sal_Bool bNeg = false;
double fFracPos = 1.0; double fFracPos = 1.0;
sal_Int32 nExp = 0; sal_Int32 nExp = 0;
sal_Bool bExpNeg = false; sal_Bool bExpNeg = false;
sal_Bool bExpOverflow = false; sal_Bool bExpOverflow = false;
static const sal_uInt16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden! static const sal_uInt16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden!
sal_Unicode cAkt; sal_Unicode cAkt;
sal_Bool bRet = false; bool bRet = false;
enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND }; enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND };
...@@ -702,7 +702,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) ...@@ -702,7 +702,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP; eS = S_EXP;
break; break;
case 0x00: // IsNumberEnding( cAkt ) case 0x00: // IsNumberEnding( cAkt )
bRet = sal_True; // no bRet = true; // no
default: // break! default: // break!
eS = S_END; eS = S_END;
} }
...@@ -723,7 +723,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) ...@@ -723,7 +723,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP_FIRST; eS = S_EXP_FIRST;
break; break;
case 0x00: // IsNumberEnding( cAkt ) case 0x00: // IsNumberEnding( cAkt )
bRet = sal_True; // no bRet = true; // no
default: // break! default: // break!
eS = S_END; eS = S_END;
} }
...@@ -776,7 +776,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) ...@@ -776,7 +776,7 @@ sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
case S_FINDEND: case S_FINDEND:
if( IsNumberEnding( cAkt ) ) if( IsNumberEnding( cAkt ) )
{ {
bRet = sal_True; // damit sinnvoll weitergeparst werden kann bRet = true; // damit sinnvoll weitergeparst werden kann
eS = S_END; eS = S_END;
} }
break; break;
...@@ -900,7 +900,7 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) ...@@ -900,7 +900,7 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab )
} }
DifAttrCache::DifAttrCache( const sal_Bool bNewPlain ) DifAttrCache::DifAttrCache( const bool bNewPlain )
{ {
bPlain = bNewPlain; bPlain = bNewPlain;
ppCols = new DifColumn *[ MAXCOL + 1 ]; ppCols = new DifColumn *[ MAXCOL + 1 ];
......
sc/source/filter/inc/dif.hxx
Dosyayı görüntüle @ 880948b2
...@@ -70,15 +70,15 @@ public: ...@@ -70,15 +70,15 @@ public:
private: private:
SvNumberFormatter* pNumFormatter; SvNumberFormatter* pNumFormatter;
SvStream& rIn; SvStream& rIn;
sal_Bool bPlain; bool bPlain;
OUString aLookAheadLine; OUString aLookAheadLine;
bool ReadNextLine( OUString& rStr ); bool ReadNextLine( OUString& rStr );
bool LookAhead(); bool LookAhead();
DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData );
static inline sal_Bool IsBOT( const sal_Unicode* pRef ); static inline bool IsBOT( const sal_Unicode* pRef );
static inline sal_Bool IsEOD( const sal_Unicode* pRef ); static inline bool IsEOD( const sal_Unicode* pRef );
static inline sal_Bool Is1_0( const sal_Unicode* pRef ); static inline bool Is1_0( const sal_Unicode* pRef );
public: public:
DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, rtl_TextEncoding ); DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, rtl_TextEncoding );
...@@ -87,17 +87,17 @@ public: ...@@ -87,17 +87,17 @@ public:
DATASET GetNextDataset( void ); DATASET GetNextDataset( void );
const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet );
sal_Bool ScanFloatVal( const sal_Unicode* pStart ); bool ScanFloatVal( const sal_Unicode* pStart );
inline sal_Bool IsNumber( const sal_Unicode cChar ); inline bool IsNumber( const sal_Unicode cChar );
inline sal_Bool IsNumberEnding( const sal_Unicode cChar ); inline bool IsNumberEnding( const sal_Unicode cChar );
static inline sal_Bool IsV( const sal_Unicode* pRef ); static inline bool IsV( const sal_Unicode* pRef );
inline sal_Bool IsPlain( void ) const; inline bool IsPlain( void ) const;
}; };
inline sal_Bool DifParser::IsBOT( const sal_Unicode* pRef ) inline bool DifParser::IsBOT( const sal_Unicode* pRef )
{ {
return ( pRef[ 0 ] == pKeyBOT[0] && return ( pRef[ 0 ] == pKeyBOT[0] &&
pRef[ 1 ] == pKeyBOT[1] && pRef[ 1 ] == pKeyBOT[1] &&
...@@ -105,7 +105,7 @@ inline sal_Bool DifParser::IsBOT( const sal_Unicode* pRef ) ...@@ -105,7 +105,7 @@ inline sal_Bool DifParser::IsBOT( const sal_Unicode* pRef )
pRef[ 3 ] == pKeyBOT[3] ); pRef[ 3 ] == pKeyBOT[3] );
} }
inline sal_Bool DifParser::IsEOD( const sal_Unicode* pRef ) inline bool DifParser::IsEOD( const sal_Unicode* pRef )
{ {
return ( pRef[ 0 ] == pKeyEOD[0] && return ( pRef[ 0 ] == pKeyEOD[0] &&
pRef[ 1 ] == pKeyEOD[1] && pRef[ 1 ] == pKeyEOD[1] &&
...@@ -113,7 +113,7 @@ inline sal_Bool DifParser::IsEOD( const sal_Unicode* pRef ) ...@@ -113,7 +113,7 @@ inline sal_Bool DifParser::IsEOD( const sal_Unicode* pRef )
pRef[ 3 ] == pKeyEOD[3] ); pRef[ 3 ] == pKeyEOD[3] );
} }
inline sal_Bool DifParser::Is1_0( const sal_Unicode* pRef ) inline bool DifParser::Is1_0( const sal_Unicode* pRef )
{ {
return ( pRef[ 0 ] == pKey1_0[0] && return ( pRef[ 0 ] == pKey1_0[0] &&
pRef[ 1 ] == pKey1_0[1] && pRef[ 1 ] == pKey1_0[1] &&
...@@ -121,23 +121,23 @@ inline sal_Bool DifParser::Is1_0( const sal_Unicode* pRef ) ...@@ -121,23 +121,23 @@ inline sal_Bool DifParser::Is1_0( const sal_Unicode* pRef )
pRef[ 3 ] == pKey1_0[3] ); pRef[ 3 ] == pKey1_0[3] );
} }
inline sal_Bool DifParser::IsV( const sal_Unicode* pRef ) inline bool DifParser::IsV( const sal_Unicode* pRef )
{ {
return ( pRef[ 0 ] == pKeyV[0] && return ( pRef[ 0 ] == pKeyV[0] &&
pRef[ 1 ] == pKeyV[1] ); pRef[ 1 ] == pKeyV[1] );
} }
inline sal_Bool DifParser::IsNumber( const sal_Unicode cChar ) inline bool DifParser::IsNumber( const sal_Unicode cChar )
{ {
return ( cChar >= '0' && cChar <= '9' ); return ( cChar >= '0' && cChar <= '9' );
} }
inline sal_Bool DifParser::IsNumberEnding( const sal_Unicode cChar ) inline bool DifParser::IsNumberEnding( const sal_Unicode cChar )
{ {
return ( cChar == 0x00 ); return ( cChar == 0x00 );
} }
inline sal_Bool DifParser::IsPlain( void ) const inline bool DifParser::IsPlain( void ) const
{ {
return bPlain; return bPlain;
} }
...@@ -173,7 +173,7 @@ class DifAttrCache ...@@ -173,7 +173,7 @@ class DifAttrCache
{ {
public: public:
DifAttrCache( const sal_Bool bPlain ); DifAttrCache( const bool bPlain );
~DifAttrCache(); ~DifAttrCache();
...@@ -186,7 +186,7 @@ public: ...@@ -186,7 +186,7 @@ public:
private: private:
DifColumn** ppCols; DifColumn** ppCols;
sal_Bool bPlain; bool bPlain;
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment