Commit graph

40 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
Ivo Hinkelmann
bb450689ca CWS-TOOLING: integrate CWS mav60 2011-04-01 10:18:41 +02:00
Mikhail Voytenko
a00f39b917 mav60: #164341# adjust unix builds 2011-03-27 18:41:11 +02:00
Mikhail Voytenko
66164edf5b mav60: #164341# introduce nss initialization for the case when mscrypto is used 2011-03-27 10:36:28 +02:00
Mikhail Voytenko
0cdc1272fd mav60: #164341# fix problems with the new implementation 2011-03-23 18:59:23 +01:00
Mikhail Voytenko
1decd7beff mav60: #164341# fix problems with the new implementation 2011-03-23 14:13:24 +01:00
Mikhail Voytenko
99e3106a3e mav60: #164341# support AES encryption 2011-03-17 09:16:41 +01:00
Mikhail Voytenko
7422ecbc2a mav60: #164341# support AES encryption 2011-03-09 17:29:09 +01:00
Caolán McNamara
a64e5e3cf5 avoid implicit cast 2011-03-01 20:34:28 +00:00
Tobias Krause
4b0358a8ed tkr38: fixed broken error text print out if nss init fails (PR_GetErrorText doesn't allow NULL parameter) 2011-02-14 11:28:12 +01:00
Julien Nabet
2bc5fb3428 Some cppcheck cleaning 2011-01-11 21:06:19 +00:00
Sebastian Spaeth
ead7290449 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-13 10:57:23 +02:00
Vladimir Glazunov
94bf193db9 CWS-TOOLING: integrate CWS jl137 2010-03-10 15:29:46 +01:00
Jens-Heiner Rechtien
36de66bdf0 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Joachim Lingner
0896dd6ff0 jl137: #i107145# improve NSS initialization without profile 2009-11-23 17:10:39 +01:00
Joachim Lingner
571f1b1080 jl137: #i103420# better allow tracing in product built depending on bootstrap var XMLSECURITY_TRACE 2009-11-09 16:49:25 +01:00
jl
639e808078 #103420# use CERT_PKIXVerifyCert 2009-10-29 11:31:59 +01:00
Release Engineers
f63344dfd6 CWS-TOOLING: integrate CWS jl127
2009-07-30 10:12:10 +0200 jl  r274470 : #i100873# switch on checking for symbol definitions. It works with the current xpcom lib.
2009-07-29 09:48:29 +0200 jl  r274443 : #i100873#
2009-07-29 09:47:36 +0200 jl  r274442 : #i100873# changes after resync with DEV300m53 which contains the seamonkey update
2009-07-28 10:00:03 +0200 jl  r274389 : #100873# Patches from tono
2009-07-27 16:59:39 +0200 jl  r274372 : CWS-TOOLING: rebase CWS jl127 to trunk@274203 (milestone: DEV300:m53)
2009-07-07 09:08:53 +0200 jl  r273768 : #100873#
2009-07-06 17:16:10 +0200 jl  r273754 : #100873#
2009-07-01 13:58:09 +0200 jl  r273576 : #100873# added to readme
2009-07-01 13:15:02 +0200 jl  r273573 : #100873# deliver lib files when building with MS compiler
2009-06-30 11:22:06 +0200 jl  r273498 : #i100873# accidentally commented out patch_files
2009-06-30 09:01:10 +0200 jl  r273489 : #100873# make rc.exe work in ooo windows build
2009-06-29 09:47:56 +0200 jl  r273451 : #i100873# applied mingw patch from tono
2009-06-24 12:52:14 +0200 jl  r273332 : #100873# reapplying the configure.in patch on version 273150
2009-06-24 12:51:12 +0200 jl  r273331 : #100873# reapplying the patch on version 273150
2009-06-23 17:17:36 +0200 jl  r273299 : #100873# manually modified patch from tono
2009-06-22 17:05:41 +0200 jl  r273243 : #100873# applying mingw patch from tono
2009-06-22 17:02:30 +0200 jl  r273242 : #100873# applying mingw patch from tono
2009-06-22 12:49:57 +0200 jl  r273216 : #100873# dependency to stlport
2009-06-19 11:56:16 +0200 jl  r273155 : #100873# undoing a previous change, instset_native complained about missing libjpipe.jnilib (jurt)
2009-06-19 10:13:03 +0200 jl  r273150 : #100873# ooo builds shall also use the new nss by default
2009-06-18 14:32:07 +0200 jl  r273117 : #110873# more debug output when verifying a certificate
2009-06-16 11:23:50 +0200 jl  r273012 : #i10873#
2009-06-16 10:57:41 +0200 jl  r273011 : #100873# wrong parameter definition in nsscrypto_initialize
2009-06-16 10:56:45 +0200 jl  r273010 : #100873# wrong parameter definition in nsscrypto_initialize
2009-06-15 16:20:42 +0200 jl  r272996 : #100873# initialization of NSS is now threadsafe
2009-06-10 12:50:46 +0200 jl  r272804 : #100873# rename in foreach fails in 4nt
2009-06-09 13:43:00 +0200 jl  r272768 : #i100873# deliver only .h from inc/nss otherwise we get a warning when nss/nssck.api is delivered
2009-06-08 16:15:44 +0200 jl  r272739 : #i100873#
2009-06-08 16:04:54 +0200 jl  r272738 : #i100873#
2009-06-08 15:45:52 +0200 jl  r272736 : #i100873#
2009-06-08 15:44:15 +0200 jl  r272735 : #i100873# unzipping of nss.tar.z not working with 4nt
2009-06-08 09:45:46 +0200 jl  r272720 : #i100873#
2009-06-03 13:53:52 +0200 jl  r272562 : #i100873#  MOZILLABUILD not correct
2009-06-03 13:17:54 +0200 jl  r272557 : #i100873#  readme and makefile changes from cws jl125, support of new nss module
2009-06-03 09:57:40 +0200 jl  r272544 : #i100873#  added readme
2009-06-02 16:47:47 +0200 jl  r272512 : #i100873#  removed no longer needed stuff regarding jnilibs
2009-06-02 15:54:42 +0200 jl  r272510 : #i100873# added NSS to BUILD_TYPE
2009-06-02 15:20:18 +0200 jl  r272508 : #i100873# DEREFERENCE option for copy command
2009-06-02 13:00:12 +0200 jl  r272496 : #i100873# PATCH_FILE_NAMES is now PATCH_FILES
2009-06-02 12:23:39 +0200 jl  r272494 : #i100873# build dependency to nss
2009-05-29 16:21:40 +0200 jl  r272470 : #i100873# seting ENABLE_NSS_MODULE==YES and includeing mozilla-build-1.3 folder in environment
2009-05-29 16:03:23 +0200 jl  r272468 : #i100873# use intermediate certificates when validating a certificate
2009-05-29 15:57:16 +0200 jl  r272466 : #i100873# use intermediate certificates when validating a certificate
2009-05-29 15:49:58 +0200 jl  r272464 : #i100873# using ENABLE_NSS_MODULE
2009-05-29 15:33:14 +0200 jl  r272463 : #i100873# using ENABLE_NSS_MODULE
2009-05-29 15:28:39 +0200 jl  r272461 : #i100873# build dependency to nss module
2009-05-29 15:24:57 +0200 jl  r272460 : #i100873# pass additional certificates into verifyCertificate function
2009-05-29 14:49:40 +0200 jl  r272458 : #i100873# new NSS module
2009-05-29 14:43:44 +0200 jl  r272457 : #i100873# new NSS module
2009-08-26 08:22:01 +00:00
Vladimir Glazounov
d6a49f2e04 INTEGRATION: CWS cmcfixes48 (1.21.22); FILE MERGED
2008/07/24 13:25:05 cmc 1.21.22.1: #i92087# ensure Root Certs are available
2008-08-18 12:16:11 +00:00
Rüdiger Timm
f48ca0a514 INTEGRATION: CWS changefileheader (1.20.10); FILE MERGED
2008/04/01 13:06:26 thb 1.20.10.2: #i85898# Stripping all external header guards
2008/03/31 16:31:05 rt 1.20.10.1: #i87441# Change license header to LPGL v3.
2008-04-10 23:38:31 +00:00
Vladimir Glazounov
d3ff02c25c INTEGRATION: CWS jl84_SRC680 (1.19.14); FILE MERGED
2008/01/15 12:37:53 jl 1.19.14.1: #i85041# crash when showing the macro security  dialog
2008-01-28 12:54:42 +00:00
Rüdiger Timm
8028977051 INTEGRATION: CWS tkr05_SRC680 (1.18.22); FILE MERGED
2007/10/05 06:43:17 tkr 1.18.22.2: #31053# https webdav support
2007/09/20 11:07:14 tkr 1.18.22.1: #i31053#: WebDAV HTTPS Support
2007-11-07 09:07:25 +00:00
Ivo Hinkelmann
70ad4bc05e INTEGRATION: CWS jl51 (1.17.30); FILE MERGED
2007/02/06 16:38:13 jl 1.17.30.2: #i69228 warning free code
2007/02/05 13:54:22 jl 1.17.30.1: #i69228 warning free code
2007-04-17 09:27:46 +00:00
Oliver Bolte
f1fb2faa82 INTEGRATION: CWS pchfix02 (1.16.6); FILE MERGED
2006/09/01 18:00:56 kaib 1.16.6.1: #i68856# Added header markers and pch files
2006-09-16 13:45:55 +00:00
Oliver Bolte
c88d1fae6b INTEGRATION: CWS jl34 (1.15.54); FILE MERGED
2006/05/12 13:31:16 jl 1.15.54.3: #i39382# security environment now obtains the slots by itself, in order to recognize if a smardcard has been added while the signature dialog is already open
2006/05/12 13:22:22 jl 1.15.54.2: #i39382# security environment now obtains the slots by itself, in order to recognize if a smardcard has been added while the signature dialog is already open
2006/05/05 14:29:32 jl 1.15.54.1: #i39382# support for multiple slots in one security environment
2006-07-13 07:10:36 +00:00
Rüdiger Timm
3f022b7af8 INTEGRATION: CWS ooo19126 (1.14.38); FILE MERGED
2005/09/05 17:02:02 rt 1.14.38.1: #i54170# Change license header: remove SISSL
2005-09-09 16:34:13 +00:00
Rüdiger Timm
3eaaa90491 INTEGRATION: CWS xmlsec12 (1.13.6); FILE MERGED
2005/05/09 12:10:24 mt 1.13.6.2: #i48633# Try NSS_Init_NoDB, if normal init failes...
2005/04/14 16:08:02 mt 1.13.6.1: clean-ups...
2005-05-18 08:58:55 +00:00
Rüdiger Timm
ac7b913530 INTEGRATION: CWS systemmozilla (1.11.22); FILE MERGED
2005/03/12 00:00:34 rene 1.11.22.2: RESYNC: (1.11-1.12); FILE MERGED
2005/01/17 13:32:05 rene 1.11.22.1: implement MOZ_NSS_HACK to build even without PK11_GetCertFromPrivateKey missing from mozilla and use nssrenam.h, needed for e.g. CERT_DecodeDERCertificate availavailablity
2005-03-30 10:37:03 +00:00
Vladimir Glazounov
b05a3a4a59 INTEGRATION: CWS xmlsec08 (1.11.24); FILE MERGED
2005/03/03 10:27:46 mt 1.11.24.4: #i43491# Merged XMLSEC09 changes...
2005/02/01 11:15:14 mmi 1.11.24.3: Chinese font displayed.
Issue number:  41071
Submitted by:  Chandler Peng
Reviewed by:
2005/01/21 06:07:25 mmi 1.11.24.2:
Issue number:  39448
Submitted by:
Reviewed by:
2005/01/20 03:34:28 mmi 1.11.24.1: smartcard support
Issue number:  38448
Submitted by:
Reviewed by:
2005-03-10 17:13:08 +00:00
Michael Mi
30550266f1 Issue number:
Submitted by: Andrew Fan
Reviewed by:

Fix the bug that NSS only can be initialized once if some resouces still in use.
2004-08-05 06:13:30 +00:00
Malte Timmermann
42a7aa467a #i21596# Digital Signatures... 2004-07-23 08:58:23 +00:00
Malte Timmermann
4bcf58803b #i21596# Digital Signatures... 2004-07-23 07:34:25 +00:00
Michael Mi
7735f9f712 mozilla registry.dat support
Issue number:
Submitted by:
Reviewed by:
2004-07-23 03:53:50 +00:00
Michael Mi
010915ede4 mozilla registry.dat parsing
Issue number:
Submitted by:
Reviewed by:
2004-07-23 02:37:00 +00:00
Michael Mi
9f3abd38e0 mozilla registry.dat parsing
Issue number:
Submitted by:
Reviewed by:
2004-07-23 02:00:43 +00:00
Malte Timmermann
61dd1203a5 #i21596# Digital Signatutres... 2004-07-21 13:34:06 +00:00
Michael Mi
8a806a8962 nss profile supporting
Issue number:
Submitted by:
Reviewed by:
2004-07-19 09:09:14 +00:00
Michael Mi
e78005be59 nss user profile support
Issue number:
Submitted by:
Reviewed by:
2004-07-19 06:36:28 +00:00
Michael Mi
34fe1cc961 Issue number:
Submitted by:
Reviewed by:

Comments out xpocom codes.
2004-07-15 07:24:49 +00:00
Malte Timmermann
9f34fde7a8 libxmlsec 2004-07-12 12:15:31 +00:00