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, 10 insertions, 8 deletions

diff --git a/udkapi/com/sun/star/beans/Ambiguous.idl b/udkapi/com/sun/star/beans/Ambiguous.idl
index 919c7250f462..ec443e7cb5d5 100644
--- a/udkapi/com/sun/star/beans/Ambiguous.idl
+++ b/udkapi/com/sun/star/beans/Ambiguous.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEAMBIGUOUS</const>.</p>
  */
-struct Ambiguous<T> {
+published struct Ambiguous<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Defaulted.idl b/udkapi/com/sun/star/beans/Defaulted.idl
index d67f1aacf055..7b0b09318611 100644
--- a/udkapi/com/sun/star/beans/Defaulted.idl
+++ b/udkapi/com/sun/star/beans/Defaulted.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module beans {
    have the <const
    scope="com::sun::star::beans">PropertyAttribute::MAYBEDEFAULT</const>.</p>
  */
-struct Defaulted<T> {
+published struct Defaulted<T> {
     /**
        The underlying value of this structure instance.
 
diff --git a/udkapi/com/sun/star/beans/Optional.idl b/udkapi/com/sun/star/beans/Optional.idl
index fbf58b667c16..a2786e5190c1 100644
--- a/udkapi/com/sun/star/beans/Optional.idl
+++ b/udkapi/com/sun/star/beans/Optional.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module beans {
    also be useful in other situations, for example as the return type of an
    interface method.</p>
  */
-struct Optional<T> {
+published struct Optional<T> {
     /**
        Marks this structure instance as having an actual value.
      */
diff --git a/udkapi/com/sun/star/beans/Pair.idl b/udkapi/com/sun/star/beans/Pair.idl
index 0bb214fb87bb..4089300a5a44 100644
--- a/udkapi/com/sun/star/beans/Pair.idl
+++ b/udkapi/com/sun/star/beans/Pair.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module beans {
 
     @since OOo 3.0
  */
-struct Pair<T, U> {
+published struct Pair<T, U> {
 
     /// first object.
     T First;
diff --git a/udkapi/com/sun/star/io/TempFile.idl b/udkapi/com/sun/star/io/TempFile.idl
index b00bb5099e70..06b77e2b5c20 100644
--- a/udkapi/com/sun/star/io/TempFile.idl
+++ b/udkapi/com/sun/star/io/TempFile.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This service allows to get access to temp files.
  */
-service TempFile : XTempFile;
+published service TempFile : XTempFile;
 
 //=========================================================================
 
diff --git a/udkapi/com/sun/star/io/XTempFile.idl b/udkapi/com/sun/star/io/XTempFile.idl
index b1e8f158944f..bda47cffa887 100644
--- a/udkapi/com/sun/star/io/XTempFile.idl
+++ b/udkapi/com/sun/star/io/XTempFile.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module io {
 //========================================================================
 /** This interface offers access to temp files.
  */
-interface XTempFile
+published interface XTempFile
 {
     // INTERFACES
     //
diff --git a/udkapi/com/sun/star/script/ArrayWrapper.idl b/udkapi/com/sun/star/script/ArrayWrapper.idl
index 54d4b23ec7ac..47193e1f5603 100644
--- a/udkapi/com/sun/star/script/ArrayWrapper.idl
+++ b/udkapi/com/sun/star/script/ArrayWrapper.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star { module script {
     preference for a Multi-Dimensional array representation to be specified.</p>
 */
 
-struct ArrayWrapper
+published struct ArrayWrapper
 {
     /** Indicates whether the Array should be have 1 or 0 based indexing.
     */
diff --git a/udkapi/com/sun/star/task/XInteractionHandler2.idl b/udkapi/com/sun/star/task/XInteractionHandler2.idl
index ef2ab140074a..80c7bb67bc59 100644
--- a/udkapi/com/sun/star/task/XInteractionHandler2.idl
+++ b/udkapi/com/sun/star/task/XInteractionHandler2.idl
@@ -41,8 +41,10 @@
    <p>This interface extends the interface <type>XInteractionHandler</type>
       the way that a caller can determine whether an interaction request was
       actually handled by the interaction handler.</p>
+
+      @since OOo 3.2
  */
-/* published */ interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
+published interface XInteractionHandler2 : com::sun::star::task::XInteractionHandler
 {
     //-------------------------------------------------------------------------
     /** Handle an interaction request.