Jan Holesovsky bef8909ce1 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		2011-04-22 15:10:13 +02:00
..
comp	Merge commit 'ooo/DEV300_m106' into libreoffice-3-4	2011-04-22 15:10:13 +02:00
lib	Automated merge with ssh://hg.services.openoffice.org/cws/dba34d	2011-03-10 13:03:13 +01:00
uno	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