Commit graph

6 commits

Author SHA1 Message Date
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
Kai Sommerfeld
0461d179dd #i117329# - Publishing of UNO types,third wave. 2011-03-17 12:50:52 +01:00
Aurimas Fiseras
3124c2d617 Fix typos in the documentation 2010-10-17 08:49:58 -05:00
Frank Schoenheit [fs]
ec28ca0919 fs33a: #i111238# [s|g]etUserData -> [s|g]etItemData 2010-04-29 15:29:46 +02:00
Frank Schoenheit [fs]
031a451a48 fs33a: #i111238# now with UserData support 2010-04-29 14:10:03 +02:00
Frank Schoenheit [fs]
58c7801ffd fs33a: #i111238# add support for images to AWT's ListBoxControl/Model 2010-04-29 10:05:04 +02:00