make parseContext const

6 files changed, 34 insertions, 34 deletions

diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index ce642ce4fe19..457c3f6a19b1 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlnode.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2001-01-09 13:11:07 $
+ *  last change: $Author: oj $ $Date: 2001-02-14 10:30:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -287,7 +287,7 @@ namespace connectivity
 
         void parseNodeToStr(::rtl::OUString& rString,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta,
-                            OParseContext* pContext = NULL,
+                            const OParseContext* pContext = NULL,
                             sal_Bool _bIntl = sal_False,
                             sal_Bool _bQuote= sal_True) const;
 
@@ -297,7 +297,7 @@ namespace connectivity
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                                      const ::com::sun::star::lang::Locale& rIntl,
                                      sal_Char _cDec,
-                                     OParseContext* pContext = NULL ) const;
+                                     const OParseContext* pContext = NULL ) const;
 
         void parseNodeToPredicateStr(::rtl::OUString& rString,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta,
@@ -305,7 +305,7 @@ namespace connectivity
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField,
                                      const ::com::sun::star::lang::Locale& rIntl,
                                      sal_Char _cDec,
-                                     OParseContext* pContext = NULL ) const;
+                                     const OParseContext* pContext = NULL ) const;
 
         OSQLParseNode* getByRule(OSQLParseNode::Rule eRule) const;
 
@@ -372,7 +372,7 @@ namespace connectivity
                             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField,
                             const ::com::sun::star::lang::Locale& rIntl,
-                            OParseContext* pContext,
+                            const OParseContext* pContext,
                             sal_Bool _bIntl,
                             sal_Bool _bQuote,
                             sal_Char _cDecSep,
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index d2699a1d3d6b..0a3c96e58e2a 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlparse.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: er $ $Date: 2000-10-29 16:47:30 $
+ *  last change: $Author: oj $ $Date: 2001-02-14 10:30:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -190,7 +190,7 @@ namespace connectivity
         static sal_Int32            s_nRefCount;
 
     // informations on the current parse action
-        OParseContext*              m_pContext;
+        const OParseContext*        m_pContext;
         OSQLParseNode*              m_pParseTree;   // result from parsing
         ::com::sun::star::lang::Locale* m_pLocale;      // current locale settings for parsing
         ::rtl::OUString                     m_sFieldName;   // current field name for a predicate
@@ -210,7 +210,7 @@ namespace connectivity
     public:
         // if NULL, a default context will be used
         // the context must live as long as the parser
-        OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory,OParseContext* _pContext = NULL);
+        OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory,const OParseContext* _pContext = NULL);
         ~OSQLParser();
 
         // Parsing an SQLStatement
@@ -227,7 +227,7 @@ namespace connectivity
         const OParseContext& getContext() const {return *m_pContext;}
 
         // TokenIDToStr: Token-Name zu einer Token-Nr.
-        static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, OParseContext* pContext = NULL);
+        static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const OParseContext* pContext = NULL);
 
         // StrToTokenID: Token-Nr. zu einem Token-Namen.
         // static sal_uInt32 StrToTokenID(const ::rtl::OString & rName);
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 950a85a264fd..89e815dbebfa 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlscan.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-19 11:45:18 $
+ *  last change: $Author: oj $ $Date: 2001-02-14 10:27:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,13 +73,13 @@ namespace connectivity
     */
     class OSQLScanner
     {
-        OParseContext*  m_pContext;                 // context for parse, knows all international stuff
-        ::rtl::OString  m_sStatement;               // statement to parse
-        ::rtl::OUString m_sErrorMessage;
+        const OParseContext*    m_pContext;                 // context for parse, knows all international stuff
+        ::rtl::OString          m_sStatement;               // statement to parse
+        ::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_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
 
     public:
         OSQLScanner();
@@ -92,7 +92,7 @@ namespace connectivity
         virtual sal_Int32 getInternationalTokenID(const char* sToken) const;
 
         // setting the new information before scanning
-        void prepareScan(const ::rtl::OUString & rNewStatement, OParseContext* pContext, sal_Bool bInternational);
+        void prepareScan(const ::rtl::OUString & rNewStatement, const OParseContext* pContext, sal_Bool bInternational);
         const ::rtl::OUString& getErrorMessage() const {return m_sErrorMessage;}
 
         sal_Int32 SQLlex();
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 1f99d6d95dd1..9f939d41865e 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,7 +1,7 @@
 %{
 //--------------------------------------------------------------------------
 //
-// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.16 2001-02-06 08:14:11 oj Exp $
+// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.17 2001-02-14 10:29:29 oj Exp $
 //
 // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
 //
@@ -9,7 +9,7 @@
 //	OJ
 //
 // Last change:
-//	$Author: oj $ $Date: 2001-02-06 08:14:11 $ $Revision: 1.16 $
+//	$Author: oj $ $Date: 2001-02-14 10:29:29 $ $Revision: 1.17 $
 //
 // Description:
 //
@@ -3168,7 +3168,7 @@ OSQLScanner*		OSQLParser::s_pScanner = 0;
 OSQLParseNodes*		OSQLParser::s_pGarbageCollector = 0;
 
 //-----------------------------------------------------------------------------
-OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory,OParseContext* _pContext)
+OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory,const OParseContext* _pContext)
 		   :m_pContext(_pContext)
 		   ,m_pParseTree(NULL)
 		   ,m_pLocale(NULL)
@@ -3424,7 +3424,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const :
 }
 
 //-----------------------------------------------------------------------------
-::rtl::OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, OParseContext* pContext)
+::rtl::OString OSQLParser::TokenIDToStr(sal_uInt32 nTokenID, const OParseContext* pContext)
 {
 	::rtl::OString aStr;
 	if (pContext)
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index dfb9c099fe3f..57b03357f30b 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -2,7 +2,7 @@
 
 //--------------------------------------------------------------------------
 //
-// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.6 2001-01-30 16:04:46 oj Exp $
+// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.7 2001-02-14 10:29:29 oj Exp $
 //
 // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
 //
@@ -10,7 +10,7 @@
 //	OJ
 //
 // Last change:
-//	$Author: oj $ $Date: 2001-01-30 16:04:46 $ $Revision: 1.6 $
+//	$Author: oj $ $Date: 2001-02-14 10:29:29 $ $Revision: 1.7 $
 //
 // Description:
 //
@@ -574,7 +574,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
 }
 
 //------------------------------------------------------------------------------
-void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, OParseContext* pContext, sal_Bool bInternational)
+void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const OParseContext* pContext, sal_Bool bInternational)
 {
 	BEGIN(m_nRule);
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 7b1312c91473..2d9603392884 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sqlnode.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-01 13:27:28 $
+ *  last change: $Author: oj $ $Date: 2001-02-14 10:29:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -359,7 +359,7 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode)
 //-----------------------------------------------------------------------------
 void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString,
                                    const Reference< XDatabaseMetaData > & xMeta,
-                                   OParseContext* pContext,
+                                   const OParseContext* pContext,
                                    sal_Bool _bIntl,
                                    sal_Bool _bQuote) const
 {
@@ -374,7 +374,7 @@ void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString,
                                               const Reference< XNumberFormatter > & xFormatter,
                                               const ::com::sun::star::lang::Locale& rIntl,
                                               sal_Char _cDec,
-                                              OParseContext* pContext ) const
+                                              const OParseContext* pContext ) const
 {
 
     OSL_ENSHURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
@@ -390,7 +390,7 @@ void OSQLParseNode::parseNodeToPredicateStr(::rtl::OUString& rString,
                                               const Reference< XPropertySet > & _xField,
                                               const ::com::sun::star::lang::Locale& rIntl,
                                               sal_Char _cDec,
-                                              OParseContext* pContext ) const
+                                              const OParseContext* pContext ) const
 {
 
     OSL_ENSHURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!");
@@ -405,7 +405,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString,
                       const Reference< XNumberFormatter > & xFormatter,
                       const Reference< XPropertySet > & _xField,
                       const ::com::sun::star::lang::Locale& rIntl,
-                      OParseContext* pContext,
+                      const OParseContext* pContext,
                       sal_Bool _bIntl,
                       sal_Bool _bQuote,
                       sal_Char _cDecSep,
@@ -583,7 +583,7 @@ void OSQLParseNode::parseNodeToStr(::rtl::OUString& rString, const SQLParseNodeP
                     rString += ::rtl::OUString::createFromAscii(" ");
 
                 rString += ::rtl::OUString::createFromAscii(
-                            OSQLParser::TokenIDToStr(m_nNodeID, &const_cast<OParseContext&>(rParam.rContext)).getStr());
+                            OSQLParser::TokenIDToStr(m_nNodeID, &rParam.rContext).getStr());
             }   break;
             case SQL_NODE_STRING:
                 if (rString.getLength())