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

8 files changed, 17 insertions, 11 deletions

diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index ab8bff22d72e..36ab785b0d36 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
  */
 
-service ModuleManager
+published service ModuleManager
 {
     //-------------------------------------------
     /** provides functions to identify office modules.
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index 9b3169c1dcbe..510cc08203e0 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 2.0
  */
-exception UnknownModuleException : ::com::sun::star::uno::Exception
+published exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
 };
 
diff --git a/offapi/com/sun/star/frame/XController2.idl b/offapi/com/sun/star/frame/XController2.idl
index 095b8840aa67..f3d7f07abd78 100644
--- a/offapi/com/sun/star/frame/XController2.idl
+++ b/offapi/com/sun/star/frame/XController2.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 3.0
 */
-interface XController2 : XController
+published interface XController2 : XController
 {
     /** denotes the "root window" of the controller.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index b0902aa4c0e9..7043afcfaa9d 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -98,7 +98,7 @@ module com { module sun { module star { module frame {
     @since OOo 2.0
 */
 
-interface XLayoutManager : com::sun::star::uno::XInterface
+published interface XLayoutManager : com::sun::star::uno::XInterface
 {
     /** attaches a <type scope="com::sun::star::frame">XFrame</type> to a layout manager.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index fc7636e21e56..48d077815ca4 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -43,7 +43,7 @@
     @since OOo 2.0
  */
 
-interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
+published interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
 {
     /** adds a layout manager event listener to the object's listener list.
 
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index 12b9af7ffb9f..b50cafa82a17 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module frame {
 
     @since OOo 2.0
  */
-interface XLayoutManagerListener : com::sun::star::lang::XEventListener
+published interface XLayoutManagerListener : com::sun::star::lang::XEventListener
 {
     //=============================================================================
     /** is invoked when a layout manager has made a certain operation.
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index cdc9bba41b6e..5494449ce933 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module frame {
 
     @since OOo 2.0
  */
-interface XModuleManager : com::sun::star::uno::XInterface
+published interface XModuleManager : com::sun::star::uno::XInterface
 {
     //-------------------------------------------
     /**
diff --git a/offapi/com/sun/star/frame/XTitle.idl b/offapi/com/sun/star/frame/XTitle.idl
index 0ce06aecb8f0..2bc71111f932 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -40,17 +40,23 @@
  module com {  module sun {  module star {  module frame {
 
 //=============================================================================
-/** todo document me
+/** an interface representing an entity with a modifyable title.
  */
-interface XTitle : com::sun::star::uno::XInterface
+published interface XTitle : com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Returns the title of the object.
+     *
+     *  @returns
+     *  The title.
      */
     string getTitle ();
 
     //-------------------------------------------------------------------------
-    /** todo document me
+    /** Sets the title of the object.
+     *
+     *  @param sTitle
+     *  The title.
      */
     void setTitle ( [in] string sTitle );
 };