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

8 files changed, 8 insertions, 8 deletions

diff --git a/offapi/com/sun/star/geometry/AffineMatrix2D.idl b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
index 55d8c14473b8..919ee070b65f 100644
--- a/offapi/com/sun/star/geometry/AffineMatrix2D.idl
+++ b/offapi/com/sun/star/geometry/AffineMatrix2D.idl
@@ -67,7 +67,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct AffineMatrix2D
+published struct AffineMatrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/IntegerSize2D.idl b/offapi/com/sun/star/geometry/IntegerSize2D.idl
index cf3e1a215adb..0f41d2d6a147 100644
--- a/offapi/com/sun/star/geometry/IntegerSize2D.idl
+++ b/offapi/com/sun/star/geometry/IntegerSize2D.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct IntegerSize2D
+published struct IntegerSize2D
 {
     /// Amount of space occupied in the x direction.
     long Width;
diff --git a/offapi/com/sun/star/geometry/Matrix2D.idl b/offapi/com/sun/star/geometry/Matrix2D.idl
index d0e8bf357f2a..7d96b7d2af0b 100644
--- a/offapi/com/sun/star/geometry/Matrix2D.idl
+++ b/offapi/com/sun/star/geometry/Matrix2D.idl
@@ -70,7 +70,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct Matrix2D
+published struct Matrix2D
 {
     /// The top, left matrix entry.
     double m00;
diff --git a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
index 6ec7e1b8b83d..83180b1ae4ee 100644
--- a/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
+++ b/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module geometry {
     @see com.sun.star.rendering.XBezierPolyPolygon2D
     @since OOo 2.0
  */
-struct RealBezierSegment2D
+published struct RealBezierSegment2D
 {
     /// The x coordinate of the start point.
     double Px;
diff --git a/offapi/com/sun/star/geometry/RealPoint2D.idl b/offapi/com/sun/star/geometry/RealPoint2D.idl
index 1ac34b7a380e..4f9b0fbc8e9f 100644
--- a/offapi/com/sun/star/geometry/RealPoint2D.idl
+++ b/offapi/com/sun/star/geometry/RealPoint2D.idl
@@ -36,7 +36,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealPoint2D
+published struct RealPoint2D
 {
     /// The x coordinate of the point.
     double X;
diff --git a/offapi/com/sun/star/geometry/RealRectangle2D.idl b/offapi/com/sun/star/geometry/RealRectangle2D.idl
index 39cd783f3c08..52e113046e50 100644
--- a/offapi/com/sun/star/geometry/RealRectangle2D.idl
+++ b/offapi/com/sun/star/geometry/RealRectangle2D.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealRectangle2D
+published struct RealRectangle2D
 {
     /// X coordinate of upper left corner .
     double X1;
diff --git a/offapi/com/sun/star/geometry/RealSize2D.idl b/offapi/com/sun/star/geometry/RealSize2D.idl
index dab80a5c7deb..a01fa5bd96db 100644
--- a/offapi/com/sun/star/geometry/RealSize2D.idl
+++ b/offapi/com/sun/star/geometry/RealSize2D.idl
@@ -35,7 +35,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-struct RealSize2D
+published struct RealSize2D
 {
     /// Amount of space occupied in the x direction.
     double Width;
diff --git a/offapi/com/sun/star/geometry/XMapping2D.idl b/offapi/com/sun/star/geometry/XMapping2D.idl
index f36bf2b5b3d8..356afa5dfdfc 100644
--- a/offapi/com/sun/star/geometry/XMapping2D.idl
+++ b/offapi/com/sun/star/geometry/XMapping2D.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module geometry {
 
     @since OOo 2.0
  */
-interface XMapping2D : ::com::sun::star::uno::XInterface
+published interface XMapping2D : ::com::sun::star::uno::XInterface
 {
     /** Forward 2D mapping function
      */