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

12 files changed, 20 insertions, 20 deletions

diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index 5f6148c11355..04fda8584eb0 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -41,7 +41,7 @@
     </p>
     @see OfficeDatabaseDocument
  */
-interface XDocumentDataSource
+published interface XDocumentDataSource
 {
     /** provides access to the one and only <type>OfficeDatabaseDocument</type>
         which the data source is based on.
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index c3e125fdc940..e47b1f8dec15 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -37,7 +37,7 @@
 /** provides the access to a container of database forms.
     @see Forms
  */
-interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of forms.
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index ef7cdee0f173..7440c62476dd 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module sdb {
 //=============================================================================
 /** simplifies the accessing of data sources, and it's corresponding database document and forms, and reports.
 */
-interface XOfficeDatabaseDocument
+published interface XOfficeDatabaseDocument
 {
     /** allows to access the supplier for forms.
         @see com::sun::star::sdb::Forms
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index db17d331f03b..d0489cf544f7 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -37,7 +37,7 @@
 /** provides the access to a container of database reports.
     @see Reports
  */
-interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of reports.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 84f1ba95d7c3..b00af59a7c35 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -32,7 +32,7 @@
 #include <com/sun/star/sdbc/SQLException.idl>
 
 module com {  module sun {  module star {  module container {
-interface XIndexAccess;
+published interface XIndexAccess;
 };};};};
 //=============================================================================
 
@@ -47,7 +47,7 @@ interface XIndexAccess;
     structure of the used query.
     </p>
  */
-interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
+published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
 {
 
     /** returns the query.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index ba7f716c58c5..f3af1cd777af 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -50,7 +50,7 @@
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
-interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
+published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
 {
     //-------------------------------------------------------------------------
     // FILTER
@@ -203,7 +203,7 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             if a database access error occurs.
      */
     void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
-                              [in] boolean ascending)
+                             [in] boolean ascending)
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index 120280fd7ef3..2f9e86b10df6 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module sdb {
 
     @since OOo 3.1
  */
-interface XSubDocument
+published interface XSubDocument
 {
     /** opens the sub document
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index aef6d49dff40..527186f4046b 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module sdb { module application {
 
     @since OOo 2.2
  */
-interface XDatabaseDocumentUI
+published interface XDatabaseDocumentUI
 {
     /** provides access to the data source belong to the database document
     */
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index 9f74750c630b..2f35b5a84fda 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -33,21 +33,21 @@
 
 module com {  module sun {  module star {
     module container {
-        interface XNameAccess;
+        published interface XNameAccess;
     };
     module lang {
-        interface XComponent;
+        published interface XComponent;
     };
 };};};
 //=============================================================================
 module com {  module sun {  module star {  module sdb {
-    interface XSingleSelectQueryComposer;
+    published interface XSingleSelectQueryComposer;
     module tools {
 //=============================================================================
 
-interface XTableName;
-interface XObjectNames;
-interface XDataSourceMetaData;
+published interface XTableName;
+published interface XObjectNames;
+published interface XDataSourceMetaData;
 
 //-----------------------------------------------------------------------------
 /** encapsulates various useful functionality around a
@@ -64,7 +64,7 @@ interface XDataSourceMetaData;
 
     @since OOo 2.0.4
 */
-interface XConnectionTools
+published interface XConnectionTools
 {
     /** creates an instance supporting the <type>XTableName</type> interface,
         which can be used to manipulate table names for various purposes.
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index 2ffb3caabb0a..a7c7daad4083 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -34,7 +34,7 @@
 module com {  module sun {  module star {  module sdb { module tools {
 //=============================================================================
 
-interface XDataSourceMetaData
+published interface XDataSourceMetaData
 {
     /** determines whether the data source supports queries in the <code>FROM</code>
         part of a <code>SELECT</code> statement.
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index 6f55eda0d20a..3fcf6a207bf7 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -65,7 +65,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XObjectNames
+published interface XObjectNames
 {
     /** suggests a (unique) table or query name
 
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 4f80998bd4f3..935e03bec32a 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -64,7 +64,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XTableName
+published interface XTableName
 {
     /** denotes the name of the catalog which the table is a part of
     */