summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/dbase
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/dbase')
-rw-r--r--connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx2
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx28
-rw-r--r--connectivity/source/inc/dbase/DIndexColumns.hxx2
-rw-r--r--connectivity/source/inc/dbase/DIndexIter.hxx16
-rw-r--r--connectivity/source/inc/dbase/DIndexPage.hxx2
-rw-r--r--connectivity/source/inc/dbase/DIndexes.hxx2
-rw-r--r--connectivity/source/inc/dbase/DTable.hxx54
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx126
9 files changed, 116 insertions, 118 deletions
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 12fc3ebced..b7e76b3622 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -100,7 +100,7 @@ namespace connectivity
virtual ~ODatabaseMetaDataResultSet();
public:
DECLARE_CTY_DEFAULTS(ODatabaseMetaDataResultSet_BASE);
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ // a Constructor, that is needed for when Returning the Object is needed:
ODatabaseMetaDataResultSet( );
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 3a8adf9b93..fb990b1190 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
@@ -69,7 +69,7 @@ namespace connectivity
void setProceduresMap();
void setTableTypes();
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ // a Constructor, that is needed for when Returning the Object is needed:
ODatabaseMetaDataResultSetMetaData( ODatabaseMetaDataResultSet* _pRes)
: m_nColCount(0)
{
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index c241dce433..0576e84085 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -84,13 +84,13 @@ namespace connectivity
ONDXPageList m_aCollector; // Pool von nicht mehr benoetigten Seiten
ONDXPagePtr m_aRoot, // Wurzel des b+ Baums
m_aCurLeaf; // aktuelles Blatt
- USHORT m_nCurNode; // Position des aktuellen Knoten
+ sal_uInt16 m_nCurNode; // Position des aktuellen Knoten
sal_uInt32 m_nPageCount,
m_nRootPage;
ODbaseTable* m_pTable;
- BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors
+ sal_Bool m_bUseCollector : 1; // Verwenden des GarbageCollectors
::rtl::OUString getCompletePath();
void closeImpl();
@@ -124,31 +124,31 @@ namespace connectivity
sal_uInt32 GetRootPos() {return m_nRootPage;}
sal_uInt32 GetPageCount() {return m_nPageCount;}
- BOOL IsText() const {return m_aHeader.db_keytype == 0;}
- USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;}
+ sal_Bool IsText() const {return m_aHeader.db_keytype == 0;}
+ sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
- virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
- virtual BOOL Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual BOOL Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+ virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
void createINFEntry();
- BOOL CreateImpl();
- BOOL DropImpl();
+ sal_Bool CreateImpl();
+ sal_Bool DropImpl();
DECLARE_SERVICE_INFO();
protected:
- ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, BOOL bLoad = FALSE);
+ ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False);
void Collect(ONDXPage*);
ONDXPagePtr getRoot();
sal_Bool isUnique() const { return m_IsUnique; }
- BOOL UseCollector() const {return m_bUseCollector;}
+ sal_Bool UseCollector() const {return m_bUseCollector;}
// Tree operationen
void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
- void Release(BOOL bSave = TRUE);
- BOOL ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
+ void Release(sal_Bool bSave = sal_True);
+ sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
};
SvStream& operator << (SvStream &rStream, ODbaseIndex&);
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index d967cd878d..247c878580 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -49,7 +49,7 @@ namespace connectivity
ODbaseIndexColumns( ODbaseIndex* _pIndex,
::osl::Mutex& _rMutex,
const TStringVector &_rVector)
- : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
, m_pIndex(_pIndex)
{}
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index cbc520a7e7..81ff212d4d 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -48,14 +48,14 @@ namespace connectivity
ODbaseIndex* m_pIndex;
ONDXPagePtr m_aRoot,
m_aCurLeaf;
- USHORT m_nCurNode;
+ sal_uInt16 m_nCurNode;
protected:
- ULONG Find(BOOL bFirst);
- ULONG GetCompare(BOOL bFirst);
- ULONG GetLike(BOOL bFirst);
- ULONG GetNull(BOOL bFirst);
- ULONG GetNotNull(BOOL bFirst);
+ sal_uIntPtr Find(sal_Bool bFirst);
+ sal_uIntPtr GetCompare(sal_Bool bFirst);
+ sal_uIntPtr GetLike(sal_Bool bFirst);
+ sal_uIntPtr GetNull(sal_Bool bFirst);
+ sal_uIntPtr GetNotNull(sal_Bool bFirst);
ONDXKey* GetFirstKey(ONDXPage* pPage,
const file::OOperand& rKey);
@@ -76,8 +76,8 @@ namespace connectivity
}
virtual ~OIndexIterator();
- ULONG First();
- ULONG Next();
+ sal_uIntPtr First();
+ sal_uIntPtr Next();
};
}
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 7de170c1ca..2e693765ca 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -31,9 +31,7 @@
#include <rtl/ref.hxx>
#include <tools/stream.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index a2eab66974..c29130d840 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -51,7 +51,7 @@ namespace connectivity
virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
public:
ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
, m_pTable(_pTable)
{}
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 53d89af63a..7f5e59bf6c 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -69,26 +69,26 @@ namespace connectivity
private:
struct DBFHeader { /* Kopfsatz-Struktur */
DBFType db_typ; /* Dateityp */
- BYTE db_aedat[3]; /* Datum der letzen Aenderung */
+ sal_uInt8 db_aedat[3]; /* Datum der letzen Aenderung */
/* JJ MM TT */
sal_uInt32 db_anz; /* Anzahl der Saetze */
- USHORT db_kopf; /* laenge Kopfsatz-Struktur */
- USHORT db_slng; /* laenge der Daten-Saetze */
- BYTE db_frei[20]; /* reserviert */
+ sal_uInt16 db_kopf; /* laenge Kopfsatz-Struktur */
+ sal_uInt16 db_slng; /* laenge der Daten-Saetze */
+ sal_uInt8 db_frei[20]; /* reserviert */
};
struct DBFColumn { /* Feldbezeichner */
- BYTE db_fnm[11]; /* Feldname */
- BYTE db_typ; /* Feldtyp */
- UINT32 db_adr; /* Feldadresse */
- BYTE db_flng; /* Feldlaenge */
- BYTE db_dez; /* Dezimalstellen fuer N */
- BYTE db_frei2[14]; /* reserviert */
+ sal_uInt8 db_fnm[11]; /* Feldname */
+ sal_uInt8 db_typ; /* Feldtyp */
+ sal_uInt32 db_adr; /* Feldadresse */
+ sal_uInt8 db_flng; /* Feldlaenge */
+ sal_uInt8 db_dez; /* Dezimalstellen fuer N */
+ sal_uInt8 db_frei2[14]; /* reserviert */
};
struct DBFMemoHeader
{
DBFMemoType db_typ; /* Dateityp */
- UINT32 db_next; /* naechster freier Block */
- USHORT db_size; /* Blockgroesse: dBase 3 fest */
+ sal_uInt32 db_next; /* naechster freier Block */
+ sal_uInt16 db_size; /* Blockgroesse: dBase 3 fest */
};
::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset
@@ -108,15 +108,15 @@ namespace connectivity
void fillColumns();
String createTempFile();
void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos);
- BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
- BOOL CreateMemoFile(const INetURLObject& aFile);
- BOOL HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
- BOOL ReadMemoHeader();
- BOOL ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable);
-
- BOOL WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr);
- BOOL WriteBuffer();
- BOOL UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
+ sal_Bool CreateMemoFile(const INetURLObject& aFile);
+ sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
+ sal_Bool ReadMemoHeader();
+ sal_Bool ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable);
+
+ sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
+ sal_Bool WriteBuffer();
+ sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
void AllocBuffer();
@@ -162,19 +162,19 @@ namespace connectivity
// XRename
virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- BOOL DropImpl();
- BOOL CreateImpl();
+ sal_Bool DropImpl();
+ sal_Bool CreateImpl();
- virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
- virtual BOOL DeleteRow(const OSQLColumns& _rCols);
- virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+ virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
virtual void dropColumn(sal_Int32 _nPos);
static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL );
- static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
+ static sal_Bool Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
virtual void refreshHeader();
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 41c78aecc7..af5284ca28 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -51,14 +51,14 @@ namespace connectivity
class ONDXKey : public ONDXKey_BASE
{
friend class ONDXNode;
- UINT32 nRecord; /* Satzzeiger */
+ sal_uInt32 nRecord; /* Satzzeiger */
ORowSetValue xValue; /* Schluesselwert */
public:
- ONDXKey(UINT32 nRec=0);
- ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec);
- ONDXKey(const rtl::OUString& aStr, UINT32 nRec = 0);
- ONDXKey(double aVal, UINT32 nRec = 0);
+ ONDXKey(sal_uInt32 nRec=0);
+ ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
+ ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0);
+ ONDXKey(double aVal, sal_uInt32 nRec = 0);
inline ONDXKey(const ONDXKey& rKey);
@@ -67,21 +67,21 @@ namespace connectivity
virtual const ORowSetValue& getValue() const;
- UINT32 GetRecord() const { return nRecord; }
- void setRecord(UINT32 _nRec) { nRecord = _nRec; }
+ sal_uInt32 GetRecord() const { return nRecord; }
+ void setRecord(sal_uInt32 _nRec) { nRecord = _nRec; }
void ResetRecord() { nRecord = 0; }
- BOOL operator == (const ONDXKey& rKey) const;
- BOOL operator != (const ONDXKey& rKey) const;
- BOOL operator < (const ONDXKey& rKey) const;
- BOOL operator <= (const ONDXKey& rKey) const;
- BOOL operator > (const ONDXKey& rKey) const;
- BOOL operator >= (const ONDXKey& rKey) const;
+ sal_Bool operator == (const ONDXKey& rKey) const;
+ sal_Bool operator != (const ONDXKey& rKey) const;
+ sal_Bool operator < (const ONDXKey& rKey) const;
+ sal_Bool operator <= (const ONDXKey& rKey) const;
+ sal_Bool operator > (const ONDXKey& rKey) const;
+ sal_Bool operator >= (const ONDXKey& rKey) const;
- BOOL Load (SvFileStream& rStream, BOOL bText);
- BOOL Write(SvFileStream& rStream, BOOL bText);
+ sal_Bool Load (SvFileStream& rStream, sal_Bool bText);
+ sal_Bool Write(SvFileStream& rStream, sal_Bool bText);
- static BOOL IsText(sal_Int32 eType);
+ static sal_Bool IsText(sal_Int32 eType);
private:
StringCompare Compare(const ONDXKey& rKey) const;
@@ -101,18 +101,18 @@ namespace connectivity
friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
- UINT32 nPagePos; // Position in der Indexdatei
+ sal_uInt32 nPagePos; // Position in der Indexdatei
public:
- ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+ ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
ONDXPagePtr(const ONDXPagePtr& rRef);
ONDXPagePtr(ONDXPage* pRefPage);
ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
ONDXPagePtr& operator=(ONDXPage* pPageRef);
- UINT32 GetPagePos() const {return nPagePos;}
- BOOL HasPage() const {return nPagePos != 0;}
+ sal_uInt32 GetPagePos() const {return nPagePos;}
+ sal_Bool HasPage() const {return nPagePos != 0;}
// sal_Bool Is() const { return isValid(); }
};
//==================================================================
@@ -125,9 +125,9 @@ namespace connectivity
friend SvStream& operator << (SvStream &rStream, const ONDXPage&);
friend SvStream& operator >> (SvStream &rStream, ONDXPage&);
- UINT32 nPagePos; // Position in der Indexdatei
- BOOL bModified : 1;
- USHORT nCount;
+ sal_uInt32 nPagePos; // Position in der Indexdatei
+ sal_Bool bModified : 1;
+ sal_uInt16 nCount;
ONDXPagePtr aParent, // VaterSeite
aChild; // Zeiger auf rechte ChildPage
@@ -136,33 +136,33 @@ namespace connectivity
public:
// Knoten Operationen
- USHORT Count() const {return nCount;}
+ sal_uInt16 Count() const {return nCount;}
- BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
- BOOL Insert(USHORT nIndex, ONDXNode& rNode);
- BOOL Append(ONDXNode& rNode);
- BOOL Delete(USHORT);
- void Remove(USHORT);
- void Release(BOOL bSave = TRUE);
- void ReleaseFull(BOOL bSave = TRUE);
+ sal_Bool Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
+ sal_Bool Insert(sal_uInt16 nIndex, ONDXNode& rNode);
+ sal_Bool Append(ONDXNode& rNode);
+ sal_Bool Delete(sal_uInt16);
+ void Remove(sal_uInt16);
+ void Release(sal_Bool bSave = sal_True);
+ void ReleaseFull(sal_Bool bSave = sal_True);
// Aufteilen und Zerlegen
ONDXNode Split(ONDXPage& rPage);
- void Merge(USHORT nParentNodePos, ONDXPagePtr xPage);
+ void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
// Zugriffsoperationen
- ONDXNode& operator[] (USHORT nPos);
- const ONDXNode& operator[] (USHORT nPos) const;
+ ONDXNode& operator[] (sal_uInt16 nPos);
+ const ONDXNode& operator[] (sal_uInt16 nPos) const;
- BOOL IsRoot() const;
- BOOL IsLeaf() const;
- BOOL IsModified() const;
- BOOL HasParent();
- BOOL HasChild() const;
+ sal_Bool IsRoot() const;
+ sal_Bool IsLeaf() const;
+ sal_Bool IsModified() const;
+ sal_Bool HasParent();
+ sal_Bool HasChild() const;
- BOOL IsFull() const;
+ sal_Bool IsFull() const;
- UINT32 GetPagePos() const {return nPagePos;}
+ sal_uInt32 GetPagePos() const {return nPagePos;}
ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
// Parent braucht nicht nachgeladen zu werden
@@ -174,8 +174,8 @@ namespace connectivity
void SetChild(ONDXPagePtr aCh);
void SetParent(ONDXPagePtr aPa);
- USHORT Search(const ONDXKey& rSearch);
- USHORT Search(const ONDXPage* pPage);
+ sal_uInt16 Search(const ONDXKey& rSearch);
+ sal_uInt16 Search(const ONDXPage* pPage);
void SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
protected:
@@ -184,11 +184,11 @@ namespace connectivity
virtual void QueryDelete();
- void SetModified(BOOL bMod) {bModified = bMod;}
- void SetPagePos(UINT32 nPage) {nPagePos = nPage;}
+ void SetModified(sal_Bool bMod) {bModified = bMod;}
+ void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
- BOOL Find(const ONDXKey&); // rek. Abstieg
- USHORT FindPos(const ONDXKey& rKey) const;
+ sal_Bool Find(const ONDXKey&); // rek. Abstieg
+ sal_uInt16 FindPos(const ONDXKey& rKey) const;
#if OSL_DEBUG_LEVEL > 1
void PrintPage();
@@ -200,11 +200,11 @@ namespace connectivity
SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
- inline BOOL ONDXPage::IsRoot() const {return !aParent.Is();}
- inline BOOL ONDXPage::IsLeaf() const {return !aChild.HasPage();}
- inline BOOL ONDXPage::IsModified() const {return bModified;}
- inline BOOL ONDXPage::HasParent() {return aParent.Is();}
- inline BOOL ONDXPage::HasChild() const {return aChild.HasPage();}
+ inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
+ inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
+ inline sal_Bool ONDXPage::IsModified() const {return bModified;}
+ inline sal_Bool ONDXPage::HasParent() {return aParent.Is();}
+ inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();}
inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -240,7 +240,7 @@ namespace connectivity
:aChild(aPagePtr),aKey(rKey) {}
// verweist der Knoten auf eine Seite
- BOOL HasChild() const {return aChild.HasPage();}
+ sal_Bool HasChild() const {return aChild.HasPage();}
// Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
@@ -257,14 +257,14 @@ namespace connectivity
//==================================================================
// inline implementation
//==================================================================
-// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
// : ONDXKey_BASE(eType)
// , nRecord(nRec),xValue(rVal)
// {
// }
-// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
// ,nRecord(nRec)
// {
@@ -272,14 +272,14 @@ namespace connectivity
// xValue = aStr;
// }
-// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+// inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
// ,nRecord(nRec)
// ,xValue(aVal)
// {
// }
-// inline ONDXKey::ONDXKey(UINT32 nRec)
+// inline ONDXKey::ONDXKey(sal_uInt32 nRec)
// :nRecord(nRec)
// {
// }
@@ -302,29 +302,29 @@ namespace connectivity
return *this;
}
- inline BOOL ONDXKey::operator == (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const
{
if(&rKey == this)
return sal_True;
return Compare(rKey) == COMPARE_EQUAL;
}
- inline BOOL ONDXKey::operator != (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const
{
return !operator== (rKey);
}
- inline BOOL ONDXKey::operator < (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator < (const ONDXKey& rKey) const
{
return Compare(rKey) == COMPARE_LESS;
}
- inline BOOL ONDXKey::operator > (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator > (const ONDXKey& rKey) const
{
return Compare(rKey) == COMPARE_GREATER;
}
- inline BOOL ONDXKey::operator <= (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const
{
return !operator > (rKey);
}
- inline BOOL ONDXKey::operator >= (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const
{
return !operator< (rKey);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:31:50 +0000