Commit graph

3019 commits

Author SHA1 Message Date
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
2011-03-08 19:43:29 -06:00
Caolán McNamara
03271a21b9 those were the wrong defines 2011-03-01 21:08:30 +00:00
Ivo Hinkelmann
b09657659f masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
Andras Timar
fc19bad5b7 l10n: add Breton spelling dictionary 2011-02-22 18:59:27 +01:00
Francois Tigeot
ab50df50a8 Add DragonFly defines. 2011-02-21 14:37:59 +01:00
Tor Lillqvist
d8f97bd4c9 Exclude java_uno_accessbridge.jar and .dll if no SOLAR_JAVA 2011-02-18 11:42:15 +02:00
David Tardon
657710a76d configure inclusion/exclusion of scripting providers 2011-02-18 09:47:50 +01:00
David Tardon
399a30d20e fix defs for scripting provider extensions 2011-02-17 16:21:35 +01:00
sb
54a05a00d7 sb138: merged in re/DEV300_next towards DEV300_m100 2011-02-11 11:00:41 +01:00
Fridrich Štrba
fca25e4c4c Trying to remove the stlport mention from the code 2011-02-09 20:18:11 +01:00
Jan Holesovsky
d856c71a7d Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	configure.in
	solenv/bin/build.pl
2011-02-08 00:31:41 +01:00
Jesús Corrius
4fe56df1d5 Revert: Use different Windows registry keys than OOo 2011-02-03 18:25:04 +01:00
Jesús Corrius
9e7da97053 Revert: Change registry prefix values loffice, libreoffice -> LibreOffice 2011-02-03 18:22:41 +01:00
Peter Jentsch
8f54c729d0 Removed obsolete flat xml export xslt scripts from packaging 2011-02-03 17:54:58 +01:00
Jesús Corrius
851641916d fdo#33785: install mtfrenderer.uno.dll in the correct directory 2011-02-03 17:39:20 +01:00
Mathias Bauer
5931f39f4f CWS gnumake3: resync to m99 2011-02-03 15:53:56 +01:00
Mathias Bauer
355c0e61ee CWS gnumake3: convert line ends 2011-02-03 15:40:30 +01:00
Andras Timar
07be07c6e6 added Occitan dict pack to scp2 2011-02-01 13:01:07 +01:00
Andras Timar
84c28e1e4b updated description of Russian dict pack in scp2 2011-02-01 13:00:27 +01:00
Andras Timar
aa4e93c532 added Ukrainian dict pack to scp2 2011-02-01 12:56:41 +01:00
Vladimir Glazunov
d713562535 CWS-TOOLING: integrate CWS dba34b 2011-02-01 11:12:15 +01:00
Jesús Corrius
8d439b06de Change registry prefix values loffice, libreoffice -> LibreOffice 2011-01-30 00:27:29 +01:00
Andras Timar
bfd6b1db7b updated description of Russian dict pack in scp2 2011-01-29 13:17:01 +01:00
Andras Timar
5fd6899a65 added Ukrainian dict pack to scp2 2011-01-29 13:15:53 +01:00
Andras Timar
a16e828ad2 added Occitan dict pack to scp2 2011-01-29 13:09:52 +01:00
Mathias Bauer
166738d8ac CWS gnumake3: kill ENABLE_VBA 2011-01-28 13:59:35 +01:00
Hans-Joachim Lankenau
db66b65ad8 gnumake3: remove comphelper version; fix including extract.hxx 2011-01-28 12:49:53 +01:00
Vladimir Glazunov
488c44cd6b CWS-TOOLING: integrate CWS tl84 2011-01-27 16:53:34 +01:00
Mathias Bauer
cd2532a05a CWS gnumake3: remove gengal 2011-01-27 13:08:03 +01:00
Mathias Bauer
a239103a87 CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal 2011-01-26 16:15:19 +01:00
sb
9770f80111 sb138: #i116038# fresh implementation of binary URP bridge 2011-01-26 09:26:59 +01:00
Andras Timar
13239a95ff removed language code 'kid'
kid is not Koshin but key id pseudo language which is good for
debugging UI but should no be included in the product
Signed off by Fridrich on irc.
2011-01-22 16:33:59 +01:00
Bjoern Michaelsen
65594ae28f gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing 2011-01-19 16:36:58 +01:00
Jesús Corrius
b948c22f73 Use different Windows registry keys than OOo 2011-01-16 23:07:13 +01:00
Andras Timar
605b8c63d3 the name MySQL Connector lost the "for OpenOffice.org" ending 2011-01-12 17:37:03 +01:00
Mathias Bauer
71a1572e5b CWS gnumake3: #i86790#: clean up mess with ooo+iso resource files 2011-01-12 11:56:09 +01:00
Peter Jentsch
44b1e32891 Add alternative implementation of flat xml filter w/o xslt.
This filter implementation is directly based on
XmlFilterAdaptor and simply dumps the SAX events
provided by the XmlFilterAdaptor to an outputstream.
It currently still lacks the advanced pretty printing
available through split-long-lines.xsl in the xslt based
flat xml filter.
2011-01-11 14:45:21 +00:00
Peter Jentsch
677ed3557e Added missing split-long-lines.xsl to installation list for xsltfilter.scp 2011-01-11 14:43:34 +00:00
Andras Timar
52ac81c699 removed language code 'kid'
kid is not Koshin but key id pseudo language which is good for
debugging UI but should no be included in the product
Signed off by Fridrich on irc.
2011-01-11 10:20:12 +01:00
Andras Timar
74122055f5 Added ca_XV and ast name and description
signedd off by Fridrich on irc
2011-01-11 10:16:33 +01:00
Michael Meeks
eadfd2123e BrOffice branding for windows shortcuts 2011-01-10 09:37:32 +00:00
Kalman Szalai - KAMI
80e97d306c Fix Barcode extension's directory 2011-01-09 20:32:48 +01:00
Andras Timar
4dead3a3fe typo fix in module_langpack.ulf
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2011-01-05 19:00:39 +01:00
Frank Schoenheit [fs]
e55270f454 dba34b: merged DEV300m96 2011-01-05 10:07:18 +01:00
Joachim Lingner
1bfe3eec1d jl160 merge with DEV300m96 2011-01-04 12:01:53 +01:00
Kalman Szalai - KAMI
e2f3768d62 Update LightProof extensions' packing mechanism
* Install extracted extension files to separated and language dependent
  directory. This is the new way to include extensions to installation
  set.

* Update for Sun Template Pack packing

Signed-off-by: David Tardon <dtardon@redhat.com>
2011-01-04 06:59:09 +01:00
Rene Engelhard
ff5797e651 readd lost #endif 2011-01-02 14:12:14 +01:00
Rene Engelhard
09482c6149 Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	scp2/source/extensions/directory_extensions.scp
2011-01-02 01:15:14 +01:00
Andras Timar
c3c84701a4 typo fix in helppack.ulf 2010-12-27 09:58:33 +01:00
Kalman Szalai - KAMI
52a13310d3 Fix Gallery module 2010-12-22 11:05:31 +01:00