Commit graph

9207 commits

Author SHA1 Message Date
Vladimir Glazounov
1711e67108 #i87533# 2008-04-02 13:22:19 +00:00
Kurt Zenker
da8750e671 INTEGRATION: CWS native137 (1.12.194); FILE MERGED
2008/03/20 15:28:22 is 1.12.194.1: #i87293# no upgrade for OOo 3.0 Beta and SO 9 Beta
2008-04-02 11:21:33 +00:00
Kurt Zenker
8cf80719a4 INTEGRATION: CWS cairoquartz01 (1.198.2); FILE MERGED
2008/03/25 19:40:50 mox 1.198.2.19: Refine comment
2008/03/25 19:35:28 mox 1.198.2.18: Three times the charm... On linux, default to system cairo
2008/03/17 19:18:59 mox 1.198.2.17: Revert duplicate code and revert configure -file to contain only CWS changes.
2008/03/17 15:23:53 thb 1.198.2.16: Forgot about the system-libs all-inclusive switch
2008/03/17 14:33:01 thb 1.198.2.15: Actually made the check work (for defaulting to system cairo)
2008/03/17 13:52:53 thb 1.198.2.14: Make system cairo the default on linux
2008/03/10 21:53:00 mox 1.198.2.13: Remove forced test builds.

This CWS is now ready for QA and integration.
2008/03/08 12:26:09 mox 1.198.2.12: RESYNC: (1.249-1.252); FILE MERGED
2008/03/01 08:45:41 mox 1.198.2.11: TESTING: force-enable cairo on supported platforms to get more build
testing on the CWS. Force system-cairo for Linux platform.
TO BE REMOVED when this CWS goes to integration.
2008/02/29 06:28:16 mox 1.198.2.10: TESTING: force-enable cairo on supported platforms to get more build
testing on the CWS. TO BE REMOVED when this CWS goes to integration.
2008/02/23 13:13:13 mox 1.198.2.9: RESYNC: (1.241-1.249); FILE MERGED
2008/01/16 19:18:31 mox 1.198.2.8: RESYNC: (1.232-1.241); FILE MERGED
2007/12/10 17:46:16 mox 1.198.2.7: RESYNC: (1.221-1.232); FILE MERGED
2007/10/14 19:16:18 mox 1.198.2.6: RESYNC: (1.216-1.221); FILE MERGED
2007/08/11 18:12:42 mox 1.198.2.5: RESYNC: (1.213-1.216); FILE MERGED
2007/07/11 18:15:03 mox 1.198.2.4: RESYNC: (1.208-1.213); FILE MERGED
2007/06/20 15:12:51 mox 1.198.2.3: RESYNC: (1.198-1.208); FILE MERGED
2007/06/01 18:04:43 thb 1.198.2.2: #i70519# The remainder from tml's wincairo patches - enable cairo support for Windows builds
2007/04/14 07:09:10 mox 1.198.2.1: Issue number:  #69066# update configure.in to support Cairo Quartz implementation
2008-04-02 08:48:48 +00:00
Kurt Zenker
086185b398 INTEGRATION: CWS obo24 (1.1.2); FILE ADDED
2008/03/13 14:39:57 obo 1.1.2.1: #i75046# additional build for 64 bit shell extension (Windows Vista)
2008-04-02 08:41:45 +00:00
Kurt Zenker
43c19c6c22 INTEGRATION: CWS obo24 (1.205.8); FILE MERGED
2008/03/13 14:43:03 obo 1.205.8.1: #i75046# additional build for 64 bit shell extension (Windows Vista)
2008-04-02 08:41:27 +00:00
Kurt Zenker
1fd44dd0ea INTEGRATION: CWS obo24 (1.7.6); FILE MERGED
2008/03/13 11:26:27 obo 1.7.6.1: COMPROOT added for Windows 64bit compiler (used by shell extension)
2008-04-02 08:40:51 +00:00
Oliver Bolte
f2e73c6e14 #i10000# MACOSX_DEPLOYMENT_TARGET added (unxmacxi) 2008-03-31 12:27:05 +00:00
Oliver Bolte
2c84e839ad #i10000# MACOSX_DEPLOYMENT_TARGET 10.4 added for unxmacxi 2008-03-31 12:17:29 +00:00
Oliver Bolte
ec28cacfef DEV300 2008-03-26 15:18:54 +00:00
Oliver Bolte
d5e8a3aa5d INTEGRATION: CWS obo25 (1.62.58); FILE MERGED
2008/03/20 11:22:06 obo 1.62.58.1: #i87279# remove DISABLE_ADO switch
2008-03-26 11:40:03 +00:00
Oliver Bolte
cfa95b9550 INTEGRATION: CWS obo25 (1.281.4); FILE MERGED
2008/03/20 11:23:23 obo 1.281.4.1: #i87279# remove DISABLE_ADO switch
2008-03-26 11:39:43 +00:00
Oliver Bolte
0b251cdd4c INTEGRATION: CWS tl41_DEV300 (1.82.2); FILE MERGED
2008/02/15 10:12:06 tl 1.82.2.2: RESYNC: (1.82-1.85); FILE MERGED
2008/02/07 12:09:39 tl 1.82.2.1: #i80287#, #i81365# changes to linguistic.xcu and for dictionaries as extensions
2008-03-25 15:59:18 +00:00
Oliver Bolte
721813e3cc INTEGRATION: CWS tl41_DEV300 (1.226.8); FILE MERGED
2008/02/26 14:31:08 tl 1.226.8.3: #i80287# fixed destination directory for xcu files
2008/02/15 10:12:02 tl 1.226.8.2: RESYNC: (1.226-1.228); FILE MERGED
2008/02/07 12:09:39 tl 1.226.8.1: #i80287#, #i81365# changes to linguistic.xcu and for dictionaries as extensions
2008-03-25 15:58:10 +00:00
Oliver Bolte
145b887a27 INTEGRATION: CWS winordinals (1.118.114); FILE MERGED
2008/03/18 12:50:56 vg 1.118.114.2: #i86800# switch to symbol-exporting scheme
2008/03/14 10:35:57 vg 1.118.114.1: #i86800# switch to symbol-exporting linking for windows
2008-03-25 13:22:06 +00:00
Oliver Bolte
1075e8e5cd INTEGRATION: CWS winordinals (1.45.86); FILE MERGED
2008/03/07 14:56:14 vg 1.45.86.1: #i86800# switch to symbol-exporting scheme
2008-03-25 13:21:49 +00:00
Oliver Bolte
1ce43382f4 INTEGRATION: CWS winordinals (1.69.150); FILE MERGED
2008/03/14 10:35:56 vg 1.69.150.1: #i86800# switch to symbol-exporting linking for windows
2008-03-25 13:21:34 +00:00
Oliver Bolte
a8b7587aae INTEGRATION: CWS winordinals (1.114.114); FILE MERGED
2008/03/18 12:50:56 vg 1.114.114.2: #i86800# switch to symbol-exporting scheme
2008/03/14 10:35:55 vg 1.114.114.1: #i86800# switch to symbol-exporting linking for windows
2008-03-25 13:21:19 +00:00
Oliver Bolte
d1f1fbb511 INTEGRATION: CWS winordinals (1.44.86); FILE MERGED
2008/03/07 14:56:14 vg 1.44.86.1: #i86800# switch to symbol-exporting scheme
2008-03-25 13:21:02 +00:00
Oliver Bolte
2a03fe4dc8 INTEGRATION: CWS winordinals (1.64.150); FILE MERGED
2008/03/14 10:35:54 vg 1.64.150.1: #i86800# switch to symbol-exporting linking for windows
2008-03-25 13:20:47 +00:00
Oliver Bolte
1076d97fc8 INTEGRATION: CWS winordinals (1.4.20); FILE MERGED
2008/03/14 10:36:34 vg 1.4.20.1: #i86800# switch to symbol-exporting linking for windows
2008-03-25 13:07:48 +00:00
Oliver Bolte
79dce48ec9 INTEGRATION: CWS winordinals (1.17.20); FILE MERGED
2008/03/14 10:36:34 vg 1.17.20.2: #i86800# switch to symbol-exporting linking for windows
2008/03/07 15:17:11 vg 1.17.20.1: #i86800# switch to symbol-exporting scheme
2008-03-25 13:07:33 +00:00
Rüdiger Timm
d0711b086b #i10000# Do not append 'Beta' extension to install dir name. 2008-03-20 09:54:29 +00:00
Rüdiger Timm
c97a878df0 #i10000# 'gid_File_Bin_Soffice' and 'gid_File_Desktophelper_Txt' moved to brand layer. 2008-03-20 08:20:59 +00:00
Vladimir Glazounov
550f0a4f96 #i10000# fix for mac-nonpro 2008-03-19 15:24:38 +00:00
Vladimir Glazounov
a7a2d2a63e #i10000# avoid problems with --without-stlport combined with --with-x 2008-03-19 13:39:55 +00:00
Vladimir Glazounov
6b0acb8f67 #i10000# regenerated for new configure.in 2008-03-19 09:58:33 +00:00
Rüdiger Timm
08e750a63e #i10000# CWS sb83 changed 'PKGCONFIG' into 'PKG_CONFIG' (in solenv/inc/pkg_config.mk). 2008-03-19 09:25:09 +00:00
Vladimir Glazounov
00b169c409 DEV300 2008-03-19 06:37:51 +00:00
Vladimir Glazounov
df8b4980aa INTEGRATION: CWS s390port01 (1.174.4); FILE MERGED
2008/02/29 14:47:00 cmc 1.174.4.1: #i86425# allow non -gnu linux
2008-03-18 15:09:55 +00:00
Vladimir Glazounov
f4c9efc99e INTEGRATION: CWS s390port01 (1.249.10); FILE MERGED
2008/03/06 12:37:36 cmc 1.249.10.1: #i85398# better test and workaround for failing visibility
2008-03-18 15:09:23 +00:00
Vladimir Glazounov
270daf7d1c INTEGRATION: CWS s390port01 (1.18.124); FILE MERGED
2008/02/29 14:49:56 cmc 1.18.124.1: #i86425# fix up s309
2008-03-18 15:05:13 +00:00
Vladimir Glazounov
cc44de7ee9 INTEGRATION: CWS cwsattach2 (1.1.410); FILE MERGED
2008/03/03 14:48:51 bei 1.1.410.1: #i86647# check SOLARENV
2008-03-18 14:43:54 +00:00
Vladimir Glazounov
7731325860 INTEGRATION: CWS cwsattach2 (1.1.2); FILE ADDED
2008/03/03 14:48:09 bei 1.1.2.1: #i86646# cwsattach for windows
2008-03-18 14:43:40 +00:00
Vladimir Glazounov
5e0085449d INTEGRATION: CWS ause092 (1.39.6); FILE MERGED
2008/03/12 09:38:57 hjs 1.39.6.1: #i86946# remove debug output
2008-03-18 13:45:34 +00:00
Vladimir Glazounov
429a78c4e5 INTEGRATION: CWS ause092 (1.35.6); FILE MERGED
2008/03/12 09:38:57 hjs 1.35.6.1: #i86946# remove debug output
2008-03-18 13:45:18 +00:00
Vladimir Glazounov
aca5d822f1 INTEGRATION: CWS sb83 (1.248.4); FILE MERGED
2008/03/17 09:10:48 sb 1.248.4.3: RESYNC: (1.249-1.252); FILE MERGED
2008/02/22 11:11:52 sb 1.248.4.2: RESYNC: (1.248-1.249); FILE MERGED
2008/02/04 10:43:00 sb 1.248.4.1: #i84200# introduced PKG_CHECK_MODULES_MACHACK to use system-provided specific bins instead of (MacPorts provided) pkg-check for libxml2/libxslt; make --with-system-libxml and --with-system-libxslt default on MACOSX; make --without-stlport default on MACOSX by applying <http://www.openoffice.org/nonav/issues/showattachment.cgi/51318/darwin_systemstl.patch>
2008-03-18 13:21:12 +00:00
Vladimir Glazounov
e74df5c0a7 INTEGRATION: CWS sb83 (1.220.4); FILE MERGED
2008/03/17 09:10:35 sb 1.220.4.3: RESYNC: (1.221-1.222); FILE MERGED
2008/02/22 11:11:37 sb 1.220.4.2: RESYNC: (1.220-1.221); FILE MERGED
2008/02/04 10:42:54 sb 1.220.4.1: #i84200# introduced PKG_CHECK_MODULES_MACHACK to use system-provided specific bins instead of (MacPorts provided) pkg-check for libxml2/libxslt; make --with-system-libxml and --with-system-libxslt default on MACOSX; make --without-stlport default on MACOSX by applying <http://www.openoffice.org/nonav/issues/showattachment.cgi/51318/darwin_systemstl.patch>
2008-03-18 13:20:26 +00:00
Vladimir Glazounov
0ce21d3d70 INTEGRATION: CWS sb83 (1.2.248); FILE MERGED
2008/02/04 10:40:30 sb 1.2.248.1: #i84200# introduced PKG_CHECK_MODULES_MACHACK to use system-provided specific bins instead of (MacPorts provided) pkg-check for libxml2/libxslt
2008-03-18 13:16:59 +00:00
Vladimir Glazounov
5a6b506cfe INTEGRATION: CWS sb83 (1.16.6); FILE MERGED
2008/03/17 09:04:00 sb 1.16.6.3: RESYNC: (1.17-1.18); FILE MERGED
2008/02/01 13:30:17 sb 1.16.6.2: RESYNC: (1.16-1.17); FILE MERGED
2007/12/21 14:51:31 sb 1.16.6.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2008-03-18 13:07:47 +00:00
Vladimir Glazounov
d34ec51b2e INTEGRATION: CWS sb83 (1.7.10); FILE MERGED
2007/12/21 14:51:31 sb 1.7.10.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2008-03-18 13:07:34 +00:00
Vladimir Glazounov
4ebb0d5661 INTEGRATION: CWS sb83 (1.9.10); FILE MERGED
2007/12/21 14:51:31 sb 1.9.10.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2008-03-18 13:07:22 +00:00
Vladimir Glazounov
9be197f391 INTEGRATION: CWS sb83 (1.12.10); FILE MERGED
2007/12/21 14:51:30 sb 1.12.10.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2008-03-18 13:07:10 +00:00
Vladimir Glazounov
d6488be519 INTEGRATION: CWS sb83 (1.8.10); FILE MERGED
2007/12/21 14:51:30 sb 1.8.10.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2008-03-18 13:06:58 +00:00
Vladimir Glazounov
ac99b4b4ed INTEGRATION: CWS sb83 (1.42.22); FILE MERGED
2008/03/17 09:02:01 sb 1.42.22.8: RESYNC: (1.43-1.44); FILE MERGED
2008/02/14 11:05:31 is 1.42.22.7: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:06:50 sb 1.42.22.6: #i84200# moved image sets to brand layer
2008/01/30 12:02:25 sb 1.42.22.5: #i84200# changes for MACOSX; additions to SCP1FILES missing from SCP2FILES
2008/01/30 09:39:44 sb 1.42.22.4: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:28 sb 1.42.22.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:32 sb 1.42.22.2: RESYNC: (1.42-1.43); FILE MERGED
2007/12/10 14:49:25 sb 1.42.22.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:41:43 +00:00
Vladimir Glazounov
83248c9c64 INTEGRATION: CWS sb83 (1.20.2); FILE MERGED
2008/03/17 09:01:58 sb 1.20.2.6: RESYNC: (1.21-1.22); FILE MERGED
2008/02/22 08:50:51 sb 1.20.2.5: RESYNC: (1.20-1.21); FILE MERGED
2008/02/19 15:41:14 is 1.20.2.4: #i85112# new ure module structure
2008/02/13 16:00:56 is 1.20.2.3: #i86068# brand application modules
2008/01/29 17:08:25 sb 1.20.2.2: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:27 sb 1.20.2.1: #i85112# merged in cws_src680_native121
2008-03-18 12:41:07 +00:00
Vladimir Glazounov
eab5c19b90 INTEGRATION: CWS sb83 (1.34.18); FILE MERGED
2008/02/13 17:04:22 is 1.34.18.2: '#i86068#'
2008/01/29 17:08:25 sb 1.34.18.1: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008-03-18 12:40:49 +00:00
Vladimir Glazounov
45ee3ee247 INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:02:00 sb 1.1.4.1: file module_langpack_writer.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:47 +00:00
Vladimir Glazounov
202dc9ad19 INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
2008/02/13 12:49:07 is 1.1.4.5: #i86068# language specific files in brand package
2008/01/31 09:41:41 is 1.1.4.4: #i85112# language modules with names and descriptions
2008/01/30 09:29:31 sb 1.1.4.3: #i85112# merged in cws_src680_native121
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:48 sb 1.1.4.1: file module_langpack_root.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:37 +00:00
Vladimir Glazounov
ddb5e5a445 INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:35 sb 1.1.4.1: file module_langpack_onlineupdate.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:27 +00:00
Vladimir Glazounov
4ab63e68d2 INTEGRATION: CWS sb83 (1.1.4); FILE ADDED
2008/01/29 16:00:27 sb 1.1.4.2: #i85112# merged in cws_src680_native121
2008/01/29 15:01:22 sb 1.1.4.1: file module_langpack_math.sct was added on branch cws_src680_sb83 on 2008-01-29 16:00:27 +0000
2008-03-18 12:39:17 +00:00