Commit Graph

17 Commits

Author SHA1 Message Date
Michael Meeks
b9042fad7c re-base on ALv2 code.
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21 15:00:05 +01:00
Norbert Thiebaud
b33971cb12 remove include of pch header from xmlsecurity 2011-11-27 13:28:28 -06:00
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
Michael Meeks
c364c9efd3 remove obsolete component_writeInfo methods 2011-04-01 22:33:12 +01: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
99e3106a3e mav60: #164341# support AES encryption 2011-03-17 09:16:41 +01:00
Thomas Arnhold
50c26300e5 Remove lots of dead code 2011-02-06 13:43:35 +01:00
Gert Faller
7692bfc268 RTL_CONSTASCII_USTRINGPARAM in components 3 2010-11-28 18:33:53 +01:00
Gert Faller
1231e74a6d RTL_CONSTASCII_USTRINGPARAM in components 2 (build problem in sal ?) 2010-11-27 17:20:30 +01:00
Gert Faller
f357474191 RTL_CONSTASCII_USTRINGPARAM in components 1 2010-11-27 11:54:21 +01: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
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
Rüdiger Timm
be8c7afaec INTEGRATION: CWS changefileheader (1.4.66); FILE MERGED
2008/04/01 13:06:27 thb 1.4.66.2: #i85898# Stripping all external header guards
2008/03/31 16:31:06 rt 1.4.66.1: #i87441# Change license header to LPGL v3.
2008-04-10 23:41:11 +00:00
Ivo Hinkelmann
63692fbfe3 INTEGRATION: CWS jl51 (1.3.30); FILE MERGED
2007/02/05 13:54:23 jl 1.3.30.1: #i69228 warning free code
2007-04-17 09:29:14 +00:00
Oliver Bolte
c6bb5779b6 INTEGRATION: CWS pchfix02 (1.2.86); FILE MERGED
2006/09/01 18:00:57 kaib 1.2.86.1: #i68856# Added header markers and pch files
2006-09-16 13:47:06 +00:00
Rüdiger Timm
4bf5271308 INTEGRATION: CWS ooo19126 (1.1.1.1.86); FILE MERGED
2005/09/05 17:02:05 rt 1.1.1.1.86.1: #i54170# Change license header: remove SISSL
2005-09-09 16:36:50 +00:00
Malte Timmermann
9f34fde7a8 libxmlsec 2004-07-12 12:15:31 +00:00