Commit graph

57 commits

Author SHA1 Message Date
Rüdiger Timm
4ca3e88603 INTEGRATION: CWS sb91 (1.54.4); FILE MERGED
2008/07/21 10:56:13 sb 1.54.4.2: RESYNC: (1.54-1.56); FILE MERGED
2008/07/17 15:58:23 sb 1.54.4.1: #i91721# added explicit ENABLE_GCONF (had previously been covered by ENABLE_GNOMEVFS, but unxsolu4 does not support the latter but does support the former)
2008-08-27 12:45:09 +00:00
Ivo Hinkelmann
779ed6034f INTEGRATION: CWS native168 (1.51.40); FILE MERGED
2008/07/10 15:10:35 is 1.51.40.1: #158212# avoid same files at different modules
2008-07-17 15:35:00 +00:00
Ivo Hinkelmann
26d944e07d INTEGRATION: CWS sysui26 (1.50.6); FILE MERGED
2008/06/30 20:21:24 dv 1.50.6.1: #i90335# Moved all binfilter related registry entries to binfilter module
2008-07-16 15:28:02 +00:00
Rüdiger Timm
2c29b1b285 INTEGRATION: CWS jsc21 (1.46.22); FILE MERGED
2008/07/04 11:36:21 jsc 1.46.22.4: RESYNC: (1.50-1.53); FILE MERGED
2008/07/04 06:43:37 jsc 1.46.22.3: #i88797# rework optional SDK
2008/06/11 14:40:48 sb 1.46.22.2: RESYNC: (1.46-1.50); FILE MERGED
2008/04/28 09:29:09 jsc 1.46.22.1: #88797# integrate sdk as optional office module
2008-07-11 13:56:36 +00:00
Vladimir Glazounov
de2058de2f INTEGRATION: CWS native156 (1.50.20); FILE MERGED
2008/06/19 12:13:30 mba 1.50.20.1: #i90657#: no lingu
2008-07-01 14:53:34 +00:00
Vladimir Glazounov
eb6fcd4979 INTEGRATION: CWS native160 (1.50.12); FILE MERGED
2008/06/24 10:38:35 is 1.50.12.1: #i88671# merging msvc90 libraries
2008-06-30 14:25:15 +00:00
Rüdiger Timm
edfa689d14 #i10000# Adding custom action for layer links on windows. 2008-06-17 14:56:54 +00:00
Rüdiger Timm
3d63f6daa5 INTEGRATION: CWS sb87 (1.46.16); FILE MERGED
2008/05/19 14:22:35 jsc 1.46.16.1: #i88211# remove shortcut_python.par
2008-06-09 11:54:53 +00:00
Rüdiger Timm
4caf76ae27 INTEGRATION: CWS native151 (1.46.36); FILE MERGED
2008/05/06 15:50:12 is 1.46.36.1: #i79800# binfilter into an own package
2008-06-06 08:45:09 +00:00
Vladimir Glazounov
329f045fda INTEGRATION: CWS ucpgio1 (1.46.34); FILE MERGED
2008/04/30 16:41:36 cmc 1.46.34.1: #i88090# add gio content provider
2008-05-14 14:00:55 +00:00
Kurt Zenker
71d7b6c859 INTEGRATION: CWS obo28_DEV300 (1.46.18); FILE MERGED
2008/04/25 09:58:06 cl 1.46.18.1: #i88518# added missing directxcanvas.par to jre build
2008-05-05 13:14:23 +00:00
Rüdiger Timm
6b29cd6ce7 INTEGRATION: CWS changefileheader (1.45.8); FILE MERGED
2008/03/31 16:07:35 rt 1.45.8.1: #i87441# Change license header to LPGL v3.
2008-04-10 09:04:24 +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
Kurt Zenker
a8eeca4517 INTEGRATION: CWS layout_DEV300 (1.43.36); FILE MERGED
2008/02/12 11:48:34 jcn 1.43.36.1: Initial import of layout-dialogs-config_office-scp2.diff.
2008-03-06 11:47:26 +00:00
Oliver Bolte
e5e9670a70 INTEGRATION: CWS native110 (1.40.46); FILE MERGED
2007/11/28 15:14:56 is 1.40.46.3: RESYNC: (1.41-1.42); FILE MERGED
2007/10/24 12:58:02 is 1.40.46.2: RESYNC: (1.40-1.41); FILE MERGED
2007/10/04 11:04:58 is 1.40.46.1: #i82251# repackaging, part 3
2008-01-04 16:13:28 +00:00
Jens-Heiner Rechtien
ef5e07997b INTEGRATION: CWS dxliberate01 (1.39.100); FILE MERGED
2007/10/01 10:06:54 thb 1.39.100.2: RESYNC: (1.39-1.40); FILE MERGED
2007/08/04 20:32:39 thb 1.39.100.1: #i48454# Made dxcanvas actually appear on OOo builds
2007-11-01 17:05:02 +00:00
Vladimir Glazounov
26420a7858 INTEGRATION: CWS sb71 (1.37.70); FILE MERGED
2007/08/23 18:09:54 sb 1.37.70.3: RESYNC: (1.39-1.40); FILE MERGED
2007/06/15 08:21:55 sb 1.37.70.2: RESYNC: (1.37-1.39); FILE MERGED
2007/04/13 15:27:50 sb 1.37.70.1: #i75466# New OOo-wo-URE product.
2007-10-15 11:57:36 +00:00
Rüdiger Timm
7b10112c33 #i10000# Remove 'ENABLE_HEADLESS'-condition, take 'GUIBASE' instead. 2007-07-27 14:31:38 +00:00
Ivo Hinkelmann
34e7beb248 INTEGRATION: CWS aquabundle (1.37.114); FILE MERGED
2007/05/24 20:52:30 obr 1.37.114.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
2007-06-05 10:54:09 +00:00
Vladimir Glazounov
c1c5b94423 INTEGRATION: CWS headless01 (1.37.102); FILE MERGED
2007/05/08 14:05:04 cmc 1.37.102.1: #i76958# add unix headless vcl plug
2007-05-25 13:38:02 +00:00
Oliver Bolte
95ea1f2f3a INTEGRATION: CWS native76 (1.36.6); FILE MERGED
2007/01/10 12:59:33 is 1.36.6.1: #144470# small changes after native50
2007-01-22 13:50:30 +00:00
Jens-Heiner Rechtien
100d63096c INTEGRATION: CWS native50 (1.32.108); FILE MERGED
2006/11/02 12:14:23 is 1.32.108.6: RESYNC: (1.34-1.35); FILE MERGED
2006/08/10 13:39:27 is 1.32.108.5: RESYNC: (1.33-1.34); FILE MERGED
2006/08/10 10:34:47 is 1.32.108.4: #i65425# new java installer
2006/08/07 10:11:10 is 1.32.108.3: #i65425# new java installer
2006/07/21 11:27:39 is 1.32.108.2: RESYNC: (1.32-1.33); FILE MERGED
2006/06/13 09:54:40 is 1.32.108.1: #i65425# shifting file info from solenv to scp
2007-01-02 14:32:01 +00:00
Jens-Heiner Rechtien
177717aa1b INTEGRATION: CWS vq38 (1.34.76); FILE MERGED
2006/10/14 22:32:28 vq 1.34.76.1: #i70432# Rename NETTOOLKIT to DISABLE_ACTIVEX.
2006-10-24 14:35:28 +00:00
Ivo Hinkelmann
4f54ca68cb INTEGRATION: CWS onlineupdate3 (1.33.44); FILE MERGED
2006/07/13 07:24:13 obr 1.33.44.1: #i66949# added online update module
2006-08-04 09:10:35 +00:00
Vladimir Glazounov
69a0c81920 INTEGRATION: CWS kdesettings (1.32.52); FILE MERGED
2006/04/11 12:34:30 ebischoff 1.32.52.1: #i63557#
Have OOo use KDE system-wide settings
2006-06-02 11:29:12 +00:00
Rüdiger Timm
dc3c9fb151 INTEGRATION: CWS native41 (1.31.2); FILE MERGED
2006/03/01 15:42:06 is 1.31.2.1: #i56770# no more english language module
2006-03-09 13:09:29 +00:00
Kurt Zenker
df3ab09c40 INTEGRATION: CWS cairocanvas (1.24.108); FILE MERGED
2006/01/27 13:22:33 thb 1.24.108.3: RESYNC: (1.27-1.29); FILE MERGED
2005/12/12 19:05:54 thb 1.24.108.2: RESYNC: (1.24-1.27); FILE MERGED
2005/11/09 13:00:28 radekdoulik 1.24.108.1: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
scp2 changes to include cairo canvas component in serveces.rdb
2006-02-28 09:48:14 +00:00
Rüdiger Timm
a4ab3deec7 INTEGRATION: CWS c05v002followup (1.29.52); FILE MERGED
2006/02/01 11:20:49 is 1.29.52.1: #130172# assigning quickstarter.exe to module
2006-02-06 12:51:48 +00:00
Oliver Bolte
88a76cc6e4 INTEGRATION: CWS nativefixer21 (1.24.2); FILE MERGED
2005/11/15 17:24:41 is 1.24.2.3: RESYNC: (1.25-1.27); FILE MERGED
2005/11/10 17:57:12 is 1.24.2.2: RESYNC: (1.24-1.25); FILE MERGED
2005/09/16 11:51:10 is 1.24.2.1: #i54688# Windows CustomActions into scp2
2005-12-21 11:54:50 +00:00
Rüdiger Timm
5ce20f5dba INTEGRATION: CWS canvas04 (1.27.14); FILE MERGED
2005/11/21 17:27:05 thb 1.27.14.1: #i58257# Made inclusion of crashdebug solely dependant on ENABLE_CRASHDUMP
2005-12-14 13:59:19 +00:00
Rüdiger Timm
21a1c8889a INTEGRATION: CWS oooemailmerge (1.23.116); FILE MERGED
2005/09/09 13:33:58 cmc 1.23.116.1: #i51638# add python emailmerge backend
2005-11-11 09:40:58 +00:00
Rüdiger Timm
a567ad1de9 INTEGRATION: CWS pythonlinkfix (1.24.102); FILE MERGED
2005/11/06 02:17:58 maho 1.24.102.1: Don't use postscript for pyuno project

Issue number: #i56955#
2005-11-11 08:55:38 +00:00
Rüdiger Timm
064c5cf21d INTEGRATION: CWS sdkinstaller (1.23.112); FILE MERGED
2005/10/28 13:22:03 is 1.23.112.3: #i56859# java product for all platforms
2005/10/14 13:40:30 jsc 1.23.112.2: RESYNC: (1.23-1.24); FILE MERGED
2005/09/08 10:22:56 is 1.23.112.1: #120096# new sdkoo product
2005-11-09 08:40:13 +00:00
Rüdiger Timm
eb75f3d9e4 INTEGRATION: CWS ooo19126 (1.23.100); FILE MERGED
2005/09/05 17:49:27 rt 1.23.100.1: #i54170# Change license header: remove SISSL
2005-09-09 00:52:09 +00:00
Rüdiger Timm
4ea4554a77 INTEGRATION: CWS nativefixer11 (1.22.6); FILE MERGED
2005/06/27 10:24:21 is 1.22.6.1: #i51001# ooojre with base module
2005-07-01 11:21:59 +00:00
Rüdiger Timm
b0cfec69c4 INTEGRATION: CWS optionalbase (1.19.148); FILE MERGED
2005/06/16 07:44:03 fs 1.19.148.1: #i46898# dedicated Base module
2005-06-21 12:25:19 +00:00
Rüdiger Timm
12a519a2ac INTEGRATION: CWS nativefixer10 (1.19.120); FILE MERGED
2005/06/07 12:54:12 is 1.19.120.1: #123407# OOo with JRE
2005-06-17 13:19:12 +00:00
Oliver Bolte
2f5c3da781 INTEGRATION: CWS sb31 (1.19.58); FILE MERGED
2005/04/21 13:46:02 sb 1.19.58.1: #121392# Added URE.
2005-06-17 09:18:48 +00:00
Vladimir Glazounov
4b9d0755c2 INTEGRATION: CWS nativefixer4 (1.18.10); FILE MERGED
2005/02/11 15:38:12 is 1.18.10.1: #i41333#
2005-02-24 15:30:55 +00:00
Rüdiger Timm
c2e5de8f20 INTEGRATION: CWS nativefixer3 (1.15.22); FILE MERGED
2005/01/26 10:26:00 is 1.15.22.3: RESYNC: (1.15-1.17); FILE MERGED
2005/01/21 15:35:26 is 1.15.22.2: join to cws sysui03
2005/01/20 13:37:05 is 1.15.22.1: #118620# smaller root package
2005-01-31 10:02:25 +00:00
Kurt Zenker
2b79ad2dac INTEGRATION: CWS sysui03 (1.13.28); FILE MERGED
2005/01/17 15:30:54 obr 1.13.28.5: #i39410# ENABLE_GNOMEVFS set on Windows
2005/01/13 11:07:37 obr 1.13.28.4: #i39410# moved all UNO component linked against GNOME libraries into separate package
2005/01/13 08:15:08 obr 1.13.28.3: #i36339# modification of /etc/mailcap and /etc/mime.types now done in the desktop integration packages
2005/01/04 09:36:22 obr 1.13.28.2: RESYNC: (1.13-1.15); FILE MERGED
2004/12/14 10:10:36 obr 1.13.28.1: removed obsolete 1.x desktop integration
2005-01-21 11:16:10 +00:00
Kurt Zenker
f5c8ad364b INTEGRATION: CWS industrial01 (1.14.8); FILE MERGED
2005/01/05 14:35:20 mmeeks 1.14.8.2: RESYNC: (1.14-1.15); FILE MERGED
2005/01/05 14:00:37 mmeeks 1.14.8.1: Issue number: #i39341#
Submitted by: mmeeks
Reviewed by:  is

Add macro-generated file_images_ooo for configurable icon build / packaging
2005-01-18 13:38:01 +00:00
Jens-Heiner Rechtien
30b63e8cf1 INTEGRATION: CWS hrogtkremove (1.14.4); FILE MERGED
2004/12/20 09:20:15 hro 1.14.4.1: #i36989# Removed gtk+ from crashreporter
2004-12-20 08:36:12 +00:00
Jens-Heiner Rechtien
17dba8f2fb INTEGRATION: CWS ause012 (1.11.10); FILE MERGED
2004/12/03 17:46:15 hjs 1.11.10.1: #i37776# cleanup
2004-12-10 17:38:16 +00:00
Jens-Heiner Rechtien
ff6fc8d3e4 INTEGRATION: CWS sysint1 (1.8.2); FILE MERGED
2004/11/23 08:44:22 obr 1.8.2.4: fixed merge error
2004/11/18 10:15:34 obr 1.8.2.3: RESYNC: (1.8-1.9); FILE MERGED
2004/11/17 11:47:03 is 1.8.2.2: #118340# cleanup scp
2004/11/17 10:35:36 is 1.8.2.1: #118340# cleanup scp
2004-11-26 20:58:59 +00:00
Rüdiger Timm
3533117f77 INTEGRATION: CWS presentationengine01 (1.7.28); FILE MERGED
2004/11/18 12:31:23 thb 1.7.28.3: #118514# Canvas reorg
2004/11/17 19:03:50 thb 1.7.28.2: RESYNC: (1.7-1.9); FILE MERGED
2004/10/04 21:18:59 thb 1.7.28.1: #110496# Added vclcanvas unconditionally also for Windows, now that we have canvasfactory fallback behaviour implemented
2004-11-26 18:26:02 +00:00
Oliver Bolte
25dfec54c6 INTEGRATION: CWS nativefixer1 (1.7.124); FILE MERGED
2004/11/01 12:38:26 is 1.7.124.2: #i35930# introducing regmerge
2004/10/28 14:57:11 is 1.7.124.1: #i30597# adding database menu item
2004-11-18 08:01:51 +00:00
Oliver Bolte
37f2be7a3e INTEGRATION: CWS fwkbugfix03 (1.7.122); FILE MERGED
2004/10/28 09:08:59 mav 1.7.122.1: #i32557# do not install activex control in case of .Net toolkit environment
2004-11-17 12:02:10 +00:00
Jens-Heiner Rechtien
95fad7b06b INTEGRATION: CWS sysui02 (1.7.116); FILE MERGED
2004/10/14 07:01:38 obr 1.7.116.1: removed ooo installer cde integration module
2004-11-09 17:41:35 +00:00
Pascal Junck
1deffc19b2 INTEGRATION: CWS desktintgr03 (1.7.92); FILE MERGED
2004/10/18 14:01:21 tra 1.7.92.1: #i34765#added par files for windows explorer extension module
2004-11-03 07:08:41 +00:00