Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	offapi/com/sun/star/awt/XCallback.idl
	offapi/com/sun/star/awt/XContainerWindowEventHandler.idl
	offapi/com/sun/star/awt/XContainerWindowProvider.idl
	offapi/com/sun/star/awt/XDialogEventHandler.idl
	offapi/com/sun/star/awt/XDialogProvider.idl
	offapi/com/sun/star/awt/XRequestCallback.idl
	offapi/com/sun/star/awt/XUnitConversion.idl
	offapi/com/sun/star/awt/grid/GridColumnEvent.idl
	offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
	offapi/com/sun/star/awt/tree/ExpandVetoException.idl
	offapi/com/sun/star/awt/tree/TreeDataModelEvent.idl
	offapi/com/sun/star/awt/tree/TreeExpansionEvent.idl
	offapi/com/sun/star/awt/tree/XMutableTreeDataModel.idl
	offapi/com/sun/star/awt/tree/XMutableTreeNode.idl
	offapi/com/sun/star/awt/tree/XTreeControl.idl
	offapi/com/sun/star/awt/tree/XTreeDataModel.idl
	offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
	offapi/com/sun/star/awt/tree/XTreeEditListener.idl
	offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
	offapi/com/sun/star/awt/tree/XTreeNode.idl
	offapi/com/sun/star/document/DocumentEvent.idl
	offapi/com/sun/star/document/XDocumentEventListener.idl
	offapi/com/sun/star/frame/XLayoutManagerListener.idl
	offapi/com/sun/star/geometry/XMapping2D.idl
	offapi/com/sun/star/inspection/XObjectInspectorUI.idl
	offapi/com/sun/star/inspection/XPropertyControl.idl
	offapi/com/sun/star/inspection/XPropertyControlFactory.idl
	offapi/com/sun/star/inspection/XPropertyControlObserver.idl
	offapi/com/sun/star/inspection/XPropertyHandler.idl
	offapi/com/sun/star/inspection/XStringRepresentation.idl
	offapi/com/sun/star/logging/LogRecord.idl
	offapi/com/sun/star/logging/XLogFormatter.idl
	offapi/com/sun/star/logging/XLogHandler.idl
	offapi/com/sun/star/logging/XLogger.idl
	offapi/com/sun/star/presentation/XSlideShowListener.idl
	offapi/com/sun/star/presentation/XSlideShowView.idl
	offapi/com/sun/star/rendering/FontInfo.idl
	offapi/com/sun/star/rendering/StrokeAttributes.idl
	offapi/com/sun/star/rendering/VolatileContentDestroyedException.idl
	offapi/com/sun/star/rendering/XAnimatedSprite.idl
	offapi/com/sun/star/rendering/XAnimation.idl
	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XBitmapCanvas.idl
	offapi/com/sun/star/rendering/XBufferController.idl
	offapi/com/sun/star/rendering/XCachedPrimitive.idl
	offapi/com/sun/star/rendering/XCanvas.idl
	offapi/com/sun/star/rendering/XCanvasFont.idl
	offapi/com/sun/star/rendering/XColorSpace.idl
	offapi/com/sun/star/rendering/XCustomSprite.idl
	offapi/com/sun/star/rendering/XGraphicDevice.idl
	offapi/com/sun/star/rendering/XLinePolyPolygon2D.idl
	offapi/com/sun/star/rendering/XParametricPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XSprite.idl
	offapi/com/sun/star/rendering/XSpriteCanvas.idl
	offapi/com/sun/star/rendering/XTextLayout.idl
	offapi/com/sun/star/report/XFixedLine.idl
	offapi/com/sun/star/report/XFixedText.idl
	offapi/com/sun/star/report/XFormatCondition.idl
	offapi/com/sun/star/report/XFormattedField.idl
	offapi/com/sun/star/report/XFunction.idl
	offapi/com/sun/star/report/XFunctions.idl
	offapi/com/sun/star/report/XFunctionsSupplier.idl
	offapi/com/sun/star/report/XGroup.idl
	offapi/com/sun/star/report/XGroups.idl
	offapi/com/sun/star/report/XImageControl.idl
	offapi/com/sun/star/report/XReportComponent.idl
	offapi/com/sun/star/report/XReportControlModel.idl
	offapi/com/sun/star/report/XReportDefinition.idl
	offapi/com/sun/star/report/XSection.idl
	offapi/com/sun/star/report/XShape.idl
	offapi/com/sun/star/report/inspection/DefaultComponentInspectorModel.idl
	offapi/com/sun/star/resource/XStringResourceResolver.idl
	offapi/com/sun/star/resource/XStringResourceWithLocation.idl
	offapi/com/sun/star/sdb/XDocumentDataSource.idl
	offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
	offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
	offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
	offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
	offapi/com/sun/star/sdb/tools/XConnectionTools.idl
	offapi/com/sun/star/security/SecurityInfrastructureException.idl
	offapi/com/sun/star/ui/XUIConfigurationManager.idl
	offapi/com/sun/star/ui/XUIElement.idl
	offapi/com/sun/star/ui/XUIElementSettings.idl
	offapi/com/sun/star/util/XModifiable2.idl
	offapi/com/sun/star/view/XMultiSelectionSupplier.idl
	offapi/com/sun/star/xml/crypto/SEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl

1 files changed, 11 insertions, 11 deletions

diff --git a/offapi/com/sun/star/rendering/XSprite.idl b/offapi/com/sun/star/rendering/XSprite.idl
index 3fd5b4079..76348558f 100644
--- a/offapi/com/sun/star/rendering/XSprite.idl
+++ b/offapi/com/sun/star/rendering/XSprite.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
 #ifndef __com_sun_star_rendering_XSprite_idl__
 #define __com_sun_star_rendering_XSprite_idl__
 
-#include <com/sun/star/uno/XInterface.idl> 
+#include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/geometry/RealPoint2D.idl>
 #include <com/sun/star/geometry/AffineMatrix2D.idl>
@@ -42,7 +42,7 @@ module com { module sun { module star { module rendering {
     <type>XSpriteCanvas</type>. Sprites are moving, back-buffered
     objects.<p>
  */
-interface XSprite : ::com::sun::star::uno::XInterface
+published interface XSprite : ::com::sun::star::uno::XInterface
 {
     /** Set overall transparency of the sprite.<p>
 
@@ -58,10 +58,10 @@ interface XSprite : ::com::sun::star::uno::XInterface
         background. Valid range is [0,1].
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if nAlpha is not within the permissible range.        
+        if nAlpha is not within the permissible range.
      */
     void setAlpha( [in] double nAlpha )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -88,15 +88,15 @@ interface XSprite : ::com::sun::star::uno::XInterface
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the view and render state parameters are outside the
-        specified range.        
+        specified range.
      */
     void move( [in] ::com::sun::star::geometry::RealPoint2D aNewPos, [in] ViewState aViewState, [in] RenderState aRenderState )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
     /** Apply a local transformation to the sprite.<p>
-        
+
         The given transformation matrix locally transforms the sprite
         shape. If this transformation contains translational
         components, be aware that sprite content moved beyond the
@@ -123,7 +123,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         if the given transformation matrix is singular.
      */
     void transform( [in] com::sun::star::geometry::AffineMatrix2D aTransformation )
-        raises (com::sun::star::lang::IllegalArgumentException); 
+        raises (com::sun::star::lang::IllegalArgumentException);
 
     //-------------------------------------------------------------------------
 
@@ -159,7 +159,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         @param aClip
         The clip poly-polygon to apply.
      */
-    void clip( [in] XPolyPolygon2D aClip ); 
+    void clip( [in] XPolyPolygon2D aClip );
 
     //-------------------------------------------------------------------------
 
@@ -176,7 +176,7 @@ interface XSprite : ::com::sun::star::uno::XInterface
         irregular floating point values here, the order position for
         sprites with such a priority value is undefined.
      */
-    void setPriority( [in] double nPriority ); 
+    void setPriority( [in] double nPriority );
 
     //-------------------------------------------------------------------------