diff options
| -rw-r--r-- | connectivity/prj/build.lst | 3 | ||||
| -rwxr-xr-x | desktop/scripts/soffice.sh | 5 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 11 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 5 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 4 | ||||
| -rw-r--r-- | postprocess/rebase/coffbase.txt | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 |
7 files changed, 1 insertions, 30 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 0cc4d78d7693..986089774f86 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -19,7 +19,6 @@ cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL -cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL @@ -29,4 +28,4 @@ cn connectivity\source\simpledbt nmake - all cn_simpledbt cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL cn connectivity\qa nmake - all cn_qa cn_inc NULL -cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL +cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_flat cn_dbase cn_hsqldb cn_macab NULL diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 56ae8239221a..775f9741f059 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -45,11 +45,6 @@ export SAL_ENABLE_FILE_LOCKING # uncomment line below if you encounter problems starting soffice on your system # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS -# read database entries for Adabas D -if [ -f /etc/adabasrc ]; then - . /etc/adabasrc -fi - # The following is needed on Linux PPC with IBM j2sdk142: #@# export JITC_PROCESSOR_TYPE=6 diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu index e0c469b6f781..9be30a2197ff 100644 --- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu +++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu @@ -29,17 +29,6 @@ <oor:component-data oor:name="DataAccess" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <node oor:name="ConnectionPool"> <node oor:name="DriverSettings"> - <node oor:name="com.sun.star.comp.sdbcx.adabas.ODriver" oor:op="replace"> - <prop oor:name="DriverName"> - <value>com.sun.star.comp.sdbcx.adabas.ODriver</value> - </prop> - <prop oor:name="Enable"> - <value>false</value> - </prop> - <prop oor:name="Timeout"> - <value>60</value> - </prop> - </node> <node oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver" oor:op="replace"> <prop oor:name="DriverName"> <value>com.sun.star.comp.sdbc.evoab.OEvoabDriver</value> diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 3e65a310cd40..9fbf3d285f7c 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -340,11 +340,6 @@ my_components += \ my_components += component/canvas/source/directx/directx5canvas .END -.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \ - ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT" -my_components += adabas -.END - .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \ "$(WITH_MOZILLA)" != "NO" my_components += mozab diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 50a509781846..a2941b64b9f8 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -320,10 +320,6 @@ MY_FILES_main += \ .ELSE ERROR : unknown-GUIBASE .END -.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \ - ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD" -MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu -.END .IF "$(ENABLE_EVOAB2)" == "TRUE" MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 69665f01a44c..2e841e866d9d 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -1,7 +1,6 @@ abpmi.dll 0x0000000067fd0000 0x00020000 acceptor.uno.dll 0x0000000067fb0000 0x00010000 accmi.dll 0x0000000067f00000 0x000a0000 -adabasmi.dll 0x0000000067e90000 0x00060000 adabasuimi.dll 0x0000000067e60000 0x00020000 ado2.dll 0x0000000067dd0000 0x00080000 affine_uno_uno.dll 0x0000000067db0000 0x00010000 diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index f9f29be41a28..62d49ad579ee 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -110,7 +110,6 @@ Module gid_Module_Root_Files_2 gid_File_Shellnew_Odp_Soffice, gid_File_Shellnew_Odt_Soffice, gid_File_Exe_Java, - gid_File_Exe_Adabas, gid_File_Exe_Userinst, gid_File_Exe_Userdeinst, gid_File_Regcleanold, @@ -340,7 +339,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Stringresource, gid_File_Lib_Ldapbe2, gid_File_Lib_Comphelper2, - gid_File_Lib_Adabas, gid_File_Lib_Cached1, gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, |