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
8322f4e857
INTEGRATION: CWS native161 (1.21.40); FILE MERGED
...
2008/06/27 16:27:36 is 1.21.40.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:25:24 +00:00
Rüdiger Timm
dce1aab119
INTEGRATION: CWS native161 (1.20.62); FILE MERGED
...
2008/06/27 16:27:35 is 1.20.62.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:25:09 +00:00
Rüdiger Timm
64d921a904
INTEGRATION: CWS native161 (1.19.62); FILE MERGED
...
2008/06/27 16:27:33 is 1.19.62.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:24:55 +00:00
Rüdiger Timm
5af8648667
INTEGRATION: CWS native161 (1.25.40); FILE MERGED
...
2008/06/27 16:27:32 is 1.25.40.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:24:43 +00:00
Rüdiger Timm
3cdcf93bd5
INTEGRATION: CWS native161 (1.17.62); FILE MERGED
...
2008/06/27 16:27:32 is 1.17.62.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:24:29 +00:00
Rüdiger Timm
da712df8b4
INTEGRATION: CWS native161 (1.18.106); FILE MERGED
...
2008/06/27 16:26:31 is 1.18.106.1: #i90919# dependencies to ooobasis packages
2008-07-07 15:23:13 +00:00
Rüdiger Timm
a5d5630fc4
INTEGRATION: CWS native161 (1.83.72); FILE MERGED
...
2008/06/24 16:28:56 is 1.83.72.1: #i89001# patch for oxt file names
2008-07-07 15:22:59 +00:00
Rüdiger Timm
058ab43ded
INTEGRATION: CWS ab55 (1.239.2); FILE MERGED
...
2008/07/04 17:03:49 hjs 1.239.2.1: have buildbots
2008-07-07 15:19:01 +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
596f1ce98e
INTEGRATION: CWS ab55 (1.190.8); FILE MERGED
...
2008/07/02 12:57:05 ab 1.190.8.1: #i91158# System lucene
2008-07-07 15:05:23 +00:00
Rüdiger Timm
fd8785a4df
INTEGRATION: CWS ab55 (1.272.2); FILE MERGED
...
2008/07/02 12:57:03 ab 1.272.2.1: #i91158# System lucene
2008-07-07 15:05:05 +00:00
Rüdiger Timm
76c183d6bf
INTEGRATION: CWS ab55 (1.35.4); FILE MERGED
...
2008/07/04 12:40:56 ab 1.35.4.2: RESYNC: (1.35-1.38); FILE MERGED
2008/07/02 13:35:03 ab 1.35.4.1: #i91158# System lucene
2008-07-07 15:04:05 +00:00
Rüdiger Timm
f162ce5df1
#i10000# fix by HJS
2008-07-07 14:28:49 +00:00
Vladimir Glazounov
7ed32af338
#i91393#
2008-07-07 09:40:53 +00:00
Rüdiger Timm
85af375e86
INTEGRATION: CWS extensionupdate01 (1.238.6); FILE MERGED
...
2008/07/01 23:36:46 rene 1.238.6.1: #i10000# typo fix; autoconf
2008-07-07 08:54:50 +00:00
Rüdiger Timm
7a1b71d438
INTEGRATION: CWS cwscheckapi1 (1.2.8); FILE MERGED
...
2008/06/27 12:34:16 cn 1.2.8.2: #i91008# enhance possible parameter
2008/06/25 11:05:58 cn 1.2.8.1: #i91008# enhance possible parameter
2008-07-07 08:01:47 +00:00
Rüdiger Timm
41c68466ea
INTEGRATION: CWS cwscheckapi1 (1.2.8); FILE MERGED
...
2008/06/26 13:56:24 cn 1.2.8.4: #i91008# enhance possible parameter
2008/06/25 20:25:02 cn 1.2.8.3: #i91008# enhance possible parameter
2008/06/25 20:23:02 cn 1.2.8.2: #i91008# enhance possible parameter
2008/06/25 11:05:49 cn 1.2.8.1: #i91008# enhance possible parameter
2008-07-07 08:01:33 +00:00
Rüdiger Timm
82603b3c2b
INTEGRATION: CWS cwscheckapi1 (1.2.8); FILE MERGED
...
2008/06/25 11:06:48 cn 1.2.8.1: #i91008# enhance possible parameter
2008-07-07 08:01:19 +00:00
Rüdiger Timm
9ab3ae93cd
INTEGRATION: CWS cwscheckapi1 (1.2.8); FILE MERGED
...
2008/06/25 11:06:47 cn 1.2.8.1: #i91008# enhance possible parameter
2008-07-07 08:01:05 +00:00
Rüdiger Timm
097445768a
INTEGRATION: CWS extensionupdate01 (1.271.6); FILE MERGED
...
2008/07/01 23:36:53 rene 1.271.6.2: #i10000# typo fix; autoconf
2008/06/25 13:00:23 mav 1.271.6.1: #i89383# integrate the patch
2008-07-07 08:00:32 +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
674a938aeb
#i10000# new configure
2008-07-02 12:51:17 +00:00
Vladimir Glazounov
b81ba92ce0
DEV300
2008-07-02 11:50:42 +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
013b6c79aa
INTEGRATION: CWS sb90 (1.11.114); FILE MERGED
...
2008/06/26 08:45:31 sb 1.11.114.1: #157787# split lines only at semicolons outside of string literals
2008-07-02 08:34:11 +00:00
Vladimir Glazounov
93066dc042
INTEGRATION: CWS sb90 (1.20.114); FILE MERGED
...
2008/06/27 14:39:03 sb 1.20.114.1: #157787# support product definition inheritance
2008-07-02 08:33:41 +00:00
Vladimir Glazounov
662cd908ea
INTEGRATION: CWS sb90 (1.47.80); FILE MERGED
...
2008/06/27 16:46:28 sb 1.47.80.2: #157787# forward/backward slash problem (fix by is@ooo)
2008/06/26 08:47:12 sb 1.47.80.1: #157787# removed no longer needed <useragent>
2008-07-02 08:33:08 +00:00
Vladimir Glazounov
3c5d11f4cf
INTEGRATION: CWS sb90 (1.111.80); FILE MERGED
...
2008/06/27 14:39:02 sb 1.111.80.1: #157787# support product definition inheritance
2008-07-02 08:32:30 +00:00
Vladimir Glazounov
1f9e23b40f
INTEGRATION: CWS odfpfixes01 (1.47.54); FILE MERGED
...
2008/06/17 17:44:40 is 1.47.54.1: #158103# hiding three layer office
2008-07-01 21:51:07 +00:00
Vladimir Glazounov
7d2649a1ef
INTEGRATION: CWS odfpfixes01 (1.95.34); FILE MERGED
...
2008/06/17 17:44:40 is 1.95.34.1: #158103# hiding three layer office
2008-07-01 21:50:48 +00:00
Vladimir Glazounov
fe4537fc2b
INTEGRATION: CWS odfpfixes01 (1.111.54); FILE MERGED
...
2008/06/17 17:44:39 is 1.111.54.1: #158103# hiding three layer office
2008-07-01 21:50:31 +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
Vladimir Glazounov
57fb6ad93d
INTEGRATION: CWS odfmetadata (1.98.4); FILE MERGED
...
2008/06/25 10:13:40 mst 1.98.4.2: RESYNC: (1.98-1.100); FILE MERGED
2008/06/17 08:57:20 mst 1.98.4.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:22 +00:00
Vladimir Glazounov
125289385d
INTEGRATION: CWS odfmetadata (1.68.4); FILE MERGED
...
2008/06/26 11:09:24 mst 1.68.4.3: - 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/25 10:13:36 mst 1.68.4.2: RESYNC: (1.68-1.69); FILE MERGED
2008/06/23 08:51:00 mst 1.68.4.1: #i90956#
- scp2/source/ooo/makefile.mk:
+ add patch from rene: define macro SYSTEM_REDLAND
2008-07-01 15:30:06 +00:00
Vladimir Glazounov
1d021fa800
INTEGRATION: CWS odfmetadata (1.290.4); FILE MERGED
...
2008/06/26 11:09:23 mst 1.290.4.3: - 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/25 10:13:51 mst 1.290.4.2: RESYNC: (1.290-1.292); FILE MERGED
2008/06/17 08:57:20 mst 1.290.4.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:29:44 +00:00
Vladimir Glazounov
8203fec607
INTEGRATION: CWS odfmetadata (1.28.4); FILE MERGED
...
2008/06/27 16:11:16 mst 1.28.4.1: - scp2/prj/build.lst:
+ add dependency on redland (for redlandversion.mk)
2008-07-01 15:29:26 +00:00
Vladimir Glazounov
57f4a6feb3
INTEGRATION: CWS odfmetadata (1.189.8); FILE MERGED
...
2008/06/25 10:10:25 mst 1.189.8.2: RESYNC: (1.189-1.190); FILE MERGED
2008/06/23 09:39:03 mst 1.189.8.1: Issue number: #i90956#
Submitted by: rene
Reviewed by: mst
- config_office/{configure.in,set_soenv.in}:
+ patch from rene: check for system REDLAND (modified for explicit
--with-system-redland), and set SYSTEM_REDLAND and REDLAND_LIBS
2008-07-01 15:08:43 +00:00
Vladimir Glazounov
8a89f4b0ed
INTEGRATION: CWS odfmetadata (1.270.8); FILE MERGED
...
2008/06/25 10:10:11 mst 1.270.8.4: RESYNC: (1.270-1.271); FILE MERGED
2008/06/25 09:37:59 mst 1.270.8.3: #i90956#
- config_office/{configure.in,configure}:
+ actually set BUILD_TYPE REDLAND
+ regenerate configure
2008/06/23 11:21:59 mst 1.270.8.2: #i90956#
- config_office/configure.in:
+ add a comment to document previous commit
2008/06/23 09:39:03 mst 1.270.8.1: Issue number: #i90956#
Submitted by: rene
Reviewed by: mst
- config_office/{configure.in,set_soenv.in}:
+ patch from rene: check for system REDLAND (modified for explicit
--with-system-redland), and set SYSTEM_REDLAND and REDLAND_LIBS
2008-07-01 15:08:22 +00:00
Vladimir Glazounov
a5824f8d1c
INTEGRATION: CWS odfmetadata (1.49.72); FILE MERGED
...
2008/06/25 09:59:08 mst 1.49.72.3: RESYNC: (1.49-1.51); FILE MERGED
2008/06/17 14:59:08 mst 1.49.72.2: - solenv/inc/unxsol{i,s}4.mk:
+ sort warnings alphabetically
2008/06/17 08:46:45 mst 1.49.72.1: - solenv/inc/unxsol{i,s}4.mk:
+ disable warning: identexpected: Identifier expected instead of "}"
2008-07-01 14:59:48 +00:00
Vladimir Glazounov
e918ee689c
INTEGRATION: CWS odfmetadata (1.44.4); FILE MERGED
...
2008/06/25 09:59:04 mst 1.44.4.3: RESYNC: (1.44-1.46); FILE MERGED
2008/06/17 14:59:08 mst 1.44.4.2: - solenv/inc/unxsol{i,s}4.mk:
+ sort warnings alphabetically
2008/06/17 08:46:44 mst 1.44.4.1: - solenv/inc/unxsol{i,s}4.mk:
+ disable warning: identexpected: Identifier expected instead of "}"
2008-07-01 14:59:32 +00:00
Vladimir Glazounov
19b24abf68
INTEGRATION: CWS odfmetadata (1.88.4); FILE MERGED
...
2008/06/17 15:36:03 mst 1.88.4.1: - solenv/inc/tg_ext.mk:
+ MACOSX: do not overwrite LDFLAGS; instead, prepend to LDFLAGS
2008-07-01 14:59:15 +00:00
Vladimir Glazounov
a189e99094
INTEGRATION: CWS odfmetadata (1.133.38); FILE MERGED
...
2008/06/25 09:59:15 mst 1.133.38.2: RESYNC: (1.133-1.134); FILE MERGED
2008/06/17 16:04:44 mst 1.133.38.1: - solenv/inc/libs.mk:
+ fix XSLTLIB: use ZLIB3RDLIB
+ add REDLANDLIB
2008-07-01 14:58:58 +00:00