summaryrefslogtreecommitdiffstats
path: root/sc/source/filter/excel/namebuff.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/excel/namebuff.cxx')
-rw-r--r--sc/source/filter/excel/namebuff.cxx54
1 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 7db7d17ed307..d46831b739af 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -44,16 +44,16 @@
#include "xiroot.hxx"
-UINT32 StringHashEntry::MakeHashCode( const String& r )
+sal_uInt32 StringHashEntry::MakeHashCode( const String& r )
{
- register UINT32 n = 0;
+ register sal_uInt32 n = 0;
const sal_Unicode* pAkt = r.GetBuffer();
register sal_Unicode cAkt = *pAkt;
while( cAkt )
{
n *= 70;
- n += ( UINT32 ) cAkt;
+ n += ( sal_uInt32 ) cAkt;
pAkt++;
cAkt = *pAkt;
}
@@ -86,14 +86,14 @@ void NameBuffer::operator <<( const String &rNewString )
#ifdef DBG_UTIL
-UINT16 nShrCnt;
+sal_uInt16 nShrCnt;
#endif
size_t ShrfmlaBuffer::ScAddressHashFunc::operator() (const ScAddress &addr) const
{
// Use something simple, it is just a hash.
- return static_cast< UINT16 >( addr.Row() ) | (static_cast< UINT8 >( addr.Col() ) << 16);
+ return static_cast< sal_uInt16 >( addr.Row() ) | (static_cast< sal_uInt8 >( addr.Col() ) << 16);
}
const size_t nBase = 16384; // Range~ und Shared~ Dingens mit jeweils der Haelfte Ids
@@ -127,15 +127,15 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
const ScAddress& rMaxPos = pExcRoot->pIR->GetMaxPos();
pData->SetMaxCol(rMaxPos.Col());
pData->SetMaxRow(rMaxPos.Row());
- pData->SetIndex( static_cast< USHORT >( mnCurrIdx ) );
+ pData->SetIndex( static_cast< sal_uInt16 >( mnCurrIdx ) );
pExcRoot->pIR->GetNamedRanges().Insert( pData );
- index_hash[rRange.aStart] = static_cast< USHORT >( mnCurrIdx );
+ index_hash[rRange.aStart] = static_cast< sal_uInt16 >( mnCurrIdx );
index_list.push_front (rRange);
++mnCurrIdx;
}
-USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
+sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
{
ShrfmlaHash::const_iterator hash = index_hash.find (aAddr);
if (hash != index_hash.end())
@@ -145,8 +145,8 @@ USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
unsigned int ind = nBase;
for (ShrfmlaList::const_iterator ptr = index_list.end(); ptr != index_list.begin() ; ind++)
if ((--ptr)->In (aAddr))
- return static_cast< USHORT >( ind );
- return static_cast< USHORT >( mnCurrIdx );
+ return static_cast< sal_uInt16 >( ind );
+ return static_cast< sal_uInt16 >( mnCurrIdx );
}
@@ -180,7 +180,7 @@ ExtSheetBuffer::~ExtSheetBuffer()
}
-sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const BOOL bSWB )
+sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const sal_Bool bSWB )
{
List::Insert( new Cont( rFPAN, rTN, bSWB ), LIST_APPEND );
// return 1-based index of EXTERNSHEET
@@ -188,21 +188,21 @@ sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const BOO
}
-BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
+sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex )
{
DBG_ASSERT( nExcIndex,
"*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
nExcIndex--;
Cont* pCur = ( Cont * ) List::GetObject( nExcIndex );
- UINT16& rTabNum = pCur->nTabNum;
+ sal_uInt16& rTabNum = pCur->nTabNum;
if( pCur )
{
if( rTabNum < 0xFFFD )
{
rScIndex = rTabNum;
- return TRUE;
+ return sal_True;
}
if( rTabNum == 0xFFFF )
@@ -212,8 +212,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
{// Tabelle ist im selben Workbook!
if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) )
{
- rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum);
- return TRUE;
+ rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
+ return sal_True;
}
else
rTabNum = 0xFFFD;
@@ -227,8 +227,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
String aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) );
if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) )
{
- rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum);
- return TRUE;
+ rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
+ return sal_True;
}
else
rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird
@@ -241,11 +241,11 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
}
}
- return FALSE;
+ return sal_False;
}
-BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
+sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
{
DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" );
Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
@@ -253,11 +253,11 @@ BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
if( pRet )
return pRet->bLink;
else
- return FALSE;
+ return sal_False;
}
-BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDoc ) const
+sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const
{
DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" );
Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
@@ -266,10 +266,10 @@ BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDo
{
rAppl = pRet->aFile;
rDoc = pRet->aTab;
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
@@ -288,13 +288,13 @@ void ExtSheetBuffer::Reset( void )
-BOOL ExtName::IsDDE( void ) const
+sal_Bool ExtName::IsDDE( void ) const
{
return ( nFlags & 0x0001 ) != 0;
}
-BOOL ExtName::IsOLE( void ) const
+sal_Bool ExtName::IsOLE( void ) const
{
return ( nFlags & 0x0002 ) != 0;
}
@@ -313,7 +313,7 @@ void ExtNameBuff::AddDDE( const String& rName, sal_Int16 nRefIdx )
}
-void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, UINT32 nStorageId )
+void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId )
{
ExtName aNew( rName, 0x0002 );
aNew.nStorageId = nStorageId;