Commit graph

59 commits

Author SHA1 Message Date
Jan Holesovsky
2554b31146 Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
	extensions/source/svg/svgaction.cxx
	extensions/source/svg/svgaction.hxx
	extensions/source/svg/svgcom.hxx
	extensions/source/svg/svgprinter.cxx
	extensions/source/svg/svgprinter.hxx
	extensions/source/svg/svguno.cxx
	extensions/source/svg/svgwriter.cxx
	extensions/source/svg/svgwriter.hxx
	javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java
	javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
	javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
	package/inc/ZipFile.hxx
	package/inc/ZipOutputStream.hxx
	package/inc/ZipPackage.hxx
	package/inc/ZipPackageStream.hxx
	package/source/manifest/ManifestExport.cxx
	package/source/manifest/ManifestImport.cxx
	package/source/manifest/UnoRegister.cxx
	package/source/xstor/owriteablestream.cxx
	package/source/xstor/xstorage.cxx
	package/source/xstor/xstorage.hxx
	package/source/zipapi/EntryInputStream.cxx
	package/source/zipapi/EntryInputStream.hxx
	package/source/zipapi/XFileStream.cxx
	package/source/zipapi/XFileStream.hxx
	package/source/zipapi/XMemoryStream.cxx
	package/source/zipapi/XUnbufferedStream.cxx
	package/source/zipapi/XUnbufferedStream.hxx
	package/source/zipapi/ZipFile.cxx
	package/source/zipapi/ZipOutputStream.cxx
	package/source/zipapi/sha1context.hxx
	package/source/zippackage/ZipPackage.cxx
	package/source/zippackage/ZipPackageFolder.cxx
	package/source/zippackage/ZipPackageStream.cxx
	setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
	xmlsecurity/prj/build.lst
	xmlsecurity/source/helper/xmlsignaturehelper.cxx
	xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
	xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
2011-04-22 15:08:05 +02:00
ka
88ffae0574 ka102: rebased to DEV300_m104 2011-03-28 22:51:37 +02:00
Petr Mladek
adad15cff9 set build depencencies against the new "translations" module 2011-03-25 12:14:34 +01:00
Ivo Hinkelmann
8427b0f498 masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
ka
b40b6a312b ka102: SVG import implementation 2011-02-04 14:49:25 +01:00
sb
297b302757 sb131: merged in re/DEV300_next towards DEV300_m94 2010-11-19 11:35:41 +01:00
sb
9c5ef3ce00 sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt 2010-10-22 10:37:46 +02:00
sb
652243219c sb132: merged in DEV300_m90 2010-10-21 09:54:38 +02:00
sb
6e256bf13e sb132: #i115169# missing dependency extensions -> curl 2010-10-21 09:25:04 +02:00
Lars Langhans
6c4b6d9b49 sb123:#i111449# cleanups in extensions qa/complex tests 2010-06-07 13:14:09 +02:00
sb
a0f7a4d3e2 sb120: #i111182# disabled failing tests for now 2010-04-27 11:40:15 +02:00
sb
52b23e4bfa sb118: adapted remaining */qa/unoapi tests to new framework 2010-02-16 11:53:58 +01:00
Mathias Bauer
4f45111532 more dependencies fixed 2009-07-30 09:37:08 +02:00
Ivo Hinkelmann
6647ad75a6 CWS-TOOLING: integrate CWS l10ncleanup04
2009-05-28 13:46:54 +0200 ihi  r272407 : remove forgotten sdf's
2009-05-25 22:32:35 +0200 ihi  r272273 : no WITH_LANG fix
2009-05-25 20:45:58 +0200 ihi  r272272 : remove some comments
2009-05-25 19:55:21 +0200 ihi  r272271 : svx dialog -> cui l10n move
2009-05-25 18:30:58 +0200 ihi  r272268 : build fix
2009-05-18 16:32:02 +0200 ihi  r272033 : bash fix
2009-05-18 16:31:32 +0200 ihi  r272032 : bash fix
2009-05-14 16:23:39 +0200 ihi  r271901 : #i79750# Translation moved to l10n module
2009-05-11 23:36:05 +0200 ihi  r271793 : #i79750# Translation moved into own module
2009-06-17 13:15:46 +00:00
Oliver Bolte
1b38e7bda3 CWS-TOOLING: integrate CWS oooimprovement2
2009-01-28 14:35:33 +0100 b_michaelsen  r267059 : #i98555# fixed help url
2009-01-27 12:47:40 +0100 b_michaelsen  r266982 : #159112# fixed enabling vcl part of usage tracking in an running session
2009-01-27 12:28:58 +0100 b_michaelsen  r266980 : #159129# deiniting eventlogger in vcl if it was inited, not if it was enabled (the logger can be disabled inbetween
2009-01-27 12:22:45 +0100 b_michaelsen  r266978 : whitespace fixes
2009-01-27 10:32:02 +0100 b_michaelsen  r266962 : #i94949# disposing of uploader thread
2009-01-23 17:00:57 +0100 b_michaelsen  r266839 : #159112# enabling/disabling of usage tracking takes effect without restart
2009-01-23 16:58:59 +0100 b_michaelsen  r266837 : #159112# enabling/disabling of usage tracking takes effect without restart
2009-01-23 01:08:49 +0100 b_michaelsen  r266761 : #159081# fixed buildid in oooimprovement
2009-01-22 22:51:16 +0100 b_michaelsen  r266759 : #i90370# including build id
2009-01-22 15:37:05 +0100 b_michaelsen  r266727 : #i90370# fixing precompiled headers for win32
2009-01-22 15:34:05 +0100 b_michaelsen  r266722 : #i90370# initializing startup counter
2009-01-22 15:30:52 +0100 b_michaelsen  r266720 : #i90370# enabling startup counter
2009-01-21 13:52:56 +0100 b_michaelsen  r266666 : #i98143# adjusted smoketest for usage tracking
2009-01-20 18:34:12 +0100 b_michaelsen  r266617 : #i90370#
2009-01-20 15:08:45 +0100 is  r266587 : #i90370# new improvement feature
2009-01-20 14:42:39 +0100 b_michaelsen  r266583 : #i90370# changing delivered job registration location
2009-01-20 12:35:31 +0100 is  r266567 : #i90370# new improvement feature
2009-01-20 12:33:51 +0100 is  r266566 : #i90370# new improvement feature
2009-01-20 12:33:20 +0100 is  r266565 : #i90370# new improvement feature
2009-01-20 11:47:13 +0100 b_michaelsen  r266559 : #i90370# updating Usage Tracking Info Url
2009-01-20 11:28:37 +0100 b_michaelsen  r266558 : #i90370# packing Usage Tracking config schema (xcs)
2009-01-20 11:19:00 +0100 b_michaelsen  r266557 : #i90370# adding Usage Tracking config schema (xcs)
2009-01-19 18:16:34 +0100 b_michaelsen  r266518 : #i90370# adding job registration (xcu)
2009-01-19 17:26:02 +0100 b_michaelsen  r266513 : #i90370# adding liboooimprovement
2009-02-13 11:55:44 +00:00
Oliver Bolte
634c6a5045 INTEGRATION: CWS os2port03 (1.42.54); FILE MERGED
2008/01/14 16:28:46 ydario 1.42.54.1: build plugin only for unix and windows
Issue number:i85203
Submitted by:ydario
2008-07-22 16:16:04 +00:00
Ivo Hinkelmann
f1965256cc INTEGRATION: CWS logger2 (1.42.110); FILE MERGED
2008/07/03 10:32:05 b_michaelsen 1.42.110.3: #i88653# removed OOoImprovement extension from global build
2008/06/30 10:57:55 b_michaelsen 1.42.110.2: #158138# base64 encoding
2008/06/11 10:49:07 b_michaelsen 1.42.110.1: #i88653# liboooimprovecore implements the uno interface for the core components (com.sun.star.oooimprovecore.core)
2008-07-17 14:13:37 +00:00
Kurt Zenker
b4dd2bd262 INTEGRATION: CWS spotlightplugin01 (1.41.38); FILE MERGED
2007/09/14 21:06:33 fheckl 1.41.38.1: #72355 adding new files for macosx spotlight plugin
2007-10-09 14:03:53 +00:00
Rüdiger Timm
9aa4e03cfd INTEGRATION: CWS aquavcl01 (1.32.14); FILE MERGED
2007/04/11 08:00:04 pjanik 1.32.14.8: RESYNC: (1.38-1.39); FILE MERGED
2007/01/25 13:13:16 pjanik 1.32.14.7: RESYNC: (1.37-1.38); FILE MERGED
2006/12/07 14:27:54 pjanik 1.32.14.6: RESYNC: (1.36-1.37); FILE MERGED
2006/11/07 19:13:31 pjanik 1.32.14.5: RESYNC: (1.35-1.36); FILE MERGED
2006/08/21 22:20:47 cl 1.32.14.4: RESYNC: (1.34-1.35); FILE MERGED
2006/08/16 12:42:17 cl 1.32.14.3: RESYNC: (1.33-1.34); FILE MERGED
2006/03/10 14:21:33 tra 1.32.14.2: RESYNC: (1.32-1.33); FILE MERGED
2006/01/31 00:44:41 fheckl 1.32.14.1: Forgot prj/build.lst
2007-07-05 07:48:31 +00:00
Jens-Heiner Rechtien
a4c00b36be INTEGRATION: CWS sdblogging (1.38.60); FILE MERGED
2007/04/16 11:54:05 fs 1.38.60.2: RESYNC: (1.38-1.39); FILE MERGED
2007/04/05 07:34:51 fs 1.38.60.1: #i76199# new directory logging
2007-06-27 13:57:14 +00:00
Oliver Bolte
bdaea8bb2f INTEGRATION: CWS ause076 (1.38.50); FILE MERGED
2007/03/01 17:31:32 hjs 1.38.50.1: #i74879# remove from build
2007-03-09 07:38:15 +00:00
Kurt Zenker
b02d601391 INTEGRATION: CWS updatefeed (1.36.16); FILE MERGED
2006/11/23 14:59:03 obr 1.36.16.1: #i71853# update information provider service
2006-12-13 15:28:39 +00:00
Rüdiger Timm
6ebf3ae2a9 INTEGRATION: CWS noprotchk (1.36.30); FILE MERGED
2006/11/27 12:20:49 obr 1.36.30.1: #i71877# removed obsolete protocol handler check service
2006-12-01 14:09:12 +00:00
Rüdiger Timm
ab213c63b0 INTEGRATION: CWS ause060 (1.35.20); FILE MERGED
2006/09/22 18:01:43 hjs 1.35.20.1: #i69234# call required makefile
2006-10-30 07:08:29 +00:00
Vladimir Glazounov
720afc0ce7 #i10000# Needs 'component-update.dtd' delivered by module 'officecfg' 2006-08-10 14:45:19 +00:00
Ivo Hinkelmann
9963d46987 INTEGRATION: CWS onlineupdate3 (1.33.78); FILE MERGED
2006/07/20 06:43:51 obr 1.33.78.2: #i66949# replaced updchkcfg with updchkui
2006/07/13 06:12:15 obr 1.33.78.1: #i66949# initial commit of update check task
2006-08-04 08:54:58 +00:00
Rüdiger Timm
b9b41892c1 INTEGRATION: CWS fwk32 (1.32.12); FILE MERGED
2006/01/30 08:44:10 mav 1.32.12.1: #129241# introduce the dependency from np_sdk back
2006-02-09 12:48:31 +00:00
Oliver Bolte
9f91163857 INTEGRATION: CWS vcl49 (1.29.114); FILE MERGED
2005/12/15 12:42:56 pl 1.29.114.1: #i56878# removed dependency on np_sdk
2006-01-20 12:10:34 +00:00
Oliver Bolte
0d191a0574 INTEGRATION: CWS cmcfixes23 (1.29.108); FILE MERGED
2006/01/12 12:51:04 cmc 1.29.108.3: disable mozilla implies np_sdk
2006/01/12 11:14:20 cmc 1.29.108.2: RESYNC: (1.29-1.30); FILE MERGED
2005/11/30 12:52:44 cmc 1.29.108.1: add a TWAIN build_type
2006-01-20 09:58:42 +00:00
Oliver Bolte
bff65838ae INTEGRATION: CWS cmcfixes21 (1.29.104); FILE MERGED
2005/11/10 16:17:51 cmc 1.29.104.1: #i53612# np_sdk optional on MOZ
2005-12-21 10:13:16 +00:00
Rüdiger Timm
ea518378f2 INTEGRATION: CWS hidforall (1.28.2); FILE MERGED
2005/06/16 09:40:22 gh 1.28.2.1: #i40269#building HelpIDs on all platforms
2005-06-20 14:02:49 +00:00
Jens-Heiner Rechtien
164b66d390 INTEGRATION: CWS ause028 (1.27.44); FILE MERGED
2005/05/03 09:39:03 hjs 1.27.44.1: #109143# use generated includes from solver; cleanup
2005-06-09 13:54:49 +00:00
Vladimir Glazounov
3ee2b8450f INTEGRATION: CWS moresystemstuff (1.26.104); FILE MERGED
2005/02/16 13:22:59 rene 1.26.104.1: #i42902# patch to conditionalize putting libstdc++/libgcc_s into the installset
#i42911# patch to use system sane and system xrender headers
2005-02-21 14:26:26 +00:00
Rüdiger Timm
5feaeefdef INTEGRATION: CWS nsplugin2 (1.22.74); FILE MERGED
2004/05/27 03:48:10 jmeng 1.22.74.1: add nsplugin module for Mozilla plugin of StarOffice
2004-08-20 10:07:42 +00:00
Rüdiger Timm
f8f7b753d9 #i10000# dbimport does not exist any more 2004-08-04 14:37:27 +00:00
Jens-Heiner Rechtien
730eacb723 INTEGRATION: CWS scmtoapoc (1.22.52); FILE MERGED
2004/04/22 09:12:09 ssmith 1.22.52.1: #115692# ldap user profile backend
2004-08-03 14:00:14 +00:00
Jens-Heiner Rechtien
c493fbd405 INTEGRATION: CWS insight01 (1.22.18); FILE MERGED
2004/03/06 12:27:07 oj 1.22.18.1: #110542# remove dbimport from build list
2004-08-02 16:33:17 +00:00
Jens-Heiner Rechtien
979f1a0a51 INTEGRATION: CWS dialogdiet (1.21.110); FILE MERGED
2003/12/02 15:19:39 mba 1.21.110.1: #i22972#: offmgr removed
2004-02-03 16:09:43 +00:00
Vladimir Glazounov
1b977823df INTEGRATION: CWS tune01 (1.19.2.3.12); FILE MERGED
2003/04/04 15:00:54 hro 1.19.2.3.12.1: #i12688# Service InstallationCheck no longer used
2003-04-15 12:51:01 +00:00
Jens-Heiner Rechtien
29a4847890 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-25 15:04:55 +00:00
Vladimir Glazounov
7115328215 #100000# removed overflowing redundant dependency 2002-11-12 09:43:03 +00:00
Vladimir Glazounov
abb927c754 #100000# added global dependency 2002-11-12 09:04:29 +00:00
Gregor Hartmann
fe7f4ccfd0 #104771#fix building of hid.lst 2002-11-07 14:14:09 +00:00
Martin Hollmichel
cc54ec1d93 add: sane to deps, #104324# 2002-10-25 15:46:45 +00:00
Martin Hollmichel
49d40e947d del: inimgr #103111# build.lst 2002-09-16 07:00:09 +00:00
Mikhail Voitenko
d55065dec2 #101937# build ActiveX control 2002-08-14 14:24:12 +00:00
Kai Sommerfeld
0b02ac9462 #97805# - Removed installuser 2002-02-27 11:17:54 +00:00
Vladimir Glazounov
28e621fbda #65293# corrected misspelling & added dependency 2001-11-21 09:57:03 +00:00
Oliver Specht
f0179cbaaf #92472# preload wizard 2001-11-14 12:19:23 +00:00
Frank Schönheit
fcea38c558 #65293# project depends on offuh 2001-09-28 08:21:38 +00:00