diff options
Diffstat (limited to 'connectivity/source/inc/sqlscan.hxx')
| -rw-r--r-- | connectivity/source/inc/sqlscan.hxx | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index 70d23ca6ef67..950a85a264fd 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -2,9 +2,9 @@ * * $RCSfile: sqlscan.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:14:24 $ + * last change: $Author: oj $ $Date: 2000-10-19 11:45:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,13 +63,6 @@ #include <stdarg.h> -#ifndef _DEBUG_HXX //autogen -#include <tools/debug.hxx> -#endif -#ifndef _STRING_HXX //autogen wg. String -#include <tools/string.hxx> -#endif - namespace connectivity { class OParseContext; @@ -81,10 +74,10 @@ namespace connectivity class OSQLScanner { OParseContext* m_pContext; // context for parse, knows all international stuff - ByteString m_sStatement; // statement to parse - String m_sErrorMessage; + ::rtl::OString m_sStatement; // statement to parse + ::rtl::OUString m_sErrorMessage; - xub_StrLen m_nCurrentPos; // next position to read from the statement + 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 @@ -92,27 +85,27 @@ namespace connectivity OSQLScanner(); ~OSQLScanner(); - virtual int SQLyygetc(void); + virtual sal_Int32 SQLyygetc(void); virtual void SQLyyerror(char *fmt); - virtual void output(int) { DBG_ERROR("Internal error in sdblex.l: output not possible"); } - virtual void ECHO(void) { DBG_ERROR("Internal error in sdblex.l: ECHO not possible"); } - virtual int getInternationalTokenID(const char* sToken) const; + 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 sal_Int32 getInternationalTokenID(const char* sToken) const; // setting the new information before scanning - void prepareScan(const String & rNewStatement, OParseContext* pContext, sal_Bool bInternational); - const String& getErrorMessage() const {return m_sErrorMessage;} + void prepareScan(const ::rtl::OUString & rNewStatement, OParseContext* pContext, sal_Bool bInternational); + const ::rtl::OUString& getErrorMessage() const {return m_sErrorMessage;} - int SQLlex(); + sal_Int32 SQLlex(); // set this as scanner for flex void setScanner(sal_Bool _bNull=sal_False); // rules settings - void SetRule(int nRule) {m_nRule = nRule;} - int GetCurrentRule() const; - int GetGERRule() const; - int GetENGRule() const; - int GetSQLRule() const; - int GetDATERule() const; - int GetSTRINGRule() const; + void SetRule(sal_Int32 nRule) {m_nRule = nRule;} + sal_Int32 GetCurrentRule() const; + sal_Int32 GetGERRule() const; + sal_Int32 GetENGRule() const; + sal_Int32 GetSQLRule() const; + sal_Int32 GetDATERule() const; + sal_Int32 GetSTRINGRule() const; }; } |