diff options
Diffstat (limited to 'connectivity/source/inc')
65 files changed, 196 insertions, 224 deletions
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 06be3a5521..90e48efbd6 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -56,6 +56,7 @@ namespace connectivity protected: virtual ~ODatabaseMetaDataResultSetMetaData(); public: + // a Constructor, that is needed for when Returning the Object is needed: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ) : m_nColCount(0) diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index ef2f4e504b..8bee3576a9 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -30,7 +30,7 @@ #include "TResultSetHelper.hxx" #include <rtl/alloc.h> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include "connectivity/dbtoolsdllapi.hxx" @@ -99,7 +99,7 @@ namespace connectivity @return the last position */ inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } - inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } + inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } }; } #endif // CONNECTIVITY_SKIPDELETEDSSET_HXX diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx index 16a4cdeab6..8b46754dfb 100644 --- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx +++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx @@ -44,7 +44,7 @@ namespace connectivity { ::rtl::Reference<OSQLColumns> m_aSelectColumns; public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns); virtual ~OAdabasResultSetMetaData(); diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index 25e41f4bb7..350695e768 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -50,7 +50,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); virtual ~OCallableStatement() {} ; - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx index a31986512e..6716921fcf 100644 --- a/connectivity/source/inc/ado/ACollection.hxx +++ b/connectivity/source/inc/ado/ACollection.hxx @@ -81,7 +81,7 @@ namespace connectivity virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (staruno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ACollection"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ACollection")); } virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(staruno::RuntimeException) { @@ -96,7 +96,7 @@ namespace connectivity virtual staruno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(staruno::RuntimeException) { staruno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Container"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Container")); return aSupported; } diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index fd0d477073..5eadfd82ea 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -122,7 +122,7 @@ namespace connectivity sal_Int32 nHandle ) const; public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: ODatabaseMetaDataResultSet( ADORecordset* _pRecordSet); ~ODatabaseMetaDataResultSet(); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 0f43f47826..ef4e65f4de 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -74,7 +74,7 @@ namespace connectivity void setTypeInfoMap(); void setProceduresMap(); public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: ODatabaseMetaDataResultSetMetaData( ADORecordset* _pRecordSet ,ODatabaseMetaDataResultSet* _pRes) : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()), m_nColCount(m_vMapping.size()-1) diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index b195184225..fbe70b9111 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -29,12 +29,10 @@ #ifndef _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_ #define _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_ - #include "ado/AStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -70,7 +68,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql); virtual void SAL_CALL acquire() throw(); diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 2136c0b255..de5ee8e9ab 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -79,7 +79,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; ::std::vector<OLEVariant> m_aBookmarks; OLEVariant m_aValue; - sal_Int32 m_nRowPos; + ADO_LONGPTR m_nRowPos; sal_Bool m_bWasNull; sal_Bool m_bEOF; sal_Bool m_bOnFirstAfterOpen; @@ -118,7 +118,7 @@ namespace connectivity ) const; virtual ~OResultSet(); public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OResultSet( ADORecordset* _pRecordSet,OStatement_Base* pStmt); OResultSet( ADORecordset* _pRecordSet); diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 16c118a1b0..f0ea845984 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -63,7 +63,7 @@ namespace connectivity protected: virtual ~OResultSetMetaData(); public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OResultSetMetaData( ADORecordset* _pRecordSet); virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 841bcfddc9..44bdf29b08 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -86,7 +86,7 @@ namespace connectivity ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - sal_Int32 m_nMaxRows; + ADO_LONGPTR m_nMaxRows; sal_Int32 m_nFetchSize; LockTypeEnum m_eLockType; CursorTypeEnum m_eCursorType; @@ -182,7 +182,7 @@ namespace connectivity public ::com::sun::star::lang::XServiceInfo { public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OStatement( OConnection* _pConnection) : OStatement_Base( _pConnection){}; ~OStatement(); diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index fe582e1e39..dbfb0a7145 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -190,7 +190,7 @@ namespace connectivity #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTemp("Unknown Item: "); sTemp += ::rtl::OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()); - OSL_ENSURE(0,sTemp); + OSL_FAIL(sTemp); #endif } else diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 8c69f6e91e..63c6d4ac8e 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -36,8 +36,6 @@ #include <ocidl.h> #include <adoint.h> #include "ado_post_sys_include.h" - - #include "ado/adoimp.hxx" #include "ado/Aolewrap.hxx" #include "ado/Aolevariant.hxx" @@ -75,53 +73,36 @@ namespace connectivity WpADOProperties get_Properties() const; rtl::OUString GetConnectionString() const; - sal_Bool PutConnectionString(const ::rtl::OUString &aCon) const; - sal_Int32 GetCommandTimeout() const; - void PutCommandTimeout(sal_Int32 nRet); - sal_Int32 GetConnectionTimeout() const ; - void PutConnectionTimeout(sal_Int32 nRet); sal_Bool Close( ) ; - sal_Bool Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); - sal_Bool BeginTrans(); - sal_Bool CommitTrans( ) ; - sal_Bool RollbackTrans( ); - sal_Bool Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options); - sal_Bool GetErrors(ADOErrors** pErrors); ::rtl::OUString GetDefaultDatabase() const; - sal_Bool PutDefaultDatabase(const ::rtl::OUString& _bstr); IsolationLevelEnum get_IsolationLevel() const ; - sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ; sal_Int32 get_Attributes() const; - sal_Bool put_Attributes(sal_Int32 nRet); CursorLocationEnum get_CursorLocation() const; - sal_Bool put_CursorLocation(const CursorLocationEnum &eNum) ; ConnectModeEnum get_Mode() const; - sal_Bool put_Mode(const ConnectModeEnum &eNum) ; ::rtl::OUString get_Provider() const; - sal_Bool put_Provider(const ::rtl::OUString& _bstr); sal_Int32 get_State() const; @@ -223,9 +204,7 @@ namespace connectivity ////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDescription() const; - ::rtl::OUString GetSource() const ; - sal_Int32 GetNumber() const ; ::rtl::OUString GetSQLState() const ; sal_Int32 GetNativeError() const ; @@ -336,7 +315,7 @@ namespace connectivity sal_Bool Cancel() const; sal_Int32 get_State( ); sal_Bool Supports( /* [in] */ CursorOptionEnum CursorOptions); - PositionEnum get_AbsolutePosition(); + PositionEnum_Param get_AbsolutePosition(); void GetDataSource(IUnknown** pIUnknown) const ; void PutRefDataSource(IUnknown* pIUnknown); void GetBookmark(VARIANT& var); @@ -358,9 +337,9 @@ namespace connectivity sal_Bool CancelUpdate(); WpADOProperties get_Properties() const; sal_Bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset); - sal_Bool get_RecordCount(sal_Int32 &_nRet) const; - sal_Bool get_MaxRecords(sal_Int32 &_nRet) const; - sal_Bool put_MaxRecords(sal_Int32 _nRet); + sal_Bool get_RecordCount(ADO_LONGPTR &_nRet) const; + sal_Bool get_MaxRecords(ADO_LONGPTR &_nRet) const; + sal_Bool put_MaxRecords(ADO_LONGPTR _nRet); sal_Bool get_CursorType(CursorTypeEnum &_nRet) const; sal_Bool put_CursorType(CursorTypeEnum _nRet); sal_Bool get_LockType(LockTypeEnum &_nRet) const; 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); } diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h index 5ce8b47b78..5ce8b47b78 100644..100755 --- a/connectivity/source/inc/diagnose_ex.h +++ b/connectivity/source/inc/diagnose_ex.h diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index 409b184b08..45032d2324 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -50,7 +50,7 @@ namespace connectivity OColumns( OFileTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector - ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) + ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) ,m_pTable(_pTable) {} }; diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 069261a585..bdbed49615 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -34,7 +34,6 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include "file/FResultSet.hxx" @@ -69,7 +68,7 @@ namespace connectivity void checkAndResizeParameters(sal_Int32 parameterIndex); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); - UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, + sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); @@ -81,7 +80,7 @@ namespace connectivity virtual ~OPreparedStatement(); public: DECLARE_SERVICE_INFO(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OPreparedStatement( OConnection* _pConnection); virtual void construct(const ::rtl::OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 3e82fa6e5f..b4fca35761 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -151,13 +151,13 @@ namespace connectivity void construct(); sal_Bool evaluate(); - BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, - INT32 nOffset = 1, - BOOL bEvaluate = TRUE, - BOOL bRetrieveData = TRUE); + sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition, + sal_Int32 nOffset = 1, + sal_Bool bEvaluate = sal_True, + sal_Bool bRetrieveData = sal_True); OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow); - BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;} + sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;} // return true when the select statement is "select count(*) from table" inline sal_Bool isCount() const { return m_bIsCount; } @@ -172,7 +172,7 @@ namespace connectivity using OResultSet_BASE::rBHelper; - BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData); + sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData); virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex); // OPropertyArrayUsageHelper @@ -183,7 +183,7 @@ namespace connectivity virtual ~OResultSet(); public: DECLARE_SERVICE_INFO(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() @@ -285,7 +285,7 @@ namespace connectivity // special methods inline sal_Int32 mapColumn(sal_Int32 column); - virtual BOOL OpenImpl(); + virtual sal_Bool OpenImpl(); virtual void doTableSpecials(const OSQLTable& _xTable); inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index 35dfde4012..0ec97d7027 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -56,7 +56,7 @@ namespace connectivity protected: virtual ~OResultSetMetaData(); public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); /// Avoid ambigous cast error from the compiler. diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index bee5efef19..3c300f0ff4 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -135,8 +135,8 @@ namespace connectivity void GetAssignValues(); void SetAssignValue(const String& aColumnName, const String& aValue, - BOOL bSetNull = FALSE, - UINT32 nParameter=SQL_NO_PARAMETER); + sal_Bool bSetNull = sal_False, + sal_uInt32 nParameter=SQL_NO_PARAMETER); void ParseAssignValues( const ::std::vector< String>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex); @@ -204,7 +204,7 @@ namespace connectivity // factory method for resultset's virtual OResultSet* createResultSet(); public: - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){} DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index d9a9d395cc..afb95ec49a 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -86,9 +86,9 @@ namespace connectivity virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0; ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;} - 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); // refresh the header of file based tables to see changes done by someone diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index f2aa5c9f48..4c649f3946 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -47,7 +47,7 @@ namespace connectivity virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) + const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index c6f45df023..1731ac829d 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -82,9 +82,9 @@ namespace connectivity void dispose(); void start(OSQLParseNode* pSQLParseNode); void clean(); - virtual BOOL hasRestriction() const; - virtual BOOL hasFunctions() const; - inline BOOL evaluateRestriction() { return m_aInterpreter->start(); } + virtual sal_Bool hasRestriction() const; + virtual sal_Bool hasFunctions() const; + inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const OFileColumns& rCols); virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos, diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index be00efaac1..ed0f7586b1 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -110,7 +110,7 @@ namespace connectivity inline void startSelection(ORowSetValueDecoratorRef& _rVal) { - return evaluateSelection(m_rCompiler->m_aCodeList,_rVal); + evaluateSelection(m_rCompiler->m_aCodeList,_rVal); } diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index e70da81520..7e93db0e62 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.hxx @@ -39,6 +39,7 @@ namespace connectivity class OFlatConnection : public file::OConnection { private: + sal_Int32 m_nMaxRowsToScan; sal_Bool m_bHeaderLine; // column names in first row sal_Unicode m_cFieldDelimiter; // look at the name sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter @@ -56,6 +57,7 @@ namespace connectivity inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} + inline sal_Int32 getMaxRowsToScan() const { return m_nMaxRowsToScan;} // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 9702070c23..912f11845e 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -34,6 +34,7 @@ #include "connectivity/CommonTools.hxx" #include <tools/urlobj.hxx> #include "file/quotedstring.hxx" +#include <unotools/syslocale.hxx> namespace connectivity { @@ -66,8 +67,11 @@ namespace connectivity bool m_bNeedToReadLine; private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); - BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo); + sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo); sal_Bool readLine(sal_Int32& _rnCurrentPos); + void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2 + ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName + ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass& aCharClass); public: virtual void refreshColumns(); diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 50e825c097..5c86cf9dee 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -135,7 +135,7 @@ namespace connectivity /** retrieves the icon for HSQL TEXT TABLEs */ ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > - impl_getTextTableIcon_nothrow( ::sal_Int32 _ColorMode ); + impl_getTextTableIcon_nothrow(); }; //========================================================================== diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h index 01d42a8f38..01d42a8f38 100644..100755 --- a/connectivity/source/inc/hsqldb/HStorageAccess.h +++ b/connectivity/source/inc/hsqldb/HStorageAccess.h diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h index c99a16f6df..c99a16f6df 100644..100755 --- a/connectivity/source/inc/hsqldb/StorageFileAccess.h +++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h index 2c635de5a1..2c635de5a1 100644..100755 --- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h +++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index 5fdb5a5abb..d813e7c821 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.hxx @@ -34,7 +34,7 @@ namespace connectivity { - + //************************************************************** //************ Class: java.io.InputStream //************************************************************** @@ -42,12 +42,12 @@ namespace connectivity public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> { protected: - // statische Daten fuer die Klasse + // statische Data for the class static jclass theClass; virtual ~java_io_InputStream(); public: - virtual jclass getMyClass() const; - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + virtual jclass getMyClass() const; + // a Constructor, that is needed for when Returning the Object is needed: java_io_InputStream( JNIEnv * pEnv, jobject myObj ); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 74235ff5d3..9afaa703b5 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.hxx @@ -42,13 +42,12 @@ namespace connectivity public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> { protected: - // statische Daten fuer die Klasse + // static Data for the Class static jclass theClass; virtual ~java_io_Reader(); public: virtual jclass getMyClass() const; - - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_io_Reader( JNIEnv * pEnv, jobject myObj ); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx index 4c036bdf18..9b7adff443 100644 --- a/connectivity/source/inc/java/lang/Boolean.hxx +++ b/connectivity/source/inc/java/lang/Boolean.hxx @@ -37,12 +37,12 @@ namespace connectivity class java_lang_Boolean : public java_lang_Object { protected: - // statische Daten fuer die Klasse + // static Data for the class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_lang_Boolean(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} static jclass st_getMyClass(); diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx index b0ce998314..3c4f3c0b8d 100644 --- a/connectivity/source/inc/java/lang/Class.hxx +++ b/connectivity/source/inc/java/lang/Class.hxx @@ -37,18 +37,18 @@ namespace connectivity class java_lang_Class : public java_lang_Object { protected: - // statische Daten fuer die Klasse + // static Data for the Class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_lang_Class(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_lang_Class( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} static java_lang_Class * forName( const ::rtl::OUString &_par0 ); // return the jre object jobject newInstanceObject(); - + }; } diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx index 2eb76b5aef..37a0b2cb2c 100644 --- a/connectivity/source/inc/java/lang/Exception.hxx +++ b/connectivity/source/inc/java/lang/Exception.hxx @@ -38,12 +38,12 @@ namespace connectivity //************************************************************** class java_lang_Exception : public java_lang_Throwable{ protected: - // statische Daten fuer die Klasse + // statis Data for the class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_lang_Exception(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_lang_Exception( JNIEnv * pEnv, jobject myObj ) : java_lang_Throwable( pEnv, myObj ){} }; diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index b017163de7..fe3fa4c254 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -28,10 +28,7 @@ #ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ #define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ -#if STLPORT_VERSION>=321 -// jni.h needs cstdarg for std::va_list #include <cstdarg> -#endif #include <osl/thread.h> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx index f39664e77b..61be6699cf 100644 --- a/connectivity/source/inc/java/lang/String.hxx +++ b/connectivity/source/inc/java/lang/String.hxx @@ -35,12 +35,12 @@ namespace connectivity class java_lang_String : public java_lang_Object { protected: - // statische Daten fuer die Klasse + // statis Data for the Class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_lang_String(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} operator ::rtl::OUString(); diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx index 9915adbea7..3d837eb711 100644 --- a/connectivity/source/inc/java/lang/Throwable.hxx +++ b/connectivity/source/inc/java/lang/Throwable.hxx @@ -38,12 +38,12 @@ namespace connectivity class java_lang_Throwable : public java_lang_Object { protected: - // statische Daten fuer die Klasse + // static Data for the class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_lang_Throwable(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_lang_Throwable( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} ::rtl::OUString getMessage() const; ::rtl::OUString getLocalizedMessage() const; diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx index 39f02eca41..49a47b4585 100644 --- a/connectivity/source/inc/java/math/BigDecimal.hxx +++ b/connectivity/source/inc/java/math/BigDecimal.hxx @@ -36,12 +36,12 @@ namespace connectivity { class java_math_BigDecimal : public java_lang_Object { - // statische Daten fuer die Klasse + // static Data for the class static jclass theClass; public: virtual jclass getMyClass() const; virtual ~java_math_BigDecimal(); - // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: + // a Constructor, that is needed for when Returning the Object is needed: java_math_BigDecimal( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} java_math_BigDecimal( const ::rtl::OUString& _par0 ); diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 0e3932cfc2..f27789f6df 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -31,7 +31,6 @@ #include "java/sql/JStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index ce3908fb47..b9780c34c5 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -42,7 +42,7 @@ namespace connectivity class java_sql_Date : public java_util_Date { protected: - // statische Daten fuer die Klasse + // static data for the class static jclass theClass; public: virtual jclass getMyClass() const; @@ -63,7 +63,7 @@ namespace connectivity class java_sql_Time : public java_util_Date { protected: - // statische Daten fuer die Klasse + // static data for the class static jclass theClass; public: virtual jclass getMyClass() const; @@ -81,7 +81,7 @@ namespace connectivity class java_sql_Timestamp : public java_util_Date { protected: - // statische Daten fuer die Klasse + // static data for the class static jclass theClass; public: virtual jclass getMyClass() const; @@ -91,8 +91,6 @@ namespace connectivity java_sql_Timestamp( const ::com::sun::star::util::DateTime& _rOut); operator ::com::sun::star::util::DateTime(); - sal_Int32 getNanos(); - void setNanos(sal_Int32 n); static jclass st_getMyClass(); }; } diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index 7924edba02..eec4b99c0f 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -73,15 +73,15 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > Map2XNameAccess(JNIEnv *pEnv,jobject _pMap); jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & _rMap); - /** return if a exception occured + /** return if a exception occurred @param pEnv The native java env @param _bClear <TRUE/> if the execption should be cleared @return - <TRUE/> if an exception is occured + <TRUE/> if an exception is occurred */ - sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear); + sal_Bool isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear); jobject createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); jobject createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length); diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index c5874e61a8..eefbd7bd7b 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -30,7 +30,7 @@ #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_ #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_ -#if defined(WIN) || defined(WNT) +#if defined(WNT) #ifdef _MSC_VER #pragma warning(push) @@ -107,13 +107,11 @@ #define SQL_FETCH_PRIOR SQL_FETCH_PREV #define SQL_NO_TOTAL (-4) -// #include "odbc3defs.hxx" - #endif // In der ODBC.H von Watcom werden Strings als char * erwartet // (nicht, wie sonst bei ODBC ueblich, als UCHAR *). -#if defined( ICC ) || defined( WTC ) +#if defined( ICC ) #define SDB_ODBC_CHAR unsigned char #else #define SDB_ODBC_CHAR char diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc index edceb2658c..edceb2658c 100644..100755 --- a/connectivity/source/inc/resource/adabas_res.hrc +++ b/connectivity/source/inc/resource/adabas_res.hrc diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index 115936ea37..115936ea37 100644..100755 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc index fbb86e5fa4..fbb86e5fa4 100644..100755 --- a/connectivity/source/inc/resource/calc_res.hrc +++ b/connectivity/source/inc/resource/calc_res.hrc diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index 543231c4e1..543231c4e1 100644..100755 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc index 45f8399259..45f8399259 100644..100755 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ b/connectivity/source/inc/resource/conn_shared_res.hrc diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc index 698f31dd7a..698f31dd7a 100644..100755 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ b/connectivity/source/inc/resource/dbase_res.hrc diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc index 73f6214c24..73f6214c24 100644..100755 --- a/connectivity/source/inc/resource/evoab2_res.hrc +++ b/connectivity/source/inc/resource/evoab2_res.hrc diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc index b5b7b98073..b5b7b98073 100644..100755 --- a/connectivity/source/inc/resource/file_res.hrc +++ b/connectivity/source/inc/resource/file_res.hrc diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc index c2b1f07769..c2b1f07769 100644..100755 --- a/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/connectivity/source/inc/resource/hsqldb_res.hrc diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc index e12e91516a..e12e91516a 100644..100755 --- a/connectivity/source/inc/resource/jdbc_log.hrc +++ b/connectivity/source/inc/resource/jdbc_log.hrc diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc index 789d4a832d..789d4a832d 100644..100755 --- a/connectivity/source/inc/resource/kab_res.hrc +++ b/connectivity/source/inc/resource/kab_res.hrc diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc index fca426111c..fca426111c 100644..100755 --- a/connectivity/source/inc/resource/macab_res.hrc +++ b/connectivity/source/inc/resource/macab_res.hrc diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index 30aaa791f7..30aaa791f7 100644..100755 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index b9b482c241..6456711f3a 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -64,8 +64,8 @@ namespace connectivity virtual sal_Int32 SQLyygetc(void); virtual void SQLyyerror(char *fmt); - virtual void output(sal_Int32) { OSL_ASSERT("Internal error in sdblex.l: output not possible"); } - virtual void ECHO(void) { OSL_ASSERT("Internal error in sdblex.l: ECHO not possible"); } + virtual void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } + virtual void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } virtual IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; // setting the new information before scanning |