#97230# new interface for ParseContext

7 files changed, 45 insertions, 54 deletions

diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc
index 68708583256d..9f3bd036f2c6 100644
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ b/dbaccess/source/ui/inc/dbu_qry.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_qry.hrc,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 07:24:58 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,38 +92,27 @@
 #define STR_QUERY_HANDLETEXT                RID_STR_QRY_START + 23
 #define STR_QUERY_FALSE                     RID_STR_QRY_START + 24
 #define STR_QUERY_TRUE                      RID_STR_QRY_START + 25
-#define STR_SVT_SQL_INTERNATIONAL           RID_STR_QRY_START + 26
+#define STR_QRY_TOO_MANY_COLUMNS            RID_STR_QRY_START + 26
 #define STR_SVT_SQL_SYNTAX_ERROR            RID_STR_QRY_START + 27
-#define STR_SVT_SQL_SYNTAX_ERROR_BEFORE     RID_STR_QRY_START + 28
-#define STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE    RID_STR_QRY_START + 29
-#define STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE    RID_STR_QRY_START + 30
-#define STR_SVT_SQL_SYNTAX_NO_NUM           RID_STR_QRY_START + 31
-#define STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID  RID_STR_QRY_START + 32
-#define STR_SVT_SQL_SYNTAX_INT_NO_VALID     RID_STR_QRY_START + 33
-#define STR_SVT_SQL_SYNTAX_REAL_NO_VALID    RID_STR_QRY_START + 34
-#define STR_SVT_SQL_SYNTAX_REAL_NO_INT      RID_STR_QRY_START + 35
-#define STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE  RID_STR_QRY_START + 36
-#define STR_SVT_SQL_SYNTAX_TABLE            RID_STR_QRY_START + 37
-#define STR_SVT_SQL_SYNTAX_COLUMN           RID_STR_QRY_START + 38
-#define STR_QUERYDESIGN_NO_VIEW_SUPPORT     RID_STR_QRY_START + 39
-#define STR_QUERYDESIGN_NO_VIEW_ASK         RID_STR_QRY_START + 40
-#define STR_QRY_NOSELECT                    RID_STR_QRY_START + 41
-#define STR_QRY_COLUMN_NOT_FOUND            RID_STR_QRY_START + 42
-#define STR_QRY_JOIN_COLUMN_COMPARE         RID_STR_QRY_START + 43
-#define STR_QRY_LIKE_LEFT_NO_COLUMN         RID_STR_QRY_START + 44
-#define STR_QRY_CHECK_CASESENSITIVE         RID_STR_QRY_START + 45
-#define STR_QUERY_UNDO_TABFIELDMOVED        RID_STR_QRY_START + 46
-#define STR_QRY_ILLEGAL_JOIN                RID_STR_QRY_START + 47
-#define STR_QRY_TOO_LONG_STATEMENT          RID_STR_QRY_START + 48
-#define STR_QRY_SYNTAX                      RID_STR_QRY_START + 49
-#define STR_QRY_NATIVE                      RID_STR_QRY_START + 50
-#define STR_QRY_TOO_MANY_TABLES             RID_STR_QRY_START + 51
-#define STR_QRY_TOOMANYCOND                 RID_STR_QRY_START + 52
-#define STR_QRY_TOO_MANY_COLUMNS            RID_STR_QRY_START + 53
+#define STR_QUERYDESIGN_NO_VIEW_SUPPORT     RID_STR_QRY_START + 28
+#define STR_QUERYDESIGN_NO_VIEW_ASK         RID_STR_QRY_START + 29
+#define STR_QRY_NOSELECT                    RID_STR_QRY_START + 30
+#define STR_QRY_COLUMN_NOT_FOUND            RID_STR_QRY_START + 31
+#define STR_QRY_JOIN_COLUMN_COMPARE         RID_STR_QRY_START + 32
+#define STR_QRY_LIKE_LEFT_NO_COLUMN         RID_STR_QRY_START + 33
+#define STR_QRY_CHECK_CASESENSITIVE         RID_STR_QRY_START + 34
+#define STR_QUERY_UNDO_TABFIELDMOVED        RID_STR_QRY_START + 35
+#define STR_QRY_ILLEGAL_JOIN                RID_STR_QRY_START + 36
+#define STR_QRY_TOO_LONG_STATEMENT          RID_STR_QRY_START + 37
+#define STR_QRY_SYNTAX                      RID_STR_QRY_START + 38
+#define STR_QRY_NATIVE                      RID_STR_QRY_START + 39
+#define STR_QRY_TOO_MANY_TABLES             RID_STR_QRY_START + 40
+#define STR_QRY_TOOMANYCOND                 RID_STR_QRY_START + 41
+
 
 // please adjust checking before insert new strings
 
-#if STR_QRY_TOO_MANY_COLUMNS > RID_STR_QRY_END
+#if STR_QRY_TOOMANYCOND > RID_STR_QRY_END
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index f6a48c40e58a..8db49d343097 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paramdialog.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-09 14:45:02 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,8 +99,8 @@
 #ifndef CONNECTIVITY_PREDICATEINPUT_HXX
 #include <connectivity/predicateinput.hxx>
 #endif
-#ifndef DBAUI_QUERYDESIGNCONTEXT_HXX
-#include "ParseContext.hxx"
+#ifndef SVX_QUERYDESIGNCONTEXT_HXX
+#include "svx/ParseContext.hxx"
 #endif
 
 namespace connectivity
@@ -118,7 +118,7 @@ namespace dbaui
     //==================================================================
     class OParameterDialog
             :public ModalDialog
-            ,public OParseContextClient
+            ,public ::svxform::OParseContextClient
     {
     protected:
         // the controls
@@ -185,6 +185,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.4  2002/04/09 14:45:02  fs
+ *  #98181# use a ::dbtools::OPredicateInputController
+ *
  *  Revision 1.3  2001/06/07 15:09:31  fs
  *  #87912# redesigned the dialog
  *
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index fa15302f4a43..89291c49e3ea 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.hxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-09 14:51:27 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,8 +97,8 @@
 #ifndef DBAUI_JOINTABLEVIEW_HXX
 #include "JoinTableView.hxx"
 #endif
-#ifndef DBAUI_QUERYDESIGNCONTEXT_HXX
-#include "ParseContext.hxx"
+#ifndef SVX_QUERYDESIGNCONTEXT_HXX
+#include "svx/ParseContext.hxx"
 #endif
 #ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
 #include "querycontainerwindow.hxx"
@@ -123,7 +123,7 @@ namespace dbaui
         OTableFields                            m_vTableFieldDesc;
         OTableFields                            m_vUnUsedFieldsDesc; // contains fields which aren't visible and don't have any criteria
 
-        OSystemParseContext*                    m_pParseContext;
+        ::svxform::OSystemParseContext*             m_pParseContext;
         ::connectivity::OSQLParser*             m_pSqlParser;   // to parse sql statements
         ::connectivity::OSQLParseTreeIterator*  m_pSqlIterator; // to iterate through them
         ::std::vector<sal_uInt32>               m_vColumnWidth;
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index 9c59e5db2abc..d527e31ec0a5 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: queryfilter.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-09 14:45:02 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,8 +88,8 @@
 #ifndef CONNECTIVITY_PREDICATEINPUT_HXX
 #include <connectivity/predicateinput.hxx>
 #endif
-#ifndef DBAUI_QUERYDESIGNCONTEXT_HXX
-#include "ParseContext.hxx"
+#ifndef SVX_QUERYDESIGNCONTEXT_HXX
+#include "svx/ParseContext.hxx"
 #endif
 
 namespace rtl
@@ -128,7 +128,7 @@ namespace com
 namespace dbaui
 {
     class DlgFilterCrit :public ModalDialog
-                        ,public OParseContextClient
+                        ,public ::svxform::OParseContextClient
     {
     private:
         ListBox         aLB_WHEREFIELD1;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 88df05bd7b6d..baab06a03a05 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: QueryDesignView.cxx,v $
  *
- *  $Revision: 1.54 $
+ *  $Revision: 1.55 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-20 10:25:38 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -796,7 +796,7 @@ namespace
         {
             Reference< XDatabaseMetaData >  xMetaData = xConnection->getMetaData();
             ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
-            const OParseContext& rContext = static_cast<OQueryController*>(_pView->getController())->getParser()->getContext();
+            const IParseContext& rContext = static_cast<OQueryController*>(_pView->getController())->getParser()->getContext();
 
             for (sal_uInt16 i=0 ; i < nMaxCriteria ; i++)
             {
diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk
index 6493c8a40449..307468848bf5 100644
--- a/dbaccess/source/ui/querydesign/makefile.mk
+++ b/dbaccess/source/ui/querydesign/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: oj $ $Date: 2002-02-06 08:55:34 $
+#   last change: $Author: oj $ $Date: 2002-09-27 11:26:27 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -103,7 +103,6 @@ EXCEPTIONSFILES =\
 
 SLOFILES =\
             $(EXCEPTIONSFILES)					\
-            $(SLO)$/ParseContext.obj			\
             $(SLO)$/TableFieldInfo.obj			\
             $(SLO)$/QTableConnectionData.obj	\
             $(SLO)$/QTableWindowData.obj		\
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 9c15d9c066b2..f9cc8baa23bf 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.80 $
+ *  $Revision: 1.81 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-19 08:01:31 $
+ *  last change: $Author: oj $ $Date: 2002-09-27 11:26:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -287,7 +287,7 @@ OQueryController::OQueryController(const Reference< XMultiServiceFactory >& _rM)
     ,m_bCreateView(sal_False)
 {
     DBG_CTOR(OQueryController,NULL);
-    m_pParseContext = new OSystemParseContext();
+    m_pParseContext = new svxform::OSystemParseContext();
     m_pSqlParser    = new OSQLParser(_rM,m_pParseContext);
     InvalidateAll();
 }