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

3 files changed, 10 insertions, 10 deletions

diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 5943c1c59..2b82c4621 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.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
@@ -34,16 +34,16 @@
 module com { module sun { module star { module deployment {
 
 /** A DeploymentException reflects a deployment error.
-    
+
     @since OOo 2.0
  */
-exception DeploymentException : com::sun::star::uno::Exception
+published exception DeploymentException : com::sun::star::uno::Exception
 {
     /** reflects the cause of the error.  Commonly an exception.
     */
     any Cause;
 };
 
-}; }; }; }; 
+}; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/deployment/PackageInformationProvider.idl b/offapi/com/sun/star/deployment/PackageInformationProvider.idl
index 9a78f6b65..8f86fd4e1 100644
--- a/offapi/com/sun/star/deployment/PackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/PackageInformationProvider.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
@@ -36,7 +36,7 @@ module com { module sun { module star { module deployment {
 
     @since OOo 2.3
 */
-singleton PackageInformationProvider : XPackageInformationProvider;
+published singleton PackageInformationProvider : XPackageInformationProvider;
 
 }; }; }; };
 #endif
diff --git a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl b/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
index 08478310a..8885fd1cc 100644
--- a/offapi/com/sun/star/deployment/XPackageInformationProvider.idl
+++ b/offapi/com/sun/star/deployment/XPackageInformationProvider.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
@@ -33,12 +33,12 @@
 
 module com { module sun { module star { module deployment {
 
-/** Objects implementing this interface provide an URL to the root of 
+/** Objects implementing this interface provide an URL to the root of
     an installed package.
-    
+
     @since OOo 2.3
 */
-interface XPackageInformationProvider
+published interface XPackageInformationProvider
 {
     /** get Package information for a specific extension.