Author: hdu
Date: Wed Nov 6 08:20:48 2013
New Revision: 1539264
URL: http://svn.apache.org/r1539264
Log:
#i123575# RmMoz 6/9: drop seamonkey provided address books
Removed:
openoffice/trunk/main/connectivity/source/drivers/mozab/
openoffice/trunk/main/qadevOOo/objdsc/mozab/
openoffice/trunk/main/qadevOOo/tests/java/mod/_mozab/
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/connectivity/prj/build.lst
openoffice/trunk/main/connectivity/prj/d.lst
openoffice/trunk/main/connectivity/version.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/postprocess/packregistry/makefile.mk
openoffice/trunk/main/qadevOOo/runner/basicrunner/BasicTestCase.java
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk
openoffice/trunk/main/xmlsecurity/tools/demo/mozprofile.cxx
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Wed Nov 6 08:20:48 2013
@@ -59,8 +59,7 @@ AC_ARG_ENABLE(online-update,
[ --disable-online-update Disables the Online Update feature.
],,enable_online_update=yes)
AC_ARG_ENABLE(ldap,
-[ --disable-ldap Disables the use of LDAP backend via
Netscape/Mozilla
- or OpenLDAP LDAP SDK
+[ --disable-ldap Disables the use of LDAP backend via OpenLDAP
],,)
AC_ARG_ENABLE(fetch-external,
[ --disable-fetch-external Disables fetching external tarballs from web
sources.
@@ -70,8 +69,7 @@ AC_ARG_WITH(external-tar,
[ TARFILE_LOCATION="$withval"
])
AC_ARG_WITH(openldap,
-[ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
+[ --with-openldap Enables the use of the OpenLDAP
],,)
AC_ARG_ENABLE(lockdown,
[ --enable-lockdown Enables the gconf integration work in OOo
Modified: openoffice/trunk/main/connectivity/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/build.lst?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/build.lst (original)
+++ openoffice/trunk/main/connectivity/prj/build.lst Wed Nov 6 08:20:48 2013
@@ -8,9 +8,6 @@ cn connectivity\source\cpool
cn connectivity\source\resource nmake - all cn_res
cn_inc NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx
cn_inc NULL
cn connectivity\source\drivers\ado nmake - all cn_ado
cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all
cn_mozab_mozillasrc cn_file cn_inc NULL
-cn connectivity\source\drivers\mozab\bootstrap nmake - all
cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab
cn_mozab_bootstrap cn_dbtools cn_inc NULL
cn connectivity\source\drivers\kab nmake - all cn_kab
cn_dbtools cn_inc NULL
cn connectivity\source\drivers\macab nmake - all cn_macab
cn_dbtools cn_inc NULL
cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2
cn_dbtools cn_file cn_inc NULL
@@ -29,4 +26,4 @@ cn connectivity\source\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_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat
cn_dbase cn_hsqldb cn_macab NULL
Modified: openoffice/trunk/main/connectivity/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/d.lst?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/d.lst (original)
+++ openoffice/trunk/main/connectivity/prj/d.lst Wed Nov 6 08:20:48 2013
@@ -17,7 +17,6 @@
..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\jdbc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mozab\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -46,8 +45,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
-..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
Modified: openoffice/trunk/main/connectivity/version.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/version.mk?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/version.mk (original)
+++ openoffice/trunk/main/connectivity/version.mk Wed Nov 6 08:20:48 2013
@@ -69,14 +69,6 @@ DBPOOL_MICRO=0
# target
DBASE_TARGET=dbase
-# ----------------------------MOZAB
settings-----------------------------------#
-# the major
-MOZAB_MAJOR=2
-# the minor
-MOZAB_MINOR=0
-# the micro
-MOZAB_MICRO=0
-
# ----------------------------MySQL
settings-----------------------------------#
# target
MYSQL_TARGET=mysql
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Nov 6
08:20:48 2013
@@ -359,14 +359,6 @@ my_components += directx5canvas
my_components += adabas
.END
-#.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
-# "$(WITH_MOZILLA)" != "NO"
-#my_components += mozab
-#.ELIF "$(OS)" == "OS2"
-#.ELSE
-my_components += mozbootstrap
-#.END
-
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
my_components += desktopbe1
.END
Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Wed Nov 6
08:20:48 2013
@@ -357,14 +357,7 @@ MY_FILES_main += \
.IF "$(ENABLE_KAB)" == "TRUE"
MY_FILES_main += $(MY_MOD)/DataAccess/kab.xcu
.END
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
- "$(OS)" != "MACOSX"
-#.IF "$(OS)" == "WNT"
-#MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
-#.ELSE
-#MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
-#.END
-.END
+
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
MY_FILES_main +=
$(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
.ELSE
Modified: openoffice/trunk/main/qadevOOo/runner/basicrunner/BasicTestCase.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/qadevOOo/runner/basicrunner/BasicTestCase.java?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/qadevOOo/runner/basicrunner/BasicTestCase.java
(original)
+++ openoffice/trunk/main/qadevOOo/runner/basicrunner/BasicTestCase.java Wed
Nov 6 08:20:48 2013
@@ -112,8 +112,6 @@ public class BasicTestCase extends TestC
tParam.get("adabas.password") + "\"");
oBasicHandler.perform("setValue", "adoUrl = \"sdbc:ado:" +
tParam.get("ado.url") + "\"");
- oBasicHandler.perform("setValue", "mozabUrl = \"sdbc:address:" +
- tParam.get("mozab.url") + "\"");
} catch (BasicException e) {
log.println(e.info);
throw new RuntimeException(e.info);
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Wed Nov 6
08:20:48 2013
@@ -921,28 +921,6 @@ File gid_File_Lib_Mcnttype
#endif
End
-/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
- // #i91209#
-STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
-STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
-
-#else*/
-
-#ifndef OS2
-File gid_File_Lib_Mozbootstrap
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
- #else
- Name = "mozbootstrap.dll";
- #endif
-End
-#endif
-
-/*#endif*/
-
#ifdef SYSTEM_LIBWPD
STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
#endif
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Wed Nov 6
08:20:48 2013
@@ -325,7 +325,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Hsqldb_2,
gid_File_Lib_Jdbc,
gid_File_Lib_Mcnttype,
- gid_File_Lib_Mozbootstrap,
gid_File_Lib_Mysql,
gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
Modified: openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk Wed Nov 6
08:20:48 2013
@@ -137,8 +137,7 @@ REGISTERLIBS= \
dynamicloader.uno$(DLLPOST) \
namingservice.uno$(DLLPOST) \
bootstrap.uno$(DLLPOST) \
- sax.uno$(DLLPOST) \
- $(DLLPRE)mozab2$(DLLPOST)
+ sax.uno$(DLLPOST)
$(BIN)$/demo.rdb: \
makefile.mk \
Modified: openoffice/trunk/main/xmlsecurity/tools/demo/mozprofile.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/tools/demo/mozprofile.cxx?rev=1539264&r1=1539263&r2=1539264&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/tools/demo/mozprofile.cxx (original)
+++ openoffice/trunk/main/xmlsecurity/tools/demo/mozprofile.cxx Wed Nov 6
08:20:48 2013
@@ -33,7 +33,6 @@
#include <xmlsecurity/biginteger.hxx>
#include <xmlsecurity/xmlsignaturehelper.hxx>
-#include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
using namespace ::com::sun::star;
