Commit Graph

11 Commits

Author SHA1 Message Date
Thomas Arnhold
d75f773f62 fixincludeguards.sh: package
Change-Id: Ia66d825baad3315c34bd579dc804f607bc6be30b
2014-04-19 11:10:11 +02:00
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
Mikhail Voytenko
481a55dc3b mav60: #164341# fix problems with the new implementation 2011-03-24 13:44:49 +01:00
Mikhail Voytenko
7422ecbc2a mav60: #164341# support AES encryption 2011-03-09 17:29:09 +01:00
Caolán McNamara
b77940e5af add modelines to .hxx files as well 2010-10-28 15:48:02 +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
Rüdiger Timm
cd194f25f5 INTEGRATION: CWS changefileheader (1.3.98); FILE MERGED
2008/04/01 15:22:20 thb 1.3.98.2: #i85898# Stripping all external header guards
2008/03/31 16:19:04 rt 1.3.98.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:24:30 +00:00
Rüdiger Timm
d481cc7056 INTEGRATION: CWS ooo19126 (1.2.128); FILE MERGED
2005/09/05 18:48:59 rt 1.2.128.1: #i54170# Change license header: remove SISSL
2005-09-08 14:55:26 +00:00
Kurt Zenker
594d4f4506 INTEGRATION: CWS mav05 (1.1.56); FILE MERGED
2003/07/21 14:14:19 mav 1.1.56.1: #i15929# include MediaType in raw stream header, and other fixes
2003-09-11 09:13:44 +00:00
Martin Gallwey
444129b8d3 #92268# data on encrypted data headers 2001-11-15 19:04:25 +00:00