diff options
author | David Ostrovsky <david@ostrovsky.org> | 2015-10-23 18:39:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-25 15:02:44 +0000 |
commit | 4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f (patch) | |
tree | d90b50de0479ab3f8e60e36a85ce448f36934d87 /scp2 | |
parent | be114fd49371beb8877c1cf34b48319967458c8a (diff) |
Remove Seamonkey based address book driver
Seamonkey based address book driver is based on pre-compiled libraries
and is only used on Windows 32 bit. Remove it in favor of mork driver.
Given that Seamonkey based mozab driver also provides Outlook and
Outlook Express address book integration, that Windows-32-bit--only
feature is lost for now. If necessary, support for that feature could
be rewritten from scratch, in a way that would also work for Windows 64
bit.
Change-Id: Ie1c125e692598bda999767c328c9e2262a2b82af
Reviewed-on: https://gerrit.libreoffice.org/19560
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 24 |
2 files changed, 0 insertions, 25 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index ccbe54817752..91b11a3f836b 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -28,7 +28,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBXSLT \ SYSTEM_REDLAND \ WITH_GALLERY_BUILD \ - WITH_MOZAB4WIN \ WITH_MYSPELL_DICTS \ )) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a71dff4259c2..d014bf55c1a2 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -70,27 +70,3 @@ File gid_File_Lib_Policy_Cli_Oootypes_Config End #endif - -#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN - // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and - // gid_Brand_File_Lib_Msvcr80 -File gid_File_Moz_Msvcp80 - LIB_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = SCP2_URE_DL_NORMAL("msvcp80"); - Styles = (PACKED); -End -File gid_File_Moz_Msvcr80 - LIB_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = SCP2_URE_DL_NORMAL("msvcr80"); - Styles = (PACKED); -End -File gid_File_Moz_Msvc80crt_Manifest - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; - Name = "Microsoft.VC80.CRT.manifest"; -End -#endif - |