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, 9 insertions, 9 deletions

diff --git a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
index be41dd9ad589..c3a0db7d1ce4 100644
--- a/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
+++ b/offapi/com/sun/star/awt/tab/TabPageActivatedEvent.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-struct TabPageActivatedEvent: com::sun::star::lang::EventObject
+published struct TabPageActivatedEvent: com::sun::star::lang::EventObject
 {
     /** Contains the ID of the tab page
     */
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
index b97b7881b416..bb9a8456a330 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainerModel.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt {  module tab {
 
     @since OOo 3.4
  */
-service UnoControlTabPageContainerModel
+published service UnoControlTabPageContainerModel
 {
     service com::sun::star::awt::UnoControlModel;
 
diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
index 3508e33260c7..266f6a56119a 100644
--- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl
@@ -38,13 +38,13 @@ module com {  module sun {  module star {  module awt { module tab {
 /** specifies the standard model of a XTabPageModel.
     @since OOo 3.4
  */
-service UnoControlTabPageModel : XTabPageModel
+published service UnoControlTabPageModel : XTabPageModel
 {
     /** Creates a new XTabPageModel with a given ID.
     */
     create([in] short tabPageID);
 
-    /** Creates a new XTabPageModel with a given ID and a url which is used to load teh tab page model.
+    /** Creates a new XTabPageModel with a given ID and a url which is used to load the tab page model.
     */
     load([in] short tabPageID,[in] string url);
 };
diff --git a/offapi/com/sun/star/awt/tab/XTabPage.idl b/offapi/com/sun/star/awt/tab/XTabPage.idl
index 616820071f5b..0c79d34075d5 100644
--- a/offapi/com/sun/star/awt/tab/XTabPage.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPage.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPage
+published interface XTabPage
 {
 
 };
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
index e62cf4c365c1..0349b04cc637 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainer
+published interface XTabPageContainer
 {
     /** Returns the number of tab pages.
         @returns
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
index f46951231513..6bfe04e5babe 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerListener.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainerListener: com::sun::star::lang::XEventListener
+published interface XTabPageContainerListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** Invoked after a tab page was activated.
diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
index cc815209a01d..8b3bf2d9afbd 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt {  module tab {
 
     @since OOo 3.4
  */
-interface XTabPageContainerModel
+published interface XTabPageContainerModel
 {
     interface com::sun::star::container::XIndexContainer;
     interface com::sun::star::container::XContainer;
diff --git a/offapi/com/sun/star/awt/tab/XTabPageModel.idl b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
index 15fae422bb17..b07c3ea4ec6d 100644
--- a/offapi/com/sun/star/awt/tab/XTabPageModel.idl
+++ b/offapi/com/sun/star/awt/tab/XTabPageModel.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module awt {  module tab {
     @since OOo 3.4
 */
 
-interface XTabPageModel
+published interface XTabPageModel
 {
     //interface com::sun::star::lang::XMultiServiceFactory;