Commit graph

262 commits

Author SHA1 Message Date
Vladimir Glazounov
37709f35eb INTEGRATION: CWS dba31a (1.248.10); FILE MERGED
2008/07/30 12:10:59 fs 1.248.10.4: RESYNC: (1.255-1.257); FILE MERGED
2008/07/16 06:18:23 fs 1.248.10.3: RESYNC: (1.249-1.255); FILE MERGED
2008/07/02 09:24:28 oj 1.248.10.2: RESYNC: (1.248-1.249); FILE MERGED
2008/07/02 08:25:39 oj 1.248.10.1: #i77916# ExtendedColorScheme not needed at the moment
2008-08-19 09:36:41 +00:00
Kurt Zenker
5779da8790 INTEGRATION: CWS sw30bf12_DEV300 (1.257.4.3.4); FILE MERGED
2008/08/07 14:50:02 is 1.257.4.3.4.1: #i80103# adding galician spellchecker
2008-08-14 13:34:24 +00:00
Rüdiger Timm
387b8cdb4b INTEGRATION: CWS helpsearch (1.255.2); FILE MERGED
2008/07/23 09:04:03 jsc 1.255.2.2: #i91750# modify spelling, use uppercase
2008/07/23 06:31:53 jsc 1.255.2.1: #i91750# add lucene-analyzers-2.3.jar
2008-08-01 11:15:26 +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
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
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
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
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
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
97ee7b59b8 #i91319# Conditionalize dictionaries. 2008-07-03 10:39:45 +00:00
Vladimir Glazounov
b10898cc8a INTEGRATION: CWS native156 (1.247.20); FILE MERGED
2008/06/18 13:49:16 is 1.247.20.1: #i89121# oxt dictionaries
2008-07-01 14:53:00 +00:00
Kurt Zenker
5fe5ab6ddf INTEGRATION: CWS ab52 (1.245.22); FILE MERGED
2008/06/18 13:17:50 ab 1.245.22.1: #i83625# Lucene related jar files
2008-06-24 15:25:44 +00:00
Rüdiger Timm
198b7ec747 INTEGRATION: CWS sb88 (1.241.6); FILE MERGED
2008/06/11 10:49:09 sb 1.241.6.2: RESYNC: (1.241-1.247); FILE MERGED
2008/05/16 08:04:39 sb 1.241.6.1: #i88325#, #i88974# localised xcu files moved back from brand to basis layer, brand specific parts extracted into modules and kept in brand layer
2008-06-16 13:14:31 +00:00
Rüdiger Timm
a948fda791 INTEGRATION: CWS sb87 (1.235.12); FILE MERGED
2008/04/24 13:20:37 sb 1.235.12.4: RESYNC: (1.235-1.240); FILE MERGED
2008/04/14 08:31:39 sb 1.235.12.3: #i86315# moved Jobs-stclient.xcu from basis to brand layer
2008/04/10 15:47:01 sb 1.235.12.2: #i87512# removed configimport
2008/04/04 12:23:14 sb 1.235.12.1: #i87548# moved npsoplugin dynamic library to brand layer, kept nsplugin executable (called from plugin, in turn calling soffice) in basis layer
2008-06-09 11:51:39 +00:00
Rüdiger Timm
7d1dfcf683 INTEGRATION: CWS native151 (1.240.22); FILE MERGED
2008/05/06 15:50:11 is 1.240.22.1: #i79800# binfilter into an own package
2008-06-06 08:42:42 +00:00
Kurt Zenker
f0bdfdabec INTEGRATION: CWS native152 (1.240.24); FILE MERGED
2008/05/07 14:24:51 is 1.240.24.1: #i89120# small changes: install-me removed, SolarisGroup removed
2008-05-21 11:08:05 +00:00
Kurt Zenker
a58165cd67 #i10000# merge corrected 2008-05-21 07:53:13 +00:00
Kurt Zenker
ed03903aca INTEGRATION: CWS jl98_DEV300 (1.226.30.2.4); FILE MERGED
2008/05/05 15:01:43 is 1.226.30.2.4.1: #b6670785# volatile flag for java xml file
2008-05-21 07:30:13 +00:00
Vladimir Glazounov
afc7d66ee8 INTEGRATION: CWS xsltfilter09 (1.226.52); FILE MERGED
2008/04/04 15:22:24 sus 1.226.52.2: RESYNC: (1.226-1.235); FILE MERGED
2008/01/17 12:46:29 mba 1.226.52.1: #i85268#: new XHTML export filter
2008-05-15 06:42:36 +00:00
Kurt Zenker
450aa30c12 INTEGRATION: CWS uoffilter (1.192.2); FILE MERGED
2008/02/28 17:14:26 mba 1.192.2.3: RESYNC: (1.192-1.229); FILE MERGED
2008/02/25 05:38:49 liyuan 1.192.2.2: uof filter's configuration
2007/08/14 13:44:50 liyuan 1.192.2.1: add setting for uof filter
2008-05-06 15:10:12 +00:00
Rüdiger Timm
a8f23f059f INTEGRATION: CWS iconupdate04 (1.234.4); FILE MERGED
2008/04/03 15:55:55 is 1.234.4.3: #i87567# separating branding part from images.zip
2008/04/03 01:19:54 ka 1.234.4.2: RESYNC: (1.234-1.235); FILE MERGED
2008/03/28 17:28:22 hjs 1.234.4.1: #i87567# - apply patches  done by is
2008-04-18 07:30:53 +00:00
Vladimir Glazounov
5cd9473b1a INTEGRATION: CWS obr08 (1.229.12); FILE MERGED
2008/03/31 20:42:46 obr 1.229.12.3: RESYNC: (1.233-1.235); FILE MERGED
2008/03/12 11:22:37 obr 1.229.12.2: RESYNC: (1.229-1.233); FILE MERGED
2008/02/28 13:16:30 obr 1.229.12.1: #i85831# include translations for OpenDocument types on MacOS X
2008-04-15 13:49:02 +00:00
Vladimir Glazounov
03bb4f515a INTEGRATION: CWS sb86 (1.234.2); FILE MERGED
2008/03/25 10:55:17 sb 1.234.2.1: #i87294# a better fix for the VBA_EXTENSION/MACOSX problem
2008-04-15 11:08:50 +00:00
Vladimir Glazounov
6b9ebaaf78 INTEGRATION: CWS native140 (1.235.4); FILE MERGED
2008/03/31 16:08:17 is 1.235.4.2: #i87653# files with PATCH_ONLY must be in patch
2008/03/31 15:12:27 is 1.235.4.1: #i87653# removing all PATCH flags
2008-04-15 09:46:11 +00:00
Rüdiger Timm
bf01fa689e INTEGRATION: CWS changefileheader (1.235.2); FILE MERGED
2008/03/31 16:07:13 rt 1.235.2.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:34:45 +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
Vladimir Glazounov
37e82d58b2 INTEGRATION: CWS sb83 (1.226.14); FILE MERGED
2008/03/18 08:14:05 sb 1.226.14.21: work around vbaobj on Mac OS X problem
2008/03/17 09:01:45 sb 1.226.14.20: RESYNC: (1.229-1.233); FILE MERGED
2008/02/22 08:59:20 sb 1.226.14.19: resync aftermath
2008/02/22 08:50:41 sb 1.226.14.18: RESYNC: (1.227-1.229); FILE MERGED
2008/02/14 13:19:14 is 1.226.14.17: #i86068# thirdparty license also in brand layer
2008/02/14 11:05:08 sb 1.226.14.16: #i84200# just put THIRDPARTYLICENSEREADME.html somewhere for now on MACOSX
2008/02/13 12:49:07 is 1.226.14.15: #i86068# language specific files in brand package
2008/02/08 09:19:24 sb 1.226.14.14: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:20:14 sb 1.226.14.13: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/07 12:47:05 sb 1.226.14.12: #i84200# removed apparently unused viewdoc script
2008/02/06 14:09:09 sb 1.226.14.11: #i84200# moved image sets to brand layer
2008/02/01 15:51:31 sb 1.226.14.10: #i85112# windows-specific stuff (is)
2008/02/01 13:28:57 sb 1.226.14.9: RESYNC: (1.226-1.227); FILE MERGED
2008/02/01 11:05:00 sb 1.226.14.8: #i84200# on MACOSX, cleanup soffice/unopkg executables and add urelibs links to let libs in extensions find the URE libs
2008/01/29 17:08:24 sb 1.226.14.7: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:22 sb 1.226.14.6: #i85112# merged in cws_src680_native121
2008/01/23 15:21:32 sb 1.226.14.5: #i84200# for code simplification, have all of URE_BIN_DIR, OOO_BASE_DIR, BRAND_BASE_DIR also available in good-old monolithic OOo
2008/01/21 15:14:30 sb 1.226.14.4: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/11 14:11:31 sb 1.226.14.3: #i84200# For now, include a fake ure-link/lib in traditional OOo on Mac OS X to make it still work with new dylib install_names.
2007/12/27 12:31:41 sb 1.226.14.2: #i84200# Provide a (nonfunctional) ure-link and a fake basis-link for good old monolithic OOo, to keep it running for now.
2007/12/10 14:46:58 sb 1.226.14.1: #i84200# First step of basis/brand split.  #i84309# Completely removed deprecated pkgchk tool.
2008-03-18 12:29:21 +00:00
Kurt Zenker
ae91ce9243 INTEGRATION: CWS ause084_DEV300 (1.228.10); FILE MERGED
2008/02/22 12:23:38 hjs 1.228.10.1: #i74563# change name for packing accordingly
2008-03-06 14:27:19 +00:00
Kurt Zenker
bc8a5d2b95 INTEGRATION: CWS aquavcl05_DEV300 (1.227.16); FILE MERGED
2008/03/03 17:31:03 is 1.227.16.5: #i86640# desktop link and startmenu link
2008/02/14 16:50:35 pl 1.227.16.4: #i85963# backing component for QUARTZ after all
2008/02/14 15:57:28 pl 1.227.16.3: RESYNC: (1.227-1.228); FILE MERGED
2008/02/07 14:07:34 pl 1.227.16.2: #i67502# make StartModule optional
2008/01/29 19:01:19 pl 1.227.16.1: #i79755# add macosx specific configuration
2008-03-05 16:45:56 +00:00
Kurt Zenker
24acb8c13c INTEGRATION: CWS dba30a (1.227.26); FILE MERGED
2008/02/25 08:01:44 fs 1.227.26.2: RESYNC: (1.227-1.229); FILE MERGED
2008/02/05 21:02:23 fs 1.227.26.1: #i85879# DbTableDataWindowState
2008-03-05 16:11:30 +00:00
Kurt Zenker
b03f270bd0 INTEGRATION: CWS nativeprintdlg01_DEV300 (1.229.2); FILE MERGED
2008/02/23 10:54:46 pl 1.229.2.1: #i86329# mac specific common xcu
2008-03-05 16:01:53 +00:00
Rüdiger Timm
1736fd631f INTEGRATION: CWS native131_SRC680 (1.226.30.1.4); FILE MERGED
2008/02/04 17:08:08 is 1.226.30.1.4.1: #i79970# soffice.bin.manifest for OOo
2008-02-19 10:59:56 +00:00
Vladimir Glazounov
0142151857 INTEGRATION: CWS obr07 (1.227.8); FILE MERGED
2008/01/25 10:46:24 obr 1.227.8.2: moved Info.plist to sysui/desktop/macosx
2008/01/24 13:59:43 obr 1.227.8.1: moved MacOS X specific resources (cursor/nib) to vcl/aqua
2008-02-12 13:07:44 +00:00
Rüdiger Timm
ae4908f641 INTEGRATION: CWS so8s10u5_SRC680 (1.214.4.3.4); FILE MERGED
2008/01/09 13:34:03 is 1.214.4.3.4.1: #b6647223# configfile javasettings.xml
2008-01-15 09:34:47 +00:00
Ivo Hinkelmann
16372170dc INTEGRATION: CWS dba24lms (1.221.6); FILE MERGED
2007/11/12 07:34:18 oj 1.221.6.1: #i83316 new drawbar
2007-11-27 11:16:07 +00:00
Ivo Hinkelmann
472862a116 INTEGRATION: CWS fwk72 (1.218.22); FILE MERGED
2007/10/30 14:01:11 mav 1.218.22.2: RESYNC: (1.218-1.220); FILE MERGED
2007/10/02 12:19:14 as 1.218.22.1: #i80206# set patch flag for localization of filters
2007-11-26 12:52:51 +00:00
Ivo Hinkelmann
6256d1a62a INTEGRATION: CWS langstatusbar (1.218.42); FILE MERGED
2007/11/19 11:51:52 tl 1.218.42.2: RESYNC: (1.218-1.222); FILE MERGED
2007/10/11 14:42:18 tl 1.218.42.1: #i77208# new language status-bar conttrol
2007-11-23 16:06:23 +00:00
Ivo Hinkelmann
049944ea46 INTEGRATION: CWS os104 (1.220.26); FILE MERGED
2007/11/06 15:18:14 os 1.220.26.1: #i73117# insert toolbar changed
2007-11-21 13:07:44 +00:00
Rüdiger Timm
273c769c44 INTEGRATION: CWS tkr05_SRC680 (1.214.4.2.10); FILE MERGED
2007/11/05 10:09:15 tkr 1.214.4.2.10.2: #31053# HTTPS Support (Patch flag)
2007/11/01 09:59:06 tkr 1.214.4.2.10.1: #82890# HTTPS Proxy
2007-11-07 09:16:17 +00:00
Jens-Heiner Rechtien
2be5f69ae1 INTEGRATION: CWS native115_SRC680 (1.214.4.2.24); FILE MERGED
2007/10/30 10:46:07 obr 1.214.4.2.24.2: #i83083# stclient job configuration
2007/10/30 08:40:39 obr 1.214.4.2.24.1: #i83083# added stclient_wrapper
2007-11-02 11:58:09 +00:00
Vladimir Glazounov
4f8f379d4f INTEGRATION: CWS sb71 (1.208.8); FILE MERGED
2007/10/02 10:17:23 sb 1.208.8.3: RESYNC: (1.217-1.218); FILE MERGED
2007/08/23 18:06:41 sb 1.208.8.2: RESYNC: (1.208-1.217); FILE MERGED
2007/08/21 14:59:30 sb 1.208.8.1: #i75466# Have loaders around OOo executables to set PATH and URE_BOOTSTRAP environment variables appropriately.
2007-10-15 11:56:16 +00:00
Kurt Zenker
790775754e INTEGRATION: CWS spotlightplugin01 (1.218.6); FILE MERGED
2007/09/14 20:15:44 fheckl 1.218.6.1: #72355 Adding files to install set
2007-10-09 14:02:06 +00:00
Vladimir Glazounov
86ff039c9b INTEGRATION: CWS npower7 (1.188.2); FILE MERGED
2007/07/05 14:59:01 npower 1.188.2.2: RESYNC: (1.188-1.196); FILE MERGED
2007/05/03 11:09:39 npower 1.188.2.1: #i76844#
2007-08-30 09:09:05 +00:00
Ivo Hinkelmann
6803145669 INTEGRATION: CWS native99 (1.214.2); FILE MERGED
2007/08/07 14:04:08 is 1.214.2.1: #i80411#  preparing scp project for package restructuring
2007-08-20 14:35:03 +00:00
Ivo Hinkelmann
249457ec1f INTEGRATION: CWS chart12 (1.210.24); FILE MERGED
2007/08/07 15:43:02 bm 1.210.24.2: RESYNC: (1.210-1.214); FILE MERGED
2007/08/07 13:56:27 bm 1.210.24.1: #i80382# add calc standardbar.xml to patch
2007-08-17 11:10:20 +00:00
Ivo Hinkelmann
50ef947d9b INTEGRATION: CWS jl68 (1.205.20); FILE MERGED
2007/07/23 09:11:55 jl 1.205.20.3: RESYNC: (1.205-1.210); FILE MERGED
2007/07/18 08:31:21 jl 1.205.20.2: #i79643# javasettingsunopkginstall.xml must be modifyable by the owner
2007/07/17 10:17:30 jl 1.205.20.1: #i79643# new java settings file for use when starting unopkg with -env:UNO_JAVA_JFW_INSTALL_DATA=...
2007-08-17 10:50:48 +00:00
Jens-Heiner Rechtien
711778d7d6 INTEGRATION: CWS ab39 (1.212.2); FILE MERGED
2007/08/03 12:55:17 ab 1.212.2.1: #i80278# dialogbar.xml, macrobar.xml -> patch
2007-08-03 12:00:24 +00:00
Jens-Heiner Rechtien
1b4f77be57 INTEGRATION: CWS rpt23fix01 (1.205.4); FILE MERGED
2007/07/19 08:09:51 lla 1.205.4.3: #i79771# add Embedding patch flag
2007/07/19 07:53:46 lla 1.205.4.2: #i79771# change Controller.xcu add patch flag
2007/07/17 08:14:50 lla 1.205.4.1: #i79133# no toolbars in patch
2007-08-02 13:57:11 +00:00