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

20 files changed, 22 insertions, 22 deletions

diff --git a/offapi/com/sun/star/ui/DockingArea.idl b/offapi/com/sun/star/ui/DockingArea.idl
index f376581e0c7e..7880efb8ebd8 100644
--- a/offapi/com/sun/star/ui/DockingArea.idl
+++ b/offapi/com/sun/star/ui/DockingArea.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-enum DockingArea
+published enum DockingArea
 {
     /** the top docking area below the menu bar.
     */
diff --git a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
index a14cfd7a6524..a93f4c6949c3 100644
--- a/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/ModuleUIConfigurationManagerSupplier.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service ModuleUIConfigurationManagerSupplier
+published service ModuleUIConfigurationManagerSupplier
 {
     /** controls module based user interface configuration managers.
 
diff --git a/offapi/com/sun/star/ui/UIElementFactory.idl b/offapi/com/sun/star/ui/UIElementFactory.idl
index 303d8e5d6b82..7436db4df056 100644
--- a/offapi/com/sun/star/ui/UIElementFactory.idl
+++ b/offapi/com/sun/star/ui/UIElementFactory.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service UIElementFactory
+published service UIElementFactory
 {
     /** this interface provides a function to create and initialize new
         instances of user interface elements.
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index a4e94bb37d62..f8e299fe1396 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-service WindowStateConfiguration
+published service WindowStateConfiguration
 {
     /** provides access to window based information about user interface elements
         of all installed application modules.
diff --git a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
index 98c2a8c79a0c..02565db35b5d 100644
--- a/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
+++ b/offapi/com/sun/star/ui/XDockingAreaAcceptor.idl
@@ -55,7 +55,7 @@ module com { module sun { module star { module ui {
 */
 
 
-interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
+published interface XDockingAreaAcceptor : com::sun::star::uno::XInterface
 {
     /** provide the container window where the layout manager can request border
         space for docking windows.
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index beb522241d4e..c83ba95f062a 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module ui {
     </p>
 */
 
-interface XImageManager
+published interface XImageManager
 {
     /** resets the image manager to default data.
 
diff --git a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
index 08f358fb1dc5..527611b13a50 100644
--- a/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XModuleUIConfigurationManagerSupplier.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+published interface XModuleUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the requested module based user interface configuration manager.
diff --git a/offapi/com/sun/star/ui/XToolPanel.idl b/offapi/com/sun/star/ui/XToolPanel.idl
index 261f4c20413d..6b485d1b8b51 100644
--- a/offapi/com/sun/star/ui/XToolPanel.idl
+++ b/offapi/com/sun/star/ui/XToolPanel.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module ui {
 
 /** describes the basic interface to be implemented by a tool panel
  */
-interface XToolPanel
+published interface XToolPanel
 {
     /** provides access to the tool panel's main window.
 
diff --git a/offapi/com/sun/star/ui/XUIConfiguration.idl b/offapi/com/sun/star/ui/XUIConfiguration.idl
index 0411e14aaaaf..dd5db80352bd 100644
--- a/offapi/com/sun/star/ui/XUIConfiguration.idl
+++ b/offapi/com/sun/star/ui/XUIConfiguration.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfiguration : ::com::sun::star::uno::XInterface
+published interface XUIConfiguration : ::com::sun::star::uno::XInterface
 {
     /** adds the specified listener to receive events when elements are
         changed, inserted or removed.
diff --git a/offapi/com/sun/star/ui/XUIConfigurationListener.idl b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
index 02b4969d314e..8c48b5fa355c 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationListener.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationListener.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationListener : com::sun::star::lang::XEventListener
+published interface XUIConfigurationListener : com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
index c7bab256552b..78a692d6ae80 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationManager : ::com::sun::star::uno::XInterface
 {
     /** resets the configuration manager to the default user interface
         configuration data.
diff --git a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
index 27d86382b720..8cb28e871a03 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationManagerSupplier.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationManagerSupplier : ::com::sun::star::uno::XInterface
 {
     //----------------------------------------------------------------------
     /** returns the user interface configuration manager related to the
diff --git a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
index dc475d209025..32df8e0e620b 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationPersistence.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
+published interface XUIConfigurationPersistence : ::com::sun::star::uno::XInterface
 {
     /** reloads the configuration data from the storage and reinitialize
         the user interface configuration manager instance with this data.
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 57f0d4a71156..3b71cf86d9b9 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module ui {
     </p>
 */
 
-interface XUIElement : com::sun::star::uno::XInterface
+published interface XUIElement : com::sun::star::uno::XInterface
 {
     /** returns an interface to get access to user interface type specific functions.
 
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 4b2a180add93..328bd87793fc 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -59,7 +59,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIElementFactory : ::com::sun::star::uno::XInterface
+published interface XUIElementFactory : ::com::sun::star::uno::XInterface
 {
     /** creates a new instances of a specific user interface element.
 
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 6659cd357dcd..9e07affcf4e7 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module ui {
     @since OOo 2.0
 */
 
-interface XUIElementSettings : com::sun::star::uno::XInterface
+published interface XUIElementSettings : com::sun::star::uno::XInterface
 {
     /** forces the user interface element to retrieve new settings from its
         configuration source.
diff --git a/offapi/com/sun/star/ui/dialogs/Wizard.idl b/offapi/com/sun/star/ui/dialogs/Wizard.idl
index 4e6b13f44ca2..d15819a73281 100644
--- a/offapi/com/sun/star/ui/dialogs/Wizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/Wizard.idl
@@ -34,13 +34,13 @@
 
 module com { module sun { module star { module ui { module dialogs {
 
-interface XWizardController;
+published interface XWizardController;
 
 //==================================================================================================================
 
 /** provides a framework for implementing a wizard dialog.
  */
-service Wizard : XWizard
+published service Wizard : XWizard
 {
     /** creates a wizard with a single execution path
         @param PageIds
diff --git a/offapi/com/sun/star/ui/dialogs/XWizard.idl b/offapi/com/sun/star/ui/dialogs/XWizard.idl
index 445f7bbf2a44..debe91072ba4 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizard.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizard.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 //==================================================================================================================
 
-interface XWizardPage;
+published interface XWizardPage;
 
 /** is the main interface implemented by the <type>Wizard</type> services.
 
@@ -79,7 +79,7 @@ interface XWizardPage;
     @see XWizardController
     @see XWizardPage
  */
-interface XWizard
+published interface XWizard
 {
     interface   XExecutableDialog;
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardController.idl b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
index db26d3d281c4..063873aa541f 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardController.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardController.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is the interface of a client-provided controller of a custom <type>Wizard</type>.
  */
-interface XWizardController
+published interface XWizardController
 {
     /** creates a page
 
diff --git a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
index 5e99ca2ada95..aa872a454d48 100644
--- a/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
+++ b/offapi/com/sun/star/ui/dialogs/XWizardPage.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module ui { module dialogs {
 
 /** is a single page of a <type>Wizard</type>
  */
-interface XWizardPage : ::com::sun::star::lang::XComponent
+published interface XWizardPage : ::com::sun::star::lang::XComponent
 {
     /** provides read-only access to the window of the page
     */