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

3 files changed, 6 insertions, 6 deletions

diff --git a/offapi/com/sun/star/presentation/PresentationDocument.idl b/offapi/com/sun/star/presentation/PresentationDocument.idl
index 401090dd09c2..97129cb9f060 100644
--- a/offapi/com/sun/star/presentation/PresentationDocument.idl
+++ b/offapi/com/sun/star/presentation/PresentationDocument.idl
@@ -52,7 +52,7 @@
 
 /** This is the service provided by a presentation document.
  */
-service PresentationDocument
+published service PresentationDocument
 {
     /** This is a basic service for a drawing document.
 
diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl
index 17d7cd7b5370..6882734f687a 100644
--- a/offapi/com/sun/star/presentation/XSlideShowListener.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 3.0
  */
-interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
+published interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener
 {
     /** Notify that the slide show is paused
     */
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl
index f4873a5e6865..10f1171d5d08 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -59,7 +59,7 @@ module com {  module sun {  module star {  module presentation {
 
     @since OOo 2.4
  */
-interface XSlideShowView : ::com::sun::star::uno::XInterface
+published interface XSlideShowView : ::com::sun::star::uno::XInterface
 {
     /** Get view canvas.<p>
 
@@ -81,9 +81,9 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
 
     /** Query the current transformation matrix for this view.<p>
 
-           This method returns the transformation matrix of the
-           view. When notified via the transformation change listener,
-           the show will be displayed using the new transformation.<p>
+            This method returns the transformation matrix of the
+            view. When notified via the transformation change listener,
+            the show will be displayed using the new transformation.<p>
 
         @return the view transformation matrix. Note that the slide
         show itself will paint all slides as one-by-one boxes, one