[Libreoffice-commits] Changes to 'integration/dev300_m106'

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 2483dc22e8d78249cd9327a6c5f7ce07c09cf5aa
Merge: d1c8185b0d202a4d1faf5b480deaa1230d9a9f6e 3b40d2583ae83b265e7f014da0e2b83870c7a0cc
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:08:05 2011 +0200

    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