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

1 files changed, 6 insertions, 8 deletions

diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl
index f24a783cb7fc..29d0915017eb 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module awt {
 /** provides dialogs implementing the
     <type scope="com::sun::star::awt">XDialog</type> interface.
  */
-interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
+published interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
 
     //-------------------------------------------------------------------------
 
@@ -107,7 +107,7 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         @see <type scope="com::sun::star::awt">XDialogEventHandler</type>
 
      */
-    com::sun::star::awt::XDialog createDialogWithHandler
+    XDialog createDialogWithHandler
         ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler )
             raises ( com::sun::star::lang::IllegalArgumentException );
 
@@ -123,12 +123,10 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider {
         </p>
     */
 
-    XDialog createDialogWithArguments(
-        [in] string URL,
-        [in] sequence< ::com::sun::star::beans::NamedValue > Arguments
-    )
-    raises  (   com::sun::star::lang::IllegalArgumentException
-            );
+    XDialog createDialogWithArguments
+        ( [in] string URL,
+          [in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
+        raises  ( com::sun::star::lang::IllegalArgumentException );
 };
 
 //=============================================================================