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

5 files changed, 5 insertions, 5 deletions

diff --git a/offapi/com/sun/star/resource/StringResourceWithLocation.idl b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
index 550bcdbbff76..089de5469f1f 100644
--- a/offapi/com/sun/star/resource/StringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/StringResourceWithLocation.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module resource {
 /** specifies a service providing access to a resource string table implementing the
     <type scope="com::sun::star::resource">XStringResourceWithLocation</type> interface.
  */
-service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
+published service StringResourceWithLocation : com::sun::star::resource::XStringResourceWithLocation
 {
     /** is used to initialize the object on its creation.
 
diff --git a/offapi/com/sun/star/resource/XStringResourceManager.idl b/offapi/com/sun/star/resource/XStringResourceManager.idl
index c05d92b8f03a..df13f2b18e0b 100644
--- a/offapi/com/sun/star/resource/XStringResourceManager.idl
+++ b/offapi/com/sun/star/resource/XStringResourceManager.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module resource {
     localized dialogs.
 
 */
-interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
+published interface XStringResourceManager: com::sun::star::resource::XStringResourceResolver
 {
     /**
         Returns the resource's read only state
diff --git a/offapi/com/sun/star/resource/XStringResourcePersistence.idl b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
index dc110398d388..38efb3249334 100644
--- a/offapi/com/sun/star/resource/XStringResourcePersistence.idl
+++ b/offapi/com/sun/star/resource/XStringResourcePersistence.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module resource {
 
     @see <type>XStringResourceManager</type>.
 */
-interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
+published interface XStringResourcePersistence: com::sun::star::resource::XStringResourceManager
 {
     /**
         Stores all string table data respectively all data modified since
diff --git a/offapi/com/sun/star/resource/XStringResourceResolver.idl b/offapi/com/sun/star/resource/XStringResourceResolver.idl
index 59153a3fac58..f10b6d711a18 100644
--- a/offapi/com/sun/star/resource/XStringResourceResolver.idl
+++ b/offapi/com/sun/star/resource/XStringResourceResolver.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module resource {
     But also changing the locale at runtime can be supported in this way.
 
 */
-interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
+published interface XStringResourceResolver: com::sun::star::util::XModifyBroadcaster
 {
     /**
         Resolves the passed ResoureID for the current locale. This
diff --git a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
index b493dc92cf9a..6c66f78c294f 100644
--- a/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
+++ b/offapi/com/sun/star/resource/XStringResourceWithLocation.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module resource {
 
     @see <type>XStringResourcePersistence</type>.
 */
-interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
+published interface XStringResourceWithLocation: com::sun::star::resource::XStringResourcePersistence
 {
     /**
         Stores all string table data to a location and associates this location