Commit graph

1246 commits

Author SHA1 Message Date
Rüdiger Timm
bb8479a0e3 INTEGRATION: CWS native177 (1.16.28); FILE MERGED
2008/07/24 08:56:36 is 1.16.28.2: #i92002# setting properties for progress bar
2008/07/23 13:52:23 obr 1.16.28.1: #i77328# removed -aqua postfix as there will be no official X11 release of OOo 3.0 on OSX any more
2008-08-01 10:24:40 +00:00
Rüdiger Timm
50146f350f INTEGRATION: CWS register30 (1.77.4); FILE MERGED
2008/07/31 11:47:03 obr 1.77.4.1: #158122# s/BUILD_SPECIAL/ENABLE_SVCTAGS/g
2008-08-01 08:11:10 +00:00
Rüdiger Timm
55cf1bf591 INTEGRATION: CWS register30 (1.251.14); FILE MERGED
2008/07/31 11:47:03 obr 1.251.14.3: #158122# s/BUILD_SPECIAL/ENABLE_SVCTAGS/g
2008/07/29 06:20:31 obr 1.251.14.2: RESYNC: (1.251-1.257); FILE MERGED
2008/07/29 05:00:37 obr 1.251.14.1: #158122# new style registration for sun provided builds
2008-08-01 08:10:54 +00:00
Rüdiger Timm
dd5d9ddbf0 INTEGRATION: CWS register30 (1.15.14); FILE MERGED
2008/07/31 11:47:02 obr 1.15.14.4: #158122# s/BUILD_SPECIAL/ENABLE_SVCTAGS/g
2008/07/29 11:37:08 obr 1.15.14.3: #158122# renamed gid_ as appropriate
2008/07/29 06:20:28 obr 1.15.14.2: RESYNC: (1.15-1.16); FILE MERGED
2008/07/29 05:00:37 obr 1.15.14.1: #158122# new style registration for sun provided builds
2008-08-01 08:10:23 +00:00
Rüdiger Timm
f9d3e7a37e INTEGRATION: CWS ab56 (1.112.8); FILE MERGED
2008/07/29 10:11:26 ab 1.112.8.1: #i92231# Move share library entries to share/basic xlc files
2008-07-31 18:12:50 +00:00
Rüdiger Timm
dec6e16891 INTEGRATION: CWS ab56 (1.257.6); FILE MERGED
2008/07/29 10:11:26 ab 1.257.6.1: #i92231# Move share library entries to share/basic xlc files
2008-07-31 18:12:36 +00:00
Mathias Bauer
efaa520b16 #i92212#: new profile names 2008-07-28 10:43:11 +00:00
Oliver Bolte
7201598085 INTEGRATION: CWS aqua11y02 (1.66.60); FILE MERGED
2008/07/11 09:02:52 obr 1.66.60.3: RESYNC: (1.69-1.73); FILE MERGED
2008/06/18 18:04:55 fne 1.66.60.2: RESYNC: (1.66-1.69); FILE MERGED
2008/06/11 13:49:40 obr 1.66.60.1: raised baseline for Java UNO AccessBridge to Java 1.5
2008-07-25 08:12:58 +00:00
Oliver Bolte
3603000f19 INTEGRATION: CWS jl108 (1.11.8); FILE MERGED
2008/07/23 11:16:01 jl 1.11.8.1: #i91982# define _MSC for builds with microsoft compiler
2008-07-25 05:36:51 +00:00
Oliver Bolte
d954ed3c35 INTEGRATION: CWS jl108 (1.75.10); FILE MERGED
2008/07/23 11:16:01 jl 1.75.10.2: #i91982# define _MSC for builds with microsoft compiler
2008/07/23 09:16:45 jl 1.75.10.1: #i91982# define MSC for builds with microsoft compiler
2008-07-25 05:35:57 +00:00
Oliver Bolte
d57e2620a9 INTEGRATION: CWS jl108 (1.302.6); FILE MERGED
2008/07/23 11:16:01 jl 1.302.6.1: #i91982# define _MSC for builds with microsoft compiler
2008-07-25 05:35:37 +00:00
Oliver Bolte
d8c81221c1 INTEGRATION: CWS dellauncher (1.109.10); FILE MERGED
2008/07/16 15:13:36 sg 1.109.10.1: #91575#removed launcher from configuration: launcher library is not packed into OpenOffice.org anymore, obsolete by now
2008-07-22 11:36:42 +00:00
Oliver Bolte
29d1eadd7f INTEGRATION: CWS dellauncher (1.254.10); FILE MERGED
2008/07/16 15:13:36 sg 1.254.10.1: #91575#removed launcher from configuration: launcher library is not packed into OpenOffice.org anymore, obsolete by now
2008-07-22 11:36:27 +00:00
Oliver Bolte
8d7e77c943 INTEGRATION: CWS dellauncher (1.53.20); FILE MERGED
2008/07/16 15:13:36 sg 1.53.20.1: #91575#removed launcher from configuration: launcher library is not packed into OpenOffice.org anymore, obsolete by now
2008-07-22 11:36:10 +00:00
Oliver Bolte
85d923740f INTEGRATION: CWS native172 (1.27.6); FILE MERGED
2008/07/17 08:46:53 is 1.27.6.1: #i91700# improved dot net check
2008-07-22 11:11:44 +00:00
Oliver Bolte
4352289493 INTEGRATION: CWS native172 (1.66.30); FILE MERGED
2008/07/16 13:16:02 sb 1.66.30.1: #i91721# added ScriptFramework.jar back to URE_MORE_JAVA_TYPES (got lost in rev. 1.57)
2008-07-22 11:11:28 +00:00
Vladimir Glazounov
c11971f1d7 #i91756# #i10000# installer fix 2008-07-18 11:41:08 +00:00
Ivo Hinkelmann
e324400633 INTEGRATION: CWS native168 (1.6.16); FILE MERGED
2008/07/11 14:05:11 is 1.6.16.3: #158211# force parameter for system integration packages
2008/07/10 19:01:40 is 1.6.16.2: #i91544# set installorder for system integration packages
2008/07/03 16:34:25 is 1.6.16.1: #i90234# adding system integration again
2008-07-17 15:34:32 +00:00
Ivo Hinkelmann
6be4831fe6 INTEGRATION: CWS native168 (1.104.14); FILE MERGED
2008/07/10 15:10:34 is 1.104.14.1: #158212# avoid same files at different modules
2008-07-17 15:34:20 +00:00
Ivo Hinkelmann
cbfaf9968c INTEGRATION: CWS native168 (1.7.120); FILE MERGED
2008/07/10 15:10:34 is 1.7.120.1: #158212# avoid same files at different modules
2008-07-17 15:34:06 +00:00
Ivo Hinkelmann
7d38fc0ea6 INTEGRATION: CWS native168 (1.69.60); FILE MERGED
2008/07/10 15:10:34 is 1.69.60.1: #158212# avoid same files at different modules
2008-07-17 15:33:49 +00:00
Ivo Hinkelmann
3cb2970f46 INTEGRATION: CWS native168 (1.249.12); FILE MERGED
2008/07/10 15:10:34 is 1.249.12.1: #158212# avoid same files at different modules
2008-07-17 15:33:35 +00:00
Ivo Hinkelmann
cd67e31fc5 INTEGRATION: CWS logger2 (1.286.66); FILE MERGED
2008/06/30 12:34:34 b_michaelsen 1.286.66.2: RESYNC: (1.286-1.292); FILE MERGED
2008/06/11 10:37:29 b_michaelsen 1.286.66.1: #i88653# added liboooimprovecore
2008-07-17 14:34:36 +00:00
Ivo Hinkelmann
3cee147ed9 INTEGRATION: CWS jl106 (1.9.10); FILE MERGED
2008/07/02 14:20:50 jl 1.9.10.1: #i91168# cli assemblies not for mingw
2008-07-17 10:47:10 +00:00
Ivo Hinkelmann
ee9908f3ef INTEGRATION: CWS jl106 (1.294.6); FILE MERGED
2008/07/02 14:20:49 jl 1.294.6.1: #i91168# cli assemblies not for mingw
2008-07-17 10:46:56 +00:00
Ivo Hinkelmann
4126d5e0b9 INTEGRATION: CWS sysui26 (1.24.8); FILE MERGED
2008/06/25 14:20:58 dv 1.24.8.2: Removed reg4msdoc custom action
2008/06/25 09:01:14 dv 1.24.8.1: Register for mso file extensions
2008-07-16 15:26:38 +00:00
Ivo Hinkelmann
749d1a34eb INTEGRATION: CWS sysui26 (1.10.50); FILE MERGED
2008/06/30 20:21:10 dv 1.10.50.1: #i90335# Moved all binfilter related registry entries to binfilter module
2008-07-16 15:26:23 +00:00
Ivo Hinkelmann
4806982ade INTEGRATION: CWS sysui26 (1.29.2); FILE MERGED
2008/06/30 20:21:10 dv 1.29.2.1: #i90335# Moved all binfilter related registry entries to binfilter module
2008-07-16 15:26:05 +00:00
Ivo Hinkelmann
4dd4095892 INTEGRATION: CWS sysui26 (1.99.4); FILE MERGED
2008/06/25 14:20:58 dv 1.99.4.2: Removed reg4msdoc custom action
2008/06/25 09:03:31 dv 1.99.4.1: Register for mso file extensions
2008-07-16 15:25:49 +00:00
Ivo Hinkelmann
9af9b71ad0 INTEGRATION: CWS sysui26 (1.290.10); FILE MERGED
2008/06/25 14:20:57 dv 1.290.10.2: Removed reg4msdoc custom action
2008/06/25 09:04:39 dv 1.290.10.1: Register for mso file extensions
2008-07-16 15:25:31 +00:00
Rüdiger Timm
1d17a19ade INTEGRATION: CWS jsc21 (1.47.18); FILE MERGED
2008/07/04 11:36:16 jsc 1.47.18.3: RESYNC: (1.50-1.53); FILE MERGED
2008/06/11 14:40:38 sb 1.47.18.2: RESYNC: (1.47-1.50); FILE MERGED
2008/04/28 09:29:08 jsc 1.47.18.1: #88797# integrate sdk as optional office module
2008-07-11 13:55:24 +00:00
Rüdiger Timm
7aa3972b9d INTEGRATION: CWS native170 (1.25.12); FILE MERGED
2008/07/08 10:39:44 is 1.25.12.1: #i91442#
2008-07-11 09:50:15 +00:00
Rüdiger Timm
da21ac75ad INTEGRATION: CWS native170 (1.29.100); FILE MERGED
2008/07/08 10:39:44 is 1.29.100.1: #i91442#
2008-07-11 09:50:02 +00:00
Rüdiger Timm
4ffd08af5f INTEGRATION: CWS mst01 (1.28.104); FILE MERGED
2008/06/27 11:48:28 mst 1.28.104.1: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Xslt:
    use include makefile libxsltversion.mk for soname versioning
2008-07-11 09:32:50 +00:00
Rüdiger Timm
5a695e215f INTEGRATION: CWS mst01 (1.69.42); FILE MERGED
2008/06/27 11:48:28 mst 1.69.42.1: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Xslt:
    use include makefile libxsltversion.mk for soname versioning
2008-07-11 09:32:27 +00:00
Rüdiger Timm
b7efcf0350 INTEGRATION: CWS mst01 (1.292.16); FILE MERGED
2008/06/27 11:48:27 mst 1.292.16.1: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Xslt:
    use include makefile libxsltversion.mk for soname versioning
2008-07-11 09:32:04 +00:00
Rüdiger Timm
f582aeffb0 INTEGRATION: CWS startcenterfix03 (1.249.18); FILE MERGED
2008/07/07 11:30:43 pl 1.249.18.1: #i91406# get back the SCPZIP_REPLACE flag for Common.xcu
2008-07-11 06:34:02 +00:00
Rüdiger Timm
9a4543bfce INTEGRATION: CWS native161 (1.24.34); FILE MERGED
2008/06/25 13:30:36 is 1.24.34.1: #i91052# remove layer links only in full uninstallation
2008-07-07 15:26:13 +00:00
Rüdiger Timm
b3a2de40ec INTEGRATION: CWS native161 (1.99.18); FILE MERGED
2008/06/30 13:26:26 is 1.99.18.1: #i90919# new dependencies to avoid uninstallation with foreign product
2008-07-07 15:25:56 +00:00
Rüdiger Timm
c70199460a INTEGRATION: CWS native161 (1.12.22); FILE MERGED
2008/06/30 14:06:49 sb 1.12.22.2: #i91216# removed obsolete setup.ini entries
2008/06/27 16:27:36 is 1.12.22.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:25:37 +00:00
Rüdiger Timm
0f8c5ea660 INTEGRATION: CWS ab55 (1.69.50); FILE MERGED
2008/07/02 13:01:46 ab 1.69.50.1: #i91158# System lucene
2008-07-07 15:07:18 +00:00
Rüdiger Timm
0fc41812e4 INTEGRATION: CWS ab55 (1.249.2); FILE MERGED
2008/07/02 13:01:45 ab 1.249.2.1: #i91158# System lucene
2008-07-07 15:06:58 +00:00
Rüdiger Timm
c491d43176 INTEGRATION: CWS iconupdate300u1 (1.240.12); FILE MERGED
2008/05/05 11:20:28 hjs 1.240.12.1: #i82268# classic8 -> classic
2008-07-04 16:23:45 +00:00
Rüdiger Timm
1238956793 INTEGRATION: CWS nomacmozab (1.249.4); FILE MERGED
2008/07/01 20:00:36 fs 1.249.4.1: #i91209# no Mozilla-based address books on mac OS X
2008-07-04 16:22:33 +00:00
Rüdiger Timm
8d351ef0ea INTEGRATION: CWS nomacmozab (1.294.4); FILE MERGED
2008/07/01 20:00:32 fs 1.294.4.1: #i91209# no Mozilla-based address books on mac OS X
2008-07-04 16:21:22 +00:00
Rüdiger Timm
97ee7b59b8 #i91319# Conditionalize dictionaries. 2008-07-03 10:39:45 +00:00
Vladimir Glazounov
ef09684555 INTEGRATION: CWS sb90 (1.24.28); FILE MERGED
2008/06/26 08:57:18 sb 1.24.28.1: #157787# new CopyEditionData custom action
2008-07-02 08:46:28 +00:00
Vladimir Glazounov
5c7f229a8f INTEGRATION: CWS sb90 (1.65.6); FILE MERGED
2008/06/26 08:54:48 sb 1.65.6.1: configuration CustomLayer has been replaced by BrandLayer (no longer parameterized by CustomDataUrl)
2008-07-02 08:45:57 +00:00
Vladimir Glazounov
d64f241a2b INTEGRATION: CWS sb90 (1.13.6); FILE MERGED
2008/06/26 08:56:31 sb 1.13.6.1: #157787# versionrc UpdateUserAgent value changed; configuration CustomLayer has been replaced by BrandLayer (no longer parameterized by CustomDataUrl, which thus no longer needs to be set in fundamentalrc)
2008-07-02 08:45:10 +00:00
Vladimir Glazounov
d81602e61f INTEGRATION: CWS odfmetadata (1.28.74); FILE MERGED
2008/06/26 11:09:24 mst 1.28.74.2: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf:
    use include makefile redlandversion.mk for soname versioning
2008/06/17 08:57:20 mst 1.28.74.1: - scp2/source/ooo/{file_library_ooo.scp,module_hidden_ooo.scp,
    shortcut_ooo.scp}:
  + add external redland libraries:
    gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf
  + add unordf component library: gid_File_Lib_Unordf
2008-07-01 15:30:37 +00:00