Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
offapi/com/sun/star/animations/XAnimationNode.idl
offapi/com/sun/star/awt/grid/XGridColumn.idl
offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
offapi/com/sun/star/frame/ModuleManager.idl
offapi/com/sun/star/frame/XLayoutManager.idl
offapi/com/sun/star/frame/XLayoutManagerListener.idl
offapi/com/sun/star/rendering/FontInfo.idl
offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
offapi/com/sun/star/rendering/XCanvas.idl
offapi/com/sun/star/rendering/XSprite.idl
offapi/com/sun/star/report/ForceNewPage.idl
offapi/com/sun/star/report/ReportPrintOption.idl
offapi/com/sun/star/report/XFunctionsSupplier.idl
offapi/com/sun/star/report/XReportControlFormat.idl
offapi/com/sun/star/resource/StringResourceWithLocation.idl
offapi/com/sun/star/resource/XStringResourceResolver.idl
offapi/com/sun/star/resource/XStringResourceWithLocation.idl
offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
offapi/com/sun/star/security/XCertificateContainer.idl
offapi/com/sun/star/ui/UIElementFactory.idl
offapi/com/sun/star/ui/XImageManager.idl
offapi/com/sun/star/ui/XUIConfigurationManager.idl
offapi/com/sun/star/ui/XUIElementFactory.idl
offapi/com/sun/star/ui/XUIElementSettings.idl
offapi/com/sun/star/xml/crypto/SEInitializer.idl
offapi/com/sun/star/xml/crypto/XSEInitializer.idl
offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
sal/rtl/source/alloc_arena.c
udkapi/com/sun/star/task/XInteractionHandler2.idl

4 files changed, 4 insertions, 4 deletions

diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index e7f01d9c05ba..256d74e48549 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -67,7 +67,7 @@ module com {   module sun {   module star {   module rdf {
     @see XRepository
     @see XDocumentMetadataAccess
  */
-interface XMetadatable : XURI
+published interface XMetadatable : XURI
 {
     //-------------------------------------------------------------------------
     /** a metadata reference, comprising the stream name and the XML ID.
diff --git a/offapi/com/sun/star/rdf/XNode.idl b/offapi/com/sun/star/rdf/XNode.idl
index 0c7f70d5e4f7..9ed8e614fd03 100644
--- a/offapi/com/sun/star/rdf/XNode.idl
+++ b/offapi/com/sun/star/rdf/XNode.idl
@@ -66,7 +66,7 @@ module com {   module sun {   module star {   module rdf {
     @see XURI
     @see XLiteral
  */
-interface XNode
+published interface XNode
 {
     /// the string value of the node.
     [readonly, attribute] string StringValue;
diff --git a/offapi/com/sun/star/rdf/XResource.idl b/offapi/com/sun/star/rdf/XResource.idl
index 3c10b586fd78..b0ce3c505de8 100644
--- a/offapi/com/sun/star/rdf/XResource.idl
+++ b/offapi/com/sun/star/rdf/XResource.idl
@@ -50,7 +50,7 @@ module com {   module sun {   module star {   module rdf {
     @see XBlankNode
     @see XURI
  */
-interface XResource : XNode
+published interface XResource : XNode
 {
 };
 
diff --git a/offapi/com/sun/star/rdf/XURI.idl b/offapi/com/sun/star/rdf/XURI.idl
index 6ba59cec0dd6..d869d4e80c54 100644
--- a/offapi/com/sun/star/rdf/XURI.idl
+++ b/offapi/com/sun/star/rdf/XURI.idl
@@ -62,7 +62,7 @@ module com {   module sun {   module star {   module rdf {
 
     @see XRepository
  */
-interface XURI : XResource
+published interface XURI : XResource
 {
     /// prefix
     [readonly, attribute] string Namespace;