Index: connectivity/prj/build.lst
===================================================================
RCS file: /cvs/dba/connectivity/prj/build.lst,v
retrieving revision 1.20
retrieving revision 1.18.134.2
diff -u -p -r1.20 -r1.18.134.2
--- connectivity/prj/build.lst	10 Nov 2004 13:46:13 -0000	1.20
+++ connectivity/prj/build.lst	28 Jan 2005 06:43:31 -0000	1.18.134.2
@@ -1,4 +1,4 @@
-cn	connectivity	:	comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
+cn     connectivity    :       comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb mdbtools NULL
 cn     connectivity                                                    usr1    -       all     cn_mkout NULL
 cn     connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -       all     cn_jhsqldbdb cn_hsqldb NULL
 cn     connectivity\source\types                       nmake   -       all     cn_types NULL
@@ -19,6 +19,7 @@ cn	connectivity\source\drivers\adabas		n
 cn	connectivity\source\drivers\file		nmake	-	all	cn_file cn_dbtools 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\drivers\mdb			nmake	-	u	cn_mdb cn_dbtools cn_file NULL
 cn	connectivity\source\drivers\hsqldb		nmake	-	all	cn_hsqldb cn_dbtools NULL
 cn	connectivity\source\parse			nmake	-	all	cn_parse cn_types NULL
 cn	connectivity\source\simpledbt			nmake	-	all	cn_simpledbt cn_cmtools NULL
Index: connectivity/prj/d.lst
===================================================================
RCS file: /cvs/dba/connectivity/prj/d.lst,v
retrieving revision 1.21
retrieving revision 1.20.26.2
diff -u -p -r1.21 -r1.20.26.2
--- connectivity/prj/d.lst	9 Nov 2004 12:07:13 -0000	1.21
+++ connectivity/prj/d.lst	28 Jan 2005 06:43:45 -0000	1.20.26.2
@@ -15,6 +15,7 @@
 ..\source\drivers\evoab\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
+..\source\drivers\mdb\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
 
 mkdir: %_DEST%\inc%_EXT%\connectivity
Index: officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu,v
retrieving revision 1.20
retrieving revision 1.18.78.2
diff -u -p -r1.20 -r1.18.78.2
--- officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	17 Nov 2004 14:07:13 -0000	1.20
+++ officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	27 Jan 2005 09:13:18 -0000	1.18.78.2
@@ -777,6 +777,19 @@
       </node>
     </node>
   </node>
+	<node oor:name="UserDefinedDriverSettings">
+		<node oor:name="MDB Driver" oor:op="replace">
+			<prop oor:name="DriverPageDisplayName">
+				<value>MDB-SDBC Driver V 0.1</value>
+			</prop>
+			<prop oor:name="DriverTypeDisplayName">
+				<value>mdb</value>
+			</prop>
+			<prop oor:name="DriverDsnPrefix">
+				<value>sdbc:mdb:</value>
+			</prop>
+		</node>
+	</node>
 </oor:component-data>
 
 
Index: dbaccess/source/ui/dlg/detailpages.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/detailpages.cxx,v
retrieving revision 1.34
retrieving revision 1.32.16.2
diff -u -p -r1.34 -r1.32.16.2
--- dbaccess/source/ui/dlg/detailpages.cxx	21 Jan 2005 17:15:13 -0000	1.34
+++ dbaccess/source/ui/dlg/detailpages.cxx	27 Jan 2005 12:53:17 -0000	1.32.16.2
@@ -880,10 +880,9 @@ namespace dbaui
 		,m_aEDHostname		(this, ResId(ET_HOSTNAME))
 		,m_aPortNumber		(this, ResId(FT_PORTNUMBER))
 		,m_aNFPortNumber	(this, ResId(NF_PORTNUMBER))
-		,m_aSeparator2		(this, ResId(FL_DATAHANDLING))
-		,m_aUseCatalog		(this, ResId(CB_USECATALOG))		
+
+	/* This function depends on dbadmin.src file*/
 	{
-		m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
 		FreeResource();
 	}
 
@@ -900,7 +899,6 @@ namespace dbaui
 
 		fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething);
 		fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
-		fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
 
 		return bChangedSomething;
 	}
@@ -909,7 +907,6 @@ namespace dbaui
 	{
 		OCommonBehaviourTabPage::fillControls(_rControlList);
 		_rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDHostname));
-		_rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aUseCatalog));
 		_rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
 	}
 	// -----------------------------------------------------------------------
@@ -918,7 +915,6 @@ namespace dbaui
 		OCommonBehaviourTabPage::fillWindows(_rControlList);
 		_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname));
 		_rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber));
-		_rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aSeparator2));
 	}
 	// -----------------------------------------------------------------------
 	void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
@@ -927,7 +923,6 @@ namespace dbaui
 		sal_Bool bValid, bReadonly;
 		getFlags(_rSet, bValid, bReadonly);
 
-		SFX_ITEMSET_GET(_rSet, pUseCatalogItem, SfxBoolItem, DSID_USECATALOG, sal_True);
 		SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
 		SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_PORTNUMBER, sal_True);
 
@@ -939,7 +934,6 @@ namespace dbaui
 			m_aNFPortNumber.SetValue(pPortNumber->GetValue());
 			m_aNFPortNumber.ClearModifyFlag();
 
-			m_aUseCatalog.Check(pUseCatalogItem->GetValue());
 		}
 
 		OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
Index: dbaccess/source/ui/dlg/detailpages.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/detailpages.hxx,v
retrieving revision 1.21
retrieving revision 1.20.16.2
diff -u -p -r1.21 -r1.20.16.2
--- dbaccess/source/ui/dlg/detailpages.hxx	27 Oct 2004 13:03:38 -0000	1.21
+++ dbaccess/source/ui/dlg/detailpages.hxx	27 Jan 2005 12:53:44 -0000	1.20.16.2
@@ -255,8 +255,7 @@ namespace dbaui
 		Edit				m_aEDHostname;
 		FixedText			m_aPortNumber;
 		NumericField		m_aNFPortNumber;
-		FixedLine			m_aSeparator2;
-		CheckBox			m_aUseCatalog;
+	/* This function depends on dbadmin.src file*/
 	};
 
 	//========================================================================
Index: scp2/source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.80
retrieving revision 1.32.8.3
diff -u -p -r1.80 -r1.32.8.3
--- scp2/source/ooo/file_library_ooo.scp	25 Jan 2005 09:40:50 -0000	1.80
+++ scp2/source/ooo/file_library_ooo.scp	27 Jan 2005 14:45:43 -0000	1.32.8.3
@@ -2039,6 +2039,13 @@ File gid_File_Lib_Sunjavaplugin
 End
 #endif
 
+#ifdef ENABLE_ACCESS
+#ifdef UNX
+STD_UNO_LIB_FILE( gid_File_Lib_Mdb2, mdb )
+STD_UNO_LIB_FILE( gid_File_Lib_Mdb2_Impl, mdbimpl )
+#endif
+#endif
+
 // AVMedia
 STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
--- scp2/source/ooo/makefile.mk	2005-08-04 18:45:47.285289074 +0530
+++ scp2/source/ooo/makefile.mk	2005-08-04 18:44:13.069615555 +0530
@@ -142,6 +142,10 @@
 SCPDEFS+=-DSYSTEM_CURL
 .ENDIF
 
+.IF "$(ENABLE_ACCESS)" == "YES"
+SCPDEFS+=-DENABLE_ACCESS
+.ENDIF
+
 .IF "$(WITH_BINFILTER)" == "NO"
 SCPDEFS+=-DWITHOUT_BINFILTER
 .ENDIF
