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

14 files changed, 18 insertions, 18 deletions

diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index caa717a8217a..bd22f6fef522 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-struct DocumentEvent : ::com::sun::star::lang::EventObject
+published struct DocumentEvent : ::com::sun::star::lang::EventObject
 {
     /** specifies the name of the event.
 
diff --git a/offapi/com/sun/star/document/EmptyUndoStackException.idl b/offapi/com/sun/star/document/EmptyUndoStackException.idl
index e003d6af71b9..476a82bbe705 100644
--- a/offapi/com/sun/star/document/EmptyUndoStackException.idl
+++ b/offapi/com/sun/star/document/EmptyUndoStackException.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 /** is raised when an operation is attemption at an XUndoManager which requires a non-empty stack
     of undo actions, and this requirement is not fullfilled.
  */
-exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
+published exception EmptyUndoStackException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/UndoContextNotClosedException.idl b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
index 4f7d746bad1a..81eeca83c7ac 100644
--- a/offapi/com/sun/star/document/UndoContextNotClosedException.idl
+++ b/offapi/com/sun/star/document/UndoContextNotClosedException.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 /** is thrown when an operation is attempted at an <type>XUndoManager</type> which requires all undo
     contexts to be closed, but this requirement is not fullfilled.
  */
-exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
+published exception UndoContextNotClosedException : ::com::sun::star::util::InvalidStateException
 {
 };
 
diff --git a/offapi/com/sun/star/document/UndoFailedException.idl b/offapi/com/sun/star/document/UndoFailedException.idl
index 4489ac5a0e0d..65b23148ad37 100644
--- a/offapi/com/sun/star/document/UndoFailedException.idl
+++ b/offapi/com/sun/star/document/UndoFailedException.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
     @see XUndoAction::undo
     @see XUndoManager::undo
  */
-exception UndoFailedException : ::com::sun::star::uno::Exception
+published exception UndoFailedException : ::com::sun::star::uno::Exception
 {
     /** describes the reason why the operation failed. Usually, this member will carry an exception.
     */
diff --git a/offapi/com/sun/star/document/UndoManagerEvent.idl b/offapi/com/sun/star/document/UndoManagerEvent.idl
index e587669e4fbd..163b9c6dd33d 100644
--- a/offapi/com/sun/star/document/UndoManagerEvent.idl
+++ b/offapi/com/sun/star/document/UndoManagerEvent.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module document {
     @see XUndoManagerListener
     @see XUndoAction
  */
-struct UndoManagerEvent : ::com::sun::star::lang::EventObject
+published struct UndoManagerEvent : ::com::sun::star::lang::EventObject
 {
     /** the title of the undo action which is described by the event
         @see XUndoAction::Title
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 7885f9cde7da..39a3993bfbeb 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -47,7 +47,7 @@
 
 module com { module sun { module star { module document {
 
-interface XDocumentEventListener;
+published interface XDocumentEventListener;
 
 //=============================================================================
 
@@ -60,7 +60,7 @@ interface XDocumentEventListener;
     @see DocumentEvent
     @since OOo 3.1
 */
-interface XDocumentEventBroadcaster
+published interface XDocumentEventBroadcaster
 {
     /** registers a listener which is notified about document events
 
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index bcaa6ecd8321..4b89e33d313a 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module document {
     @see XDocumentEventBroadcaster
     @since OOo 3.1
  */
-interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
+published interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
 {
     /** is called whenever a document event occurred
     */
diff --git a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
index be5121bf2e2a..69cbe1bbfb2e 100644
--- a/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
+++ b/offapi/com/sun/star/document/XDocumentSubStorageSupplier.idl
@@ -50,7 +50,7 @@ module com {   module sun {   module star {   module document {
     @see DocumentInfo
     @see StandaloneDocumentInfo
  */
-interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
+published interface XDocumentSubStorageSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** provides the access to a substorage with specified name
diff --git a/offapi/com/sun/star/document/XStorageBasedDocument.idl b/offapi/com/sun/star/document/XStorageBasedDocument.idl
index 047320b43df4..a352d36110a2 100644
--- a/offapi/com/sun/star/document/XStorageBasedDocument.idl
+++ b/offapi/com/sun/star/document/XStorageBasedDocument.idl
@@ -63,7 +63,7 @@
 /** allows to initialize document with a storage, to store document to
     a storage, and to set document to be based on provided storage.
  */
-interface XStorageBasedDocument: com::sun::star::uno::XInterface
+published interface XStorageBasedDocument: com::sun::star::uno::XInterface
 {
     //------------------------------------------------------------------------
     /** lets the document load itself using provided storage.
diff --git a/offapi/com/sun/star/document/XStorageChangeListener.idl b/offapi/com/sun/star/document/XStorageChangeListener.idl
index 2272132f8db2..6ed36735a1c1 100644
--- a/offapi/com/sun/star/document/XStorageChangeListener.idl
+++ b/offapi/com/sun/star/document/XStorageChangeListener.idl
@@ -46,7 +46,7 @@ module com {  module sun {  module star {  module document {
 //=============================================================================
 /** allows to be notified when a document is switched to a new storage.
  */
-interface XStorageChangeListener: com::sun::star::lang::XEventListener
+published interface XStorageChangeListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
     /** is called when document switches to another storage.
diff --git a/offapi/com/sun/star/document/XUndoAction.idl b/offapi/com/sun/star/document/XUndoAction.idl
index b47550a3f52f..e65354013499 100644
--- a/offapi/com/sun/star/document/XUndoAction.idl
+++ b/offapi/com/sun/star/document/XUndoAction.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module document {
 
 /** represents a single (undoable) action on a document
  */
-interface XUndoAction
+published interface XUndoAction
 {
     /** reverts the action represented by the instance
 
diff --git a/offapi/com/sun/star/document/XUndoManager.idl b/offapi/com/sun/star/document/XUndoManager.idl
index be43ca899b94..74aa4de0cf70 100644
--- a/offapi/com/sun/star/document/XUndoManager.idl
+++ b/offapi/com/sun/star/document/XUndoManager.idl
@@ -40,8 +40,8 @@
 
 module com { module sun { module star { module document {
 
-interface XUndoAction;
-interface XUndoManagerListener;
+published interface XUndoAction;
+published interface XUndoManagerListener;
 
 //==================================================================================================================
 
@@ -76,7 +76,7 @@ interface XUndoManagerListener;
     <member>XLockable::unlock</member> methods. When it is locked, then every attempt to add an undo action, or to
     enter or leave an Undo context, will be silently ignored.</p>
  */
-interface XUndoManager
+published interface XUndoManager
 {
     /** allows <a href="#locking">locking</a> the undo manager.
     */
diff --git a/offapi/com/sun/star/document/XUndoManagerListener.idl b/offapi/com/sun/star/document/XUndoManagerListener.idl
index 783e8e7014d8..045e74761794 100644
--- a/offapi/com/sun/star/document/XUndoManagerListener.idl
+++ b/offapi/com/sun/star/document/XUndoManagerListener.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module document {
 
     @see XUndoManager
  */
-interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
+published interface XUndoManagerListener : ::com::sun::star::lang::XEventListener
 {
     /** is called when an undo action is added to the undo stack.
 
diff --git a/offapi/com/sun/star/document/XUndoManagerSupplier.idl b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
index 88a082259413..211dd151ecad 100644
--- a/offapi/com/sun/star/document/XUndoManagerSupplier.idl
+++ b/offapi/com/sun/star/document/XUndoManagerSupplier.idl
@@ -33,13 +33,13 @@
 
 module com { module sun { module star { module document {
 
-interface XUndoManager;
+published interface XUndoManager;
 
 //==================================================================================================================
 
 /** provides access to an XUndoManager.
  */
-interface XUndoManagerSupplier
+published interface XUndoManagerSupplier
 {
     /** returns the Undo manager associated with the component.
     */