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

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 67745383b83a940ab14f2977623dba3102e93255
Merge: ff58fcbf09785c8fe78875e792857e4395cd69fe 293036cbef069d65942929fcdade2726795d1dda
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:10:13 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	offapi/com/sun/star/animations/XAnimationNode.idl
    	offapi/com/sun/star/awt/grid/XGridColumn.idl
    	offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
    	offapi/com/sun/star/frame/ModuleManager.idl
    	offapi/com/sun/star/frame/XLayoutManager.idl
    	offapi/com/sun/star/frame/XLayoutManagerListener.idl
    	offapi/com/sun/star/rendering/FontInfo.idl
    	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
    	offapi/com/sun/star/rendering/XCanvas.idl
    	offapi/com/sun/star/rendering/XSprite.idl
    	offapi/com/sun/star/report/ForceNewPage.idl
    	offapi/com/sun/star/report/ReportPrintOption.idl
    	offapi/com/sun/star/report/XFunctionsSupplier.idl
    	offapi/com/sun/star/report/XReportControlFormat.idl
    	offapi/com/sun/star/resource/StringResourceWithLocation.idl
    	offapi/com/sun/star/resource/XStringResourceResolver.idl
    	offapi/com/sun/star/resource/XStringResourceWithLocation.idl
    	offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
    	offapi/com/sun/star/security/XCertificateContainer.idl
    	offapi/com/sun/star/ui/UIElementFactory.idl
    	offapi/com/sun/star/ui/XImageManager.idl
    	offapi/com/sun/star/ui/XUIConfigurationManager.idl
    	offapi/com/sun/star/ui/XUIElementFactory.idl
    	offapi/com/sun/star/ui/XUIElementSettings.idl
    	offapi/com/sun/star/xml/crypto/SEInitializer.idl
    	offapi/com/sun/star/xml/crypto/XSEInitializer.idl
    	offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
    	offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
    	sal/rtl/source/alloc_arena.c
    	udkapi/com/sun/star/task/XInteractionHandler2.idl