diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:58:58 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:58:58 +0000 |
commit | 1344bda0d561e287edfe9393300c27f6cccdc482 (patch) | |
tree | 42ebea006710d288e002687ecf3008fe498333f0 /connectivity/source/inc/sqlscan.hxx | |
parent | d18331401a64652f41d9fae63a8e0920d6059191 (diff) |
INTEGRATION: CWS warnings01 (1.7.30); FILE MERGED
2005/11/16 12:59:23 fs 1.7.30.1: #i57457# warning free code
Diffstat (limited to 'connectivity/source/inc/sqlscan.hxx')
-rw-r--r-- | connectivity/source/inc/sqlscan.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index ad45baf158..ca04f4be0b 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sqlscan.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:41:23 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:58:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,14 +49,14 @@ namespace connectivity /** Scanner for SQL92 */ class OSQLScanner - { + { const IParseContext* m_pContext; // context for parse, knows all international stuff ::rtl::OString m_sStatement; // statement to parse - ::rtl::OUString m_sErrorMessage; - + ::rtl::OUString m_sErrorMessage; + sal_Int32 m_nCurrentPos; // next position to read from the statement - sal_Bool m_bInternational; // do we have a statement which may uses - sal_Int32 m_nRule; // rule to be set + sal_Bool m_bInternational; // do we have a statement which may uses + sal_Int32 m_nRule; // rule to be set public: OSQLScanner(); @@ -64,11 +64,11 @@ namespace connectivity inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW( () ) { return _pHint; } inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) { } virtual sal_Int32 SQLyygetc(void); @@ -76,7 +76,7 @@ namespace connectivity 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 IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; - + // setting the new information before scanning void prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, sal_Bool bInternational); const ::rtl::OUString& getErrorMessage() const {return m_sErrorMessage;} |