Commit Graph

13 Commits

Author SHA1 Message Date
Michael Meeks
b9042fad7c re-base on ALv2 code.
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21 15:00:05 +01: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
Ivo Hinkelmann
bb450689ca CWS-TOOLING: integrate CWS mav60 2011-04-01 10:18:41 +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
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
Guillaume Poussel
842bfb16f7 Remove useless comments in components. 2011-02-08 19:06:48 +01:00
Caolán McNamara
b77940e5af add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
Petr Mladek
d41279d586 more removed include guards using fixguard.py 2010-10-05 18:08:01 +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
e7309438a4 INTEGRATION: CWS changefileheader (1.2.190); FILE MERGED
2008/04/01 16:11:07 thb 1.2.190.3: #i85898# Stripping all external header guards
2008/04/01 13:06:26 thb 1.2.190.2: #i85898# Stripping all external header guards
2008/03/31 16:31:05 rt 1.2.190.1: #i87441# Change license header to LPGL v3.
2008-04-10 23:38:46 +00:00
Rüdiger Timm
c35e5ffb99 INTEGRATION: CWS ooo19126 (1.1.1.1.86); FILE MERGED
2005/09/05 17:02:03 rt 1.1.1.1.86.1: #i54170# Change license header: remove SISSL
2005-09-09 16:34:28 +00:00
Malte Timmermann
9f34fde7a8 libxmlsec 2004-07-12 12:15:31 +00:00