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
|
99e3106a3e
|
mav60: #164341# support AES encryption
|
2011-03-17 09:16:41 +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
|
dc773cae3c
|
INTEGRATION: CWS changefileheader (1.3.98); FILE MERGED
2008/04/01 15:22:21 thb 1.3.98.2: #i85898# Stripping all external header guards
2008/03/31 16:19:06 rt 1.3.98.1: #i87441# Change license header to LPGL v3.
|
2008-04-10 15:30:52 +00:00 |
|
Rüdiger Timm
|
3e0db2f87f
|
INTEGRATION: CWS ooo19126 (1.2.230); FILE MERGED
2005/09/05 18:49:04 rt 1.2.230.1: #i54170# Change license header: remove SISSL
|
2005-09-08 15:02:05 +00:00 |
|
Martin Gallwey
|
2c341a1961
|
Encode unsigned byte streams, not signed byte streams
|
2001-05-08 12:52:52 +00:00 |
|
Martin Gallwey
|
fd22add0d9
|
#86409# initial import
|
2001-04-27 13:56:52 +00:00 |
|