Skip to content

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

sal_Bool->bool 

Change-Id: Id55fde4693649464d0e4244cb1e0ab09a10718dd
üst 6dbd8a36
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
sc/source/filter/excel/impop.cxx
Dosyayı görüntüle @ e5b10c94
...@@ -1150,7 +1150,7 @@ void ImportExcel::TableOp( void ) ...@@ -1150,7 +1150,7 @@ void ImportExcel::TableOp( void )
} }
else else
{ {
bTabTruncated = sal_True; bTabTruncated = true;
GetTracer().TraceInvalidRow(nLastRow, MAXROW); GetTracer().TraceInvalidRow(nLastRow, MAXROW);
} }
} }
......
sc/source/filter/excel/namebuff.cxx
Dosyayı görüntüle @ e5b10c94
...@@ -100,7 +100,7 @@ const ScTokenArray* SharedFormulaBuffer::Find( const ScAddress& rRefPos ) const ...@@ -100,7 +100,7 @@ const ScTokenArray* SharedFormulaBuffer::Find( const ScAddress& rRefPos ) const
return it->second; return it->second;
} }
sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const sal_Bool bSWB ) sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const bool bSWB )
{ {
maEntries.push_back( Cont( rFPAN, rTN, bSWB ) ); maEntries.push_back( Cont( rFPAN, rTN, bSWB ) );
// return 1-based index of EXTERNSHEET // return 1-based index of EXTERNSHEET
...@@ -108,7 +108,7 @@ sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const ...@@ -108,7 +108,7 @@ sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const
} }
sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex ) bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex )
{ {
OSL_ENSURE( nExcIndex, OSL_ENSURE( nExcIndex,
"*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" ); "*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
...@@ -122,7 +122,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd ...@@ -122,7 +122,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( rTabNum < 0xFFFD ) if( rTabNum < 0xFFFD )
{ {
rScIndex = rTabNum; rScIndex = rTabNum;
return sal_True; return true;
} }
if( rTabNum == 0xFFFF ) if( rTabNum == 0xFFFF )
...@@ -133,7 +133,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd ...@@ -133,7 +133,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) ) if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) )
{ {
rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum); rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
return sal_True; return true;
} }
else else
rTabNum = 0xFFFD; rTabNum = 0xFFFD;
...@@ -148,7 +148,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd ...@@ -148,7 +148,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) ) if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) )
{ {
rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum); rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
return sal_True; return true;
} }
else else
rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird
...@@ -164,7 +164,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd ...@@ -164,7 +164,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
} }
sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
{ {
OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index has to be >0!" ); OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index has to be >0!" );
...@@ -175,7 +175,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const ...@@ -175,7 +175,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
} }
sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const
{ {
OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" ); OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" );
...@@ -199,13 +199,13 @@ void ExtSheetBuffer::Reset( void ) ...@@ -199,13 +199,13 @@ void ExtSheetBuffer::Reset( void )
sal_Bool ExtName::IsDDE( void ) const bool ExtName::IsDDE( void ) const
{ {
return ( nFlags & 0x0001 ) != 0; return ( nFlags & 0x0001 ) != 0;
} }
sal_Bool ExtName::IsOLE( void ) const bool ExtName::IsOLE( void ) const
{ {
return ( nFlags & 0x0002 ) != 0; return ( nFlags & 0x0002 ) != 0;
} }
......
sc/source/filter/inc/namebuff.hxx
Dosyayı görüntüle @ e5b10c94
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
inline void operator =( const sal_Char* ); inline void operator =( const sal_Char* );
inline void operator =( const OUString& ); inline void operator =( const OUString& );
inline void operator =( const StringHashEntry& ); inline void operator =( const StringHashEntry& );
inline sal_Bool operator ==( const StringHashEntry& ) const; inline bool operator ==( const StringHashEntry& ) const;
}; };
...@@ -87,7 +87,7 @@ inline void StringHashEntry::operator =( const StringHashEntry& r ) ...@@ -87,7 +87,7 @@ inline void StringHashEntry::operator =( const StringHashEntry& r )
} }
inline sal_Bool StringHashEntry::operator ==( const StringHashEntry& r ) const inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const
{ {
return ( nHash == r.nHash && aString == r.aString ); return ( nHash == r.nHash && aString == r.aString );
} }
...@@ -170,11 +170,11 @@ private: ...@@ -170,11 +170,11 @@ private:
struct Entry struct Entry
{ {
StringHashEntry aStrHashEntry; StringHashEntry aStrHashEntry;
ScComplexRefData aScComplexRefDataRel; ScComplexRefData aScComplexRefDataRel;
OUString aScAbsName; OUString aScAbsName;
sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name! sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name!
sal_uInt16 nRelInd; sal_uInt16 nRelInd;
sal_Bool bSingleRef; bool bSingleRef;
Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD ) Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD )
: aStrHashEntry( rName ) : aStrHashEntry( rName )
, aScComplexRefDataRel( rCRD ) , aScComplexRefDataRel( rCRD )
...@@ -196,8 +196,8 @@ public: ...@@ -196,8 +196,8 @@ public:
virtual ~RangeNameBufferWK3(); virtual ~RangeNameBufferWK3();
void Add( const OUString& rName, const ScComplexRefData& rCRD ); void Add( const OUString& rName, const ScComplexRefData& rCRD );
inline void Add( const OUString& rName, const ScRange& aScRange ); inline void Add( const OUString& rName, const ScRange& aScRange );
sal_Bool FindRel( const OUString& rRef, sal_uInt16& rIndex ); bool FindRel( const OUString& rRef, sal_uInt16& rIndex );
sal_Bool FindAbs( const OUString& rRef, sal_uInt16& rIndex ); bool FindAbs( const OUString& rRef, sal_uInt16& rIndex );
}; };
...@@ -230,8 +230,8 @@ private: ...@@ -230,8 +230,8 @@ private:
sal_uInt16 nTabNum; // 0xFFFF -> noch nicht angelegt sal_uInt16 nTabNum; // 0xFFFF -> noch nicht angelegt
// 0xFFFE -> versucht anzulegen, ging aber schief // 0xFFFE -> versucht anzulegen, ging aber schief
// 0xFFFD -> soll im selben Workbook sein, findet's aber nicht // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
sal_Bool bSWB; bool bSWB;
sal_Bool bLink; bool bLink;
Cont( const OUString& rFilePathAndName, const OUString& rTabName ) : Cont( const OUString& rFilePathAndName, const OUString& rTabName ) :
aFile( rFilePathAndName ), aFile( rFilePathAndName ),
aTab( rTabName ) aTab( rTabName )
...@@ -240,7 +240,7 @@ private: ...@@ -240,7 +240,7 @@ private:
bSWB = bLink = false; bSWB = bLink = false;
} }
Cont( const OUString& rFilePathAndName, const OUString& rTabName, Cont( const OUString& rFilePathAndName, const OUString& rTabName,
const sal_Bool bSameWB ) : const bool bSameWB ) :
aFile( rFilePathAndName ), aFile( rFilePathAndName ),
aTab( rTabName ) aTab( rTabName )
{ {
...@@ -256,11 +256,11 @@ public: ...@@ -256,11 +256,11 @@ public:
inline ExtSheetBuffer( RootData* ); inline ExtSheetBuffer( RootData* );
sal_Int16 Add( const OUString& rFilePathAndName, sal_Int16 Add( const OUString& rFilePathAndName,
const OUString& rTabName, const sal_Bool bSameWorkbook = false ); const OUString& rTabName, const bool bSameWorkbook = false );
sal_Bool GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex ); bool GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex );
sal_Bool IsLink( const sal_uInt16 nExcSheetIndex ) const; bool IsLink( const sal_uInt16 nExcSheetIndex ) const;
sal_Bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const; bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const;
void Reset( void ); void Reset( void );
}; };
...@@ -281,8 +281,8 @@ struct ExtName ...@@ -281,8 +281,8 @@ struct ExtName
inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
sal_Bool IsDDE( void ) const; bool IsDDE( void ) const;
sal_Bool IsOLE( void ) const; bool IsOLE( void ) const;
}; };
......
sc/source/filter/lotus/tool.cxx
Dosyayı görüntüle @ e5b10c94
...@@ -538,7 +538,7 @@ void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData& ...@@ -538,7 +538,7 @@ void RangeNameBufferWK3::Add( const OUString& rOrgName, const ScComplexRefData&
} }
sal_Bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex ) bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
{ {
StringHashEntry aRef( rRef ); StringHashEntry aRef( rRef );
...@@ -556,7 +556,7 @@ sal_Bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex ) ...@@ -556,7 +556,7 @@ sal_Bool RangeNameBufferWK3::FindRel( const OUString& rRef, sal_uInt16& rIndex )
} }
sal_Bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex ) bool RangeNameBufferWK3::FindAbs( const OUString& rRef, sal_uInt16& rIndex )
{ {
OUString aTmp( rRef ); OUString aTmp( rRef );
aTmp = aTmp.copy(1); aTmp = aTmp.copy(1);
......
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