summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-12 15:29:04 +0200
committerNoel Grandin <noel@peralex.com>2014-02-14 14:15:11 +0200
commite5b10c9400b11a6dbf47be6196273b867e0ae34d (patch)
treec1a34aa8e19eff2fcd2cab772c22a40be5cb9bef /sc
parent6dbd8a36bfce19851ced22227f669d55cf5a210d (diff)
sal_Bool->bool
Change-Id: Id55fde4693649464d0e4244cb1e0ab09a10718dd
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/impop.cxx2
-rw-r--r--sc/source/filter/excel/namebuff.cxx18
-rw-r--r--sc/source/filter/inc/namebuff.hxx34
-rw-r--r--sc/source/filter/lotus/tool.cxx4
4 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index ff0e7aae0592..c20793352028 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1150,7 +1150,7 @@ void ImportExcel::TableOp( void )
}
else
{
- bTabTruncated = sal_True;
+ bTabTruncated = true;
GetTracer().TraceInvalidRow(nLastRow, MAXROW);
}
}
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index e369dee268a8..50496be6e76b 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -100,7 +100,7 @@ const ScTokenArray* SharedFormulaBuffer::Find( const ScAddress& rRefPos ) const
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 ) );
// return 1-based index of EXTERNSHEET
@@ -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,
"*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
@@ -122,7 +122,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( rTabNum < 0xFFFD )
{
rScIndex = rTabNum;
- return sal_True;
+ return true;
}
if( rTabNum == 0xFFFF )
@@ -133,7 +133,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) )
{
rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
- return sal_True;
+ return true;
}
else
rTabNum = 0xFFFD;
@@ -148,7 +148,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd
if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) )
{
rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
- return sal_True;
+ return true;
}
else
rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird
@@ -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!" );
@@ -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!" );
@@ -199,13 +199,13 @@ void ExtSheetBuffer::Reset( void )
-sal_Bool ExtName::IsDDE( void ) const
+bool ExtName::IsDDE( void ) const
{
return ( nFlags & 0x0001 ) != 0;
}
-sal_Bool ExtName::IsOLE( void ) const
+bool ExtName::IsOLE( void ) const
{
return ( nFlags & 0x0002 ) != 0;
}
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index a4034f9025ac..f34fe9d910b5 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -51,7 +51,7 @@ public:
inline void operator =( const sal_Char* );
inline void operator =( const OUString& );
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 )
}
-inline sal_Bool StringHashEntry::operator ==( const StringHashEntry& r ) const
+inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const
{
return ( nHash == r.nHash && aString == r.aString );
}
@@ -170,11 +170,11 @@ private:
struct Entry
{
StringHashEntry aStrHashEntry;
- ScComplexRefData aScComplexRefDataRel;
+ ScComplexRefData aScComplexRefDataRel;
OUString aScAbsName;
- sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name!
- sal_uInt16 nRelInd;
- sal_Bool bSingleRef;
+ sal_uInt16 nAbsInd; // == 0 -> noch keine Abs-Name!
+ sal_uInt16 nRelInd;
+ bool bSingleRef;
Entry( const OUString& rName, const OUString& rScName, const ScComplexRefData& rCRD )
: aStrHashEntry( rName )
, aScComplexRefDataRel( rCRD )
@@ -196,8 +196,8 @@ public:
virtual ~RangeNameBufferWK3();
void Add( const OUString& rName, const ScComplexRefData& rCRD );
inline void Add( const OUString& rName, const ScRange& aScRange );
- sal_Bool FindRel( const OUString& rRef, sal_uInt16& rIndex );
- sal_Bool FindAbs( const OUString& rRef, sal_uInt16& rIndex );
+ bool FindRel( const OUString& rRef, sal_uInt16& rIndex );
+ bool FindAbs( const OUString& rRef, sal_uInt16& rIndex );
};
@@ -230,8 +230,8 @@ private:
sal_uInt16 nTabNum; // 0xFFFF -> noch nicht angelegt
// 0xFFFE -> versucht anzulegen, ging aber schief
// 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
- sal_Bool bSWB;
- sal_Bool bLink;
+ bool bSWB;
+ bool bLink;
Cont( const OUString& rFilePathAndName, const OUString& rTabName ) :
aFile( rFilePathAndName ),
aTab( rTabName )
@@ -240,7 +240,7 @@ private:
bSWB = bLink = false;
}
Cont( const OUString& rFilePathAndName, const OUString& rTabName,
- const sal_Bool bSameWB ) :
+ const bool bSameWB ) :
aFile( rFilePathAndName ),
aTab( rTabName )
{
@@ -256,11 +256,11 @@ public:
inline ExtSheetBuffer( RootData* );
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 );
- sal_Bool IsLink( const sal_uInt16 nExcSheetIndex ) const;
- sal_Bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const;
+ bool GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex );
+ bool IsLink( const sal_uInt16 nExcSheetIndex ) const;
+ bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const;
void Reset( void );
};
@@ -281,8 +281,8 @@ struct ExtName
inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
- sal_Bool IsDDE( void ) const;
- sal_Bool IsOLE( void ) const;
+ bool IsDDE( void ) const;
+ bool IsOLE( void ) const;
};
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 9276c1305bf9..e0d98aac173b 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -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 );
@@ -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 );
aTmp = aTmp.copy(1);