new dir for unotypes

14 files changed, 83 insertions, 478 deletions

diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 6bb642d7e62f..43d1023822bb 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtools.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: oj $ $Date: 2001-02-16 16:02:06 $
+ *  last change: $Author: oj $ $Date: 2001-03-19 09:35:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,6 +94,9 @@ namespace sdbc {
 namespace beans {
     class XPropertySet;
 }
+namespace awt {
+    class XWindow;
+}
 namespace lang {
     struct Locale;
     class XMultiServiceFactory;
@@ -113,7 +116,7 @@ namespace util {
 namespace dbtools
 {
 //.........................................................................
-
+    class SQLExceptionInfo;
 //=========================================================================
     // date conversion
 
@@ -263,6 +266,10 @@ namespace dbtools
     */
     ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials);
 
+    void showError( const SQLExceptionInfo& _rInfo,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _pParent,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
+
 //.........................................................................
 }   // namespace dbtools
 //.........................................................................
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 6cff38c94241..1327cd3f790a 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,16 +1,18 @@
 cn	connectivity	:	comphelper svtools NULL
 cn	connectivity							usr1	-	all	cn_mkout NULL
+cn	connectivity\source\types				nmake	-	all	cn_types NULL
 cn	connectivity\source\commontools			nmake	-	all	cn_cmtools NULL
-cn	connectivity\source\manager				nmake	-	all	cn_manager NULL
+cn	connectivity\source\manager				nmake	-	all	cn_manager cn_types NULL
 cn	connectivity\source\resource			nmake	-	all	cn_res NULL
 cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx NULL
 cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
 cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
+cn	connectivity\source\drivers\address		nmake	-	all	cn_address cn_file NULL
 cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
 cn	connectivity\source\drivers\jdbc		nmake	-	all	cn_jdbc cn_dbtools NULL
-cn	connectivity\source\drivers\adabas		nmake	-	all	cn_adabas cn_ado.w cn_dbtools cn_file cn_jdbc cn_odbc NULL
+cn	connectivity\source\drivers\adabas		nmake	-	all	cn_adabas cn_dbtools cn_odbc NULL
 cn	connectivity\source\drivers\file		nmake	-	all	cn_file cn_dbtools NULL
-cn	connectivity\source\drivers\flat		nmake	-	all	cn_flat cn_ado.w cn_dbtools cn_file cn_jdbc cn_odbc NULL
-cn	connectivity\source\drivers\dbase		nmake	-	all	cn_dbase cn_ado.w cn_dbtools cn_file cn_jdbc cn_odbc NULL
+cn	connectivity\source\drivers\flat		nmake	-	all	cn_flat cn_dbtools cn_file NULL
+cn	connectivity\source\drivers\dbase		nmake	-	all	cn_dbase cn_dbtools cn_file NULL
 cn	connectivity\source\parse				nmake	-	all	cn_parse NULL
-cn	connectivity\source\dbtools				nmake	-	all	cn_dbtools cn_cmtools cn_parse cn_res cn_sdbcx NULL
+cn	connectivity\source\dbtools				nmake	-	all	cn_dbtools cn_types cn_cmtools cn_parse cn_res cn_sdbcx NULL
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 3d91458b6b89..e43dff6937ee 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtools.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-15 08:45:56 $
+ *  last change: $Author: oj $ $Date: 2001-03-19 09:35:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,6 +154,12 @@
 #ifndef _COMPHELPER_EXTRACT_HXX_
 #include <comphelper/extract.hxx>
 #endif
+#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
+#include <com/sun/star/awt/XWindow.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UI_XEXECUTABLEDIALOG_HPP_
+#include <com/sun/star/ui/XExecutableDialog.hpp>
+#endif
 #define CONNECTIVITY_PROPERTY_NAME_SPACE dbtools
 #ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
 #include "propertyids.hxx"
@@ -161,6 +167,8 @@
 
 using namespace ::comphelper;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::ui;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
@@ -1207,6 +1215,31 @@ sal_Bool isCharOk(char c,const ::rtl::OUString& _rSpecials)
     return aNewName;
 }
 
+// -----------------------------------------------------------------------------
+void showError(const SQLExceptionInfo& _rInfo,
+               const Reference< XWindow>& _xParent,
+               const Reference< XMultiServiceFactory >& _xFactory)
+{
+    if (_rInfo.isValid())
+    {
+        try
+        {
+            Sequence< Any > aArgs(2);
+            aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rInfo.get(), PropertyState_DIRECT_VALUE);
+            aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(_xParent), PropertyState_DIRECT_VALUE);
+
+            static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+            Reference< XExecutableDialog > xErrorDialog(
+                _xFactory->createInstanceWithArguments(s_sDialogServiceName, aArgs), UNO_QUERY);
+            if (xErrorDialog.is())
+                xErrorDialog->execute();
+        }
+        catch(Exception&)
+        {
+            OSL_ENSURE(0,"showError: could not display the error message!");
+        }
+    }
+}
 
 //.........................................................................
 }   // namespace dbtools
@@ -1216,6 +1249,9 @@ sal_Bool isCharOk(char c,const ::rtl::OUString& _rSpecials)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.17  2001/03/15 08:45:56  fs
+ *  cppuhelper/extract -> comphelper/extract
+ *
  *  Revision 1.16  2001/02/16 16:01:29  oj
  *  some new functions
  *
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index 36f9d7e633a6..eaec158b66aa 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: fs $ $Date: 2001-01-24 11:00:42 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:26 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,9 +76,9 @@ ENVCFLAGS+=/FR$(SLO)$/
 
 SLOFILES=\
         $(SLO)$/emptymetadata.obj	\
-        $(SLO)$/dbcharset.obj	\
-        $(SLO)$/dbtools.obj	\
-        $(SLO)$/dbexception.obj	\
+        $(SLO)$/dbcharset.obj		\
+        $(SLO)$/dbtools.obj			\
+        $(SLO)$/dbexception.obj		\
         $(SLO)$/dbconversion.obj	\
         $(SLO)$/CommonTools.obj		\
         $(SLO)$/DateConversion.obj	\
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 061104175a0f..0bc075316797 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:31 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:27 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,66 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.DisposedException				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.lang.XUnoTunnel					\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdbc.SQLWarning					\
-        com.sun.star.sdbc.ColumnSearch					\
-        com.sun.star.sdbc.DataType						\
-        com.sun.star.sdbc.ResultSetConcurrency			\
-        com.sun.star.sdbc.ResultSetType					\
-        com.sun.star.sdbc.ColumnValue					\
-        com.sun.star.sdbcx.KeyType						\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn						\
-        
-
 
 # --- Files -------------------------------------
 
@@ -157,9 +97,9 @@ SLOFILES=\
         $(SLO)$/BTables.obj						\
         $(SLO)$/Bservices.obj					\
         $(SLO)$/BDatabaseMetaData.obj			\
-                $(SLO)$/BPreparedStatement.obj                  \
-                $(SLO)$/BStatement.obj                                  \
-                $(SLO)$/BResultSet.obj                                  \
+        $(SLO)$/BPreparedStatement.obj          \
+        $(SLO)$/BStatement.obj                  \
+        $(SLO)$/BResultSet.obj                  \
         $(SLO)$/OPreparedStatement.obj			\
         $(SLO)$/OStatement.obj					\
         $(SLO)$/OResultSetMetaData.obj			\
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index d96f235f7d97..fdf5d21c52b5 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: oj $ $Date: 2000-10-19 11:54:48 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:27 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,87 +76,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.container.XIndexAccess				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.DisposedException				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdbc.SQLWarning					\
-        com.sun.star.sdbc.ColumnSearch					\
-        com.sun.star.sdbc.DataType						\
-        com.sun.star.sdbc.ResultSetConcurrency			\
-        com.sun.star.sdbc.ResultSetType					\
-        com.sun.star.sdbc.ColumnValue					\
-        com.sun.star.sdbc.TransactionIsolation			\
-        com.sun.star.sdbc.FetchDirection				\
-        com.sun.star.sdbc.KeyRule						\
-        com.sun.star.sdbc.IndexType						\
-        com.sun.star.sdbc.ProcedureResult				\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn						\
-        com.sun.star.sdbcx.XDataDescriptorFactory		\
-        com.sun.star.sdbcx.XColumnsSupplier				\
-        com.sun.star.sdbcx.XIndexesSupplier				\
-        com.sun.star.sdbcx.XKeysSupplier				\
-        com.sun.star.sdbcx.XRename						\
-        com.sun.star.sdbcx.XAlterTable					\
-        com.sun.star.sdbcx.XDataDefinitionSupplier		\
-        com.sun.star.sdbcx.XViewsSupplier				\
-        com.sun.star.sdbcx.XUsersSupplier				\
-        com.sun.star.sdbcx.XGroupsSupplier				\
-        com.sun.star.sdbcx.XAuthorizable				\
-        com.sun.star.sdbcx.Privilege					\
-        com.sun.star.sdbcx.PrivilegeObject				\
-        com.sun.star.sdbcx.XUser						\
-        com.sun.star.sdbcx.XRowLocate					\
-        com.sun.star.sdbcx.XDeleteRows					\
-        com.sun.star.lang.XServiceInfo
-        
-
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index f922ff161c54..3002569071c1 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-03-14 16:26:08 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,21 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.sdbcx.XRowLocate					\
-        com.sun.star.sdbcx.CompareBookmark				\
-        com.sun.star.sdbcx.XDeleteRows
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 498d6a9394a1..025718d7d9fd 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:39 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,22 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.sdbcx.XRowLocate					\
-        com.sun.star.sdbcx.CompareBookmark				\
-        com.sun.star.sdbcx.XDeleteRows
-
 # --- Files -------------------------------------
 
 SLOFILES=\
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 22701796f34b..a537cc7d06f5 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:41 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,64 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.DisposedException				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdbc.SQLWarning					\
-        com.sun.star.sdbc.ColumnSearch					\
-        com.sun.star.sdbc.DataType						\
-        com.sun.star.sdbc.ResultSetConcurrency			\
-        com.sun.star.sdbc.ResultSetType					\
-        com.sun.star.sdbc.ColumnValue					\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn						\
-        com.sun.star.lang.XServiceInfo
-
 # --- Files -------------------------------------
 
 SLOFILES=\
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 9dc948a6ea83..1cc6a913ae9c 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:46 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:32 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,20 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.sdbcx.XRowLocate					\
-        com.sun.star.sdbcx.CompareBookmark
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 08e095590bf4..3ece0cd6c35c 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.10 $
+#   $Revision: 1.11 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:52 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,54 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE :	settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn
-        
-
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index ea741a1d8bbf..8b1806f101ea 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:57 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,64 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.DisposedException				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdbc.SQLWarning					\
-        com.sun.star.sdbc.ColumnSearch					\
-        com.sun.star.sdbc.DataType						\
-        com.sun.star.sdbc.ResultSetConcurrency			\
-        com.sun.star.sdbc.ResultSetType					\
-        com.sun.star.sdbc.ColumnValue					\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn						\
-        com.sun.star.lang.XServiceInfo					\
-
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index aee577e34cbe..356d15055cc1 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:01 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:35:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,33 +75,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE : settings.mk
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(PRJ)$/common$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.sdbc.XDriverManager				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.container.XEnumerationAccess		\
-        com.sun.star.container.XContentEnumerationAccess\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.lang.XServiceInfo					\
-        com.sun.star.uno.XNamingService					\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XDriverAccess					\
-        com.sun.star.lang.IllegalArgumentException
 
 # --- Files -------------------------------------
 
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index 229f79878498..b1434c466ea1 100644
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: fs $ $Date: 2001-03-19 07:33:09 $
+#   last change: $Author: oj $ $Date: 2001-03-19 09:36:07 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -74,69 +74,6 @@ ENVCFLAGS+=/FR$(SLO)$/
 
 .INCLUDE : settings.mk
 
-# --- Types -------------------------------------
-
-
-UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-UNOTYPES+=	\
-        com.sun.star.util.XCancellable					\
-        com.sun.star.util.XNumberFormatter				\
-        com.sun.star.util.XRefreshable					\
-        com.sun.star.container.XNamed					\
-        com.sun.star.container.XEnumerationAccess		\
-        com.sun.star.uno.TypeClass						\
-        com.sun.star.uno.XWeak							\
-        com.sun.star.uno.XAggregation					\
-        com.sun.star.beans.XPropertyState				\
-        com.sun.star.beans.XPropertySet					\
-        com.sun.star.beans.PropertyValue				\
-        com.sun.star.beans.XMultiPropertySet			\
-        com.sun.star.beans.XFastPropertySet				\
-        com.sun.star.lang.XTypeProvider					\
-        com.sun.star.lang.EventObject					\
-        com.sun.star.lang.XComponent					\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.DisposedException				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.registry.XRegistryKey				\
-        com.sun.star.java.XJavaThreadRegister_11		\
-        com.sun.star.java.XJavaVM						\
-        com.sun.star.sdbc.XConnection					\
-        com.sun.star.sdbc.XStatement					\
-        com.sun.star.sdbc.XResultSet					\
-        com.sun.star.sdbc.XResultSetMetaDataSupplier	\
-        com.sun.star.sdbc.XColumnLocate					\
-        com.sun.star.sdbc.XResultSetUpdate				\
-        com.sun.star.sdbc.XWarningsSupplier				\
-        com.sun.star.sdbc.XRowUpdate					\
-        com.sun.star.sdbc.XMultipleResults				\
-        com.sun.star.sdbc.XBatchExecution				\
-        com.sun.star.sdbc.XPreparedBatchExecution		\
-        com.sun.star.sdbc.XParameters					\
-        com.sun.star.sdbc.XOutParameters				\
-        com.sun.star.sdbc.DriverPropertyInfo			\
-        com.sun.star.sdbc.XDriver						\
-        com.sun.star.sdbc.XRow							\
-        com.sun.star.sdbc.SQLWarning					\
-        com.sun.star.sdbc.ColumnSearch					\
-        com.sun.star.sdbc.DataType						\
-        com.sun.star.sdbc.ResultSetConcurrency			\
-        com.sun.star.sdbc.ResultSetType					\
-        com.sun.star.sdbc.ColumnValue					\
-        com.sun.star.sdbcx.XAppend						\
-        com.sun.star.sdbcx.XDrop						\
-        com.sun.star.sdb.XColumnUpdate					\
-        com.sun.star.sdb.XColumn
-        
-
 
 # --- Files -------------------------------------