Jan Holesovsky
|
88c1a56d11
|
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svguno.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
|
2011-05-27 20:39:30 +02: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 |
|
Francisco Saito
|
9254236366
|
drop bogus executable flag from odf files
|
2011-03-29 21:43:57 +01:00 |
|
Tobias Krause
|
d5feca7dcd
|
tkr38: #i112307# Support for x509 v3 Subject Alternative Name extension added
|
2011-02-03 16:22:52 +01:00 |
|
Thomas Arnhold
|
4fa94fc506
|
Remove one more RCS line.
|
2011-01-21 21:12:23 +01:00 |
|
Kurt Zenker
|
1a290488a3
|
CWS-TOOLING: integrate CWS jl153_OOO330
|
2010-07-13 14:03:52 +02:00 |
|
Joachim Lingner
|
4ee1d02b33
|
jl153 #i112218# correctly displaying issuer/subject names when they use multi-value RDN
|
2010-06-18 15:33:33 +02:00 |
|
Ivo Hinkelmann
|
744542f414
|
jpropenable: #i112445# exclude this file from l10n process
|
2010-06-16 14:30:12 +02:00 |
|
Joachim Lingner
|
2d0ed664c3
|
jl145: #i108452# tests for digital signatures
|
2010-01-19 15:45:31 +01:00 |
|