#97230# new interface for ParseContext

6 files changed, 47 insertions, 26 deletions

diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index 1ee226122b9d..09dcd2863bd2 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtfactory.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-13 14:54:24 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,9 +134,9 @@ namespace connectivity
     }
 
     //----------------------------------------------------------------
-    ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory) const
+    ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext) const
     {
-        return new OSimpleSQLParser(_rxServiceFactory);
+        return new OSimpleSQLParser(_rxServiceFactory,_pContext);
     }
 
 //........................................................................
@@ -146,6 +146,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/08/13 14:54:24  fs
+ *  #90761# +createCharsetHelper
+ *
  *  Revision 1.1  2001/07/25 13:28:12  fs
  *  initial checkin - main factory for load-on-demand usage of DBTOOLS
  *
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index 745a2cebe3b5..21d56e64784c 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtfactory.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-13 14:54:24 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,7 +90,8 @@ namespace connectivity
 
         // IDataAccessToolsFactory
         virtual ::rtl::Reference< simple::ISQLParser >  createSQLParser(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory,
+            const IParseContext* _pContext
         ) const;
 
         virtual ::rtl::Reference< simple::IDataAccessCharSet > createCharsetHelper( ) const;
@@ -113,6 +114,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/08/13 14:54:24  fs
+ *  #90761# +createCharsetHelper
+ *
  *  Revision 1.1  2001/07/25 13:28:19  fs
  *  initial checkin - main factory for load-on-demand usage of DBTOOLS
  *
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 5ca0b1f53d04..a51d3f839d39 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parsenode_s.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-25 13:29:09 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,17 +111,17 @@ namespace connectivity
     }
 
     //----------------------------------------------------------------
-    void OSimpleParseNode::parseNodeToStr(::rtl::OUString& _rString, const Reference< XDatabaseMetaData >& _rxMeta) const
+    void OSimpleParseNode::parseNodeToStr(::rtl::OUString& _rString, const Reference< XDatabaseMetaData >& _rxMeta,const IParseContext* _pContext) const
     {
-        m_pFullNode->parseNodeToStr(_rString, _rxMeta);
+        m_pFullNode->parseNodeToStr(_rString, _rxMeta,_pContext);
     }
 
     //----------------------------------------------------------------
     void OSimpleParseNode::parseNodeToPredicateStr(::rtl::OUString& _rString, const Reference< XDatabaseMetaData >& _rxMeta,
         const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField,
-        const Locale& _rIntl, const sal_Char _cDecSeparator) const
+        const Locale& _rIntl, const sal_Char _cDecSeparator,const IParseContext* _pContext) const
     {
-        m_pFullNode->parseNodeToPredicateStr(_rString, _rxMeta, _rxFormatter, _rxField, _rIntl, _cDecSeparator);
+        m_pFullNode->parseNodeToPredicateStr(_rString, _rxMeta, _rxFormatter, _rxField, _rIntl, _cDecSeparator,_pContext);
     }
 
 //........................................................................
@@ -131,6 +131,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2001/07/25 13:29:09  fs
+ *  initial checkin - main factory for load-on-demand usage of OSQLParseNode
+ *
  *
  *  Revision 1.0 24.07.01 16:32:42  fs
  ************************************************************************/
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 7da7692a2438..938ca190b963 100644
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parsenode_s.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-25 13:29:15 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,8 @@ namespace connectivity
 
         // ISQLParseNode
         virtual void parseNodeToStr(::rtl::OUString& _rString,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMeta,
+            const IParseContext* _pContext
         ) const;
 
         virtual void parseNodeToPredicateStr(::rtl::OUString& _rString,
@@ -100,7 +101,8 @@ namespace connectivity
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField,
             const ::com::sun::star::lang::Locale& _rIntl,
-            const sal_Char _cDecSeparator
+            const sal_Char _cDecSeparator,
+            const IParseContext* _pContext
         ) const;
 
         // disambiguate IReference
@@ -117,6 +119,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2001/07/25 13:29:15  fs
+ *  initial checkin - main factory for load-on-demand usage of OSQLParseNode
+ *
  *
  *  Revision 1.0 24.07.01 16:32:42  fs
  ************************************************************************/
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index 5270f7085d92..3f793a198f42 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parser_s.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-06 07:34:54 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,8 @@ namespace connectivity
     //= OSimpleSQLParser
     //================================================================
     //----------------------------------------------------------------
-    OSimpleSQLParser::OSimpleSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory)
-        :m_aFullParser(_rxServiceFactory)
+    OSimpleSQLParser::OSimpleSQLParser(const Reference< XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext)
+        :m_aFullParser(_rxServiceFactory,_pContext)
     {
     }
 
@@ -101,7 +101,7 @@ namespace connectivity
     }
 
     //----------------------------------------------------------------
-    const OParseContext& OSimpleSQLParser::getContext() const
+    const IParseContext& OSimpleSQLParser::getContext() const
     {
         return m_aFullParser.getContext();
     }
@@ -124,6 +124,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/08/06 07:34:54  fs
+ *  #90560# no OSimpleParseNode if we do not have a OSQLParseNode
+ *
  *  Revision 1.1  2001/07/25 13:28:40  fs
  *  initial checkin - main factory for load-on-demand usage of OSQLParser
  *
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index aabfa0c305bb..2110884fd0c5 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parser_s.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-25 13:28:46 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:14:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,7 +88,7 @@ namespace connectivity
         OSQLParser      m_aFullParser;
 
     public:
-        OSimpleSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory);
+        OSimpleSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext);
 
         // ISQLParser
         virtual ::rtl::Reference< simple::ISQLParseNode > predicateTree(
@@ -98,7 +98,7 @@ namespace connectivity
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField
         ) const;
 
-        virtual const OParseContext& getContext() const;
+        virtual const IParseContext& getContext() const;
 
         // disambiguate IReference
         virtual oslInterlockedCount SAL_CALL acquire();
@@ -114,6 +114,9 @@ namespace connectivity
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2001/07/25 13:28:46  fs
+ *  initial checkin - main factory for load-on-demand usage of OSQLParser
+ *
  *
  *  Revision 1.0 24.07.01 16:32:42  fs
  ************************************************************************/