From 9e2d73aef6b5c15794936a849ead050ca3d205e3 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 7 Jan 2011 18:04:22 +0100
Subject: removetooltypes: #i112600# remove tooltypes
---
connectivity/source/drivers/dbase/DNoException.cxx | 80 +++++++++++-----------
1 file changed, 40 insertions(+), 40 deletions(-)
(limited to 'connectivity/source/drivers/dbase/DNoException.cxx')
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index b39581f1be15..7534d06f068c 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -90,7 +90,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
- ULONG nLen = m_pFileStream->Seek(nPos);
+ sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
if (m_pFileStream->GetError() != ERRCODE_NONE)
goto Error;
@@ -127,10 +127,10 @@ End:
return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
- BOOL bIsText = TRUE;
+ sal_Bool bIsText = sal_True;
// SdbConnection* pConnection = GetConnection();
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
@@ -142,13 +142,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
ByteString aBStr;
static char aBuf[514];
aBuf[512] = 0; // sonst kann der Zufall uebel mitspielen
- BOOL bReady = sal_False;
+ sal_Bool bReady = sal_False;
do
{
m_pMemoStream->Read(&aBuf,512);
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (aBuf[i] != cEOF && ++i < 512)
;
bReady = aBuf[i] == cEOF;
@@ -170,7 +170,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
// Foxpro stores text and binary data
if (m_aMemoHeader.db_typ == MemoFoxPro)
{
- if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+ if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
{
// String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
// aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -184,7 +184,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
bIsText = sHeader[3] != 0;
}
- else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+ else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
{
// String aText = String(SdbResId(STR_STAT_IResultSetHelper::INVALID));
// aText.SearchAndReplace(String::CreateFromAscii("%%d"),m_pMemoStream->GetFileName());
@@ -232,7 +232,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
void ODbaseTable::AllocBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
- UINT16 nSize = m_aHeader.db_slng;
+ sal_uInt16 nSize = m_aHeader.db_slng;
OSL_ENSURE(nSize > 0, "Size too small");
if (m_nBufferSize != nSize)
@@ -245,11 +245,11 @@ void ODbaseTable::AllocBuffer()
if (m_pBuffer == NULL && nSize)
{
m_nBufferSize = nSize;
- m_pBuffer = new BYTE[m_nBufferSize+1];
+ m_pBuffer = new sal_uInt8[m_nBufferSize+1];
}
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
@@ -285,7 +285,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
else
{
ByteString aBuf;
- USHORT nLen = rIndex.getHeader().db_keylen;
+ sal_uInt16 nLen = rIndex.getHeader().db_keylen;
char* pStr = aBuf.AllocBuffer(nLen+1);
rStream.Read(pStr,nLen);
@@ -319,7 +319,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
if (aKey.getValue().isNull())
{
memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
else
rStream << (double) aKey.getValue();
@@ -333,7 +333,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
}
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
rStream << aChild;
}
@@ -354,7 +354,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
// ONDXKey
//==================================================================
//------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXKey::IsText" );
return eType == DataType::VARCHAR || eType == DataType::CHAR;
@@ -383,7 +383,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
}
else if (IsText(getDBType()))
{
- INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+ sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
}
else
@@ -460,16 +460,16 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
return *this;
}
// -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
//------------------------------------------------------------------
SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
{
rStream.Seek(rPage.GetPagePos() * 512);
rStream >> nValue >> rPage.aChild;
- rPage.nCount = USHORT(nValue);
+ rPage.nCount = sal_uInt16(nValue);
// DBG_ASSERT(rPage.nCount && rPage.nCount < rPage.GetIndex().GetMaxNodes(), "Falscher Count");
- for (USHORT i = 0; i < rPage.nCount; i++)
+ for (sal_uInt16 i = 0; i < rPage.nCount; i++)
rPage[i].Read(rStream, rPage.GetIndex());
return rStream;
}
@@ -478,7 +478,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
{
// Seite existiert noch nicht
- ULONG nSize = (rPage.GetPagePos() + 1) * 512;
+ sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * 512;
if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
{
rStream.SetStreamSize(nSize);
@@ -486,27 +486,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
char aEmptyData[512];
memset(aEmptyData,0x00,512);
- rStream.Write((BYTE*)aEmptyData,512);
+ rStream.Write((sal_uInt8*)aEmptyData,512);
}
- ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
+ sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
OSL_UNUSED( nCurrentPos );
nValue = rPage.nCount;
rStream << nValue << rPage.aChild;
- USHORT i = 0;
+ sal_uInt16 i = 0;
for (; i < rPage.nCount; i++)
rPage[i].Write(rStream, rPage);
// check if we have to fill the stream with '\0'
if(i < rPage.rIndex.getHeader().db_maxkeys)
{
- ULONG nTell = rStream.Tell() % 512;
- USHORT nBufferSize = rStream.GetBufferSize();
- ULONG nSize = nBufferSize - nTell;
+ sal_uIntPtr nTell = rStream.Tell() % 512;
+ sal_uInt16 nBufferSize = rStream.GetBufferSize();
+ sal_uIntPtr nSize = nBufferSize - nTell;
char* pEmptyData = new char[nSize];
memset(pEmptyData,0x00,nSize);
- rStream.Write((BYTE*)pEmptyData,nSize);
+ rStream.Write((sal_uInt8*)pEmptyData,nSize);
rStream.Seek(nTell);
delete [] pEmptyData;
}
@@ -521,7 +521,7 @@ void ONDXPage::PrintPage()
DBG_TRACE4("\nSDB: -----------Page: %d Parent: %d Count: %d Child: %d-----",
nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
ONDXKey& rKey = rNode.GetKey();
@@ -546,7 +546,7 @@ void ONDXPage::PrintPage()
{
#if OSL_DEBUG_LEVEL > 1
GetChild(&rIndex)->PrintPage();
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
rNode.GetChild(&rIndex,this)->PrintPage();
@@ -557,18 +557,18 @@ void ONDXPage::PrintPage()
}
#endif
// -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::IsFull" );
return Count() == rIndex.getHeader().db_maxkeys;
}
// -----------------------------------------------------------------------------
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
// binare Suche spaeter
- USHORT i = 0xFFFF;
+ sal_uInt16 i = 0xFFFF;
while (++i < Count())
if ((*this)[i].GetKey() == rSearch)
break;
@@ -577,10 +577,10 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
}
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
- USHORT i = 0xFFFF;
+ sal_uInt16 i = 0xFFFF;
while (++i < Count())
if (((*this)[i]).GetChild() == pPage)
break;
@@ -598,7 +598,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
if (rSearch != rReplace)
{
- USHORT nPos = NODE_NOTFOUND;
+ sal_uInt16 nPos = NODE_NOTFOUND;
ONDXPage* pPage = this;
while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -607,34 +607,34 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
if (pPage)
{
(*pPage)[nPos].GetKey() = rReplace;
- pPage->SetModified(TRUE);
+ pPage->SetModified(sal_True);
}
}
}
// -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
//------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
// -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Remove" );
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
- for (USHORT i = nPos; i < (nCount-1); i++)
+ for (sal_uInt16 i = nPos; i < (nCount-1); i++)
(*this)[i] = (*this)[i+1];
nCount--;
- bModified = TRUE;
+ bModified = sal_True;
}
// -----------------------------------------------------------------------------
--
cgit