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

12 files changed, 20 insertions, 20 deletions

diff --git a/offapi/com/sun/star/sdb/XDocumentDataSource.idl b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
index b0e891b0a084..6acb441bd7a5 100644
--- a/offapi/com/sun/star/sdb/XDocumentDataSource.idl
+++ b/offapi/com/sun/star/sdb/XDocumentDataSource.idl
@@ -43,7 +43,7 @@
     </p>
     @see OfficeDatabaseDocument
  */
-interface XDocumentDataSource
+published interface XDocumentDataSource
 {
     /** provides access to the one and only <type>OfficeDatabaseDocument</type>
         which the data source is based on.
diff --git a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
index 672505bc12ad..fa28e15ebc75 100644
--- a/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XFormDocumentsSupplier.idl
@@ -41,7 +41,7 @@
 /** provides the access to a container of database forms.
     @see Forms
  */
-interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XFormDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of forms.
diff --git a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
index b2640704537c..d0f79a4ab348 100644
--- a/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/XOfficeDatabaseDocument.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module sdb {
 //=============================================================================
 /** simplifies the accessing of data sources, and it's corresponding database document and forms, and reports.
 */
-interface XOfficeDatabaseDocument
+published interface XOfficeDatabaseDocument
 {
     /** allows to access the supplier for forms.
         @see com::sun::star::sdb::Forms
diff --git a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
index d7b15fbc0018..691c745160e3 100644
--- a/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
+++ b/offapi/com/sun/star/sdb/XReportDocumentsSupplier.idl
@@ -41,7 +41,7 @@
 /** provides the access to a container of database reports.
     @see Reports
  */
-interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
+published interface XReportDocumentsSupplier: com::sun::star::uno::XInterface
 {
 
     /** returns the container of reports.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
index 8c377e2f0693..813c4065e9bd 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl
@@ -40,7 +40,7 @@
 #endif
 
 module com {  module sun {  module star {  module container {
-interface XIndexAccess;
+published interface XIndexAccess;
 };};};};
 //=============================================================================
 
@@ -55,7 +55,7 @@ interface XIndexAccess;
     structure of the used query.
     </p>
  */
-interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
+published interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface
 {
 
     /** returns the query.
diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
index 2bd5270adee8..323b1d7836d1 100644
--- a/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
+++ b/offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
@@ -58,7 +58,7 @@
 
     @see com::sun::star::sdb::SingleSelectQueryComposer
  */
-interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
+published interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
 {
     //-------------------------------------------------------------------------
     // FILTER
@@ -211,7 +211,7 @@ interface XSingleSelectQueryComposer: XSingleSelectQueryAnalyzer
             if a database access error occurs.
      */
     void appendOrderByColumn([in] com::sun::star::beans::XPropertySet column,
-                              [in] boolean ascending)
+                             [in] boolean ascending)
             raises (com::sun::star::sdbc::SQLException);
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/sdb/XSubDocument.idl b/offapi/com/sun/star/sdb/XSubDocument.idl
index 120280fd7ef3..2f9e86b10df6 100644
--- a/offapi/com/sun/star/sdb/XSubDocument.idl
+++ b/offapi/com/sun/star/sdb/XSubDocument.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module sdb {
 
     @since OOo 3.1
  */
-interface XSubDocument
+published interface XSubDocument
 {
     /** opens the sub document
 
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index aef6d49dff40..527186f4046b 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module sdb { module application {
 
     @since OOo 2.2
  */
-interface XDatabaseDocumentUI
+published interface XDatabaseDocumentUI
 {
     /** provides access to the data source belong to the database document
     */
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
index fadfe541a165..8b1b4ed61a8f 100644
--- a/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/XConnectionTools.idl
@@ -37,21 +37,21 @@
 
 module com {  module sun {  module star {
     module container {
-        interface XNameAccess;
+        published interface XNameAccess;
     };
     module lang {
-        interface XComponent;
+        published interface XComponent;
     };
 };};};
 //=============================================================================
 module com {  module sun {  module star {  module sdb {
-    interface XSingleSelectQueryComposer;
+    published interface XSingleSelectQueryComposer;
     module tools {
 //=============================================================================
 
-interface XTableName;
-interface XObjectNames;
-interface XDataSourceMetaData;
+published interface XTableName;
+published interface XObjectNames;
+published interface XDataSourceMetaData;
 
 //-----------------------------------------------------------------------------
 /** encapsulates various useful functionality around a
@@ -68,7 +68,7 @@ interface XDataSourceMetaData;
 
     @since OOo 2.0.4
 */
-interface XConnectionTools
+published interface XConnectionTools
 {
     /** creates an instance supporting the <type>XTableName</type> interface,
         which can be used to manipulate table names for various purposes.
diff --git a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
index b2b00c758250..726b7d712771 100644
--- a/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
+++ b/offapi/com/sun/star/sdb/tools/XDataSourceMetaData.idl
@@ -36,7 +36,7 @@
 module com {  module sun {  module star {  module sdb { module tools {
 //=============================================================================
 
-interface XDataSourceMetaData
+published interface XDataSourceMetaData
 {
     /** determines whether the data source supports queries in the <code>FROM</code>
         part of a <code>SELECT</code> statement.
diff --git a/offapi/com/sun/star/sdb/tools/XObjectNames.idl b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
index e636631339af..e3e5bea34d47 100644
--- a/offapi/com/sun/star/sdb/tools/XObjectNames.idl
+++ b/offapi/com/sun/star/sdb/tools/XObjectNames.idl
@@ -70,7 +70,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XObjectNames
+published interface XObjectNames
 {
     /** suggests a (unique) table or query name
 
diff --git a/offapi/com/sun/star/sdb/tools/XTableName.idl b/offapi/com/sun/star/sdb/tools/XTableName.idl
index 3e776214985e..a67f9810de68 100644
--- a/offapi/com/sun/star/sdb/tools/XTableName.idl
+++ b/offapi/com/sun/star/sdb/tools/XTableName.idl
@@ -72,7 +72,7 @@ module com {  module sun {  module star {  module sdb { module tools {
 
     @since OOo 2.0.4
 */
-interface XTableName
+published interface XTableName
 {
     /** denotes the name of the catalog which the table is a part of
     */