rebase XSlideShow, XTransitionFactory

Change-Id: Ia68d6904d3b3059f13a303d066080bab040087fe

4 files changed, 86 insertions, 132 deletions

diff --git a/offapi/com/sun/star/presentation/SlideShow.idl b/offapi/com/sun/star/presentation/SlideShow.idl
deleted file mode 100644
index e9e116a61dec..000000000000
--- a/offapi/com/sun/star/presentation/SlideShow.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _com_sun_star_presentation_SlideShow_idl
-#define _com_sun_star_presentation_SlideShow_idl
-
-#include <com/sun/star/presentation/XSlideShow.idl>
-
-module com {  module sun {  module star {  module presentation {
-
-service SlideShow : XSlideShow;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/TransitionFactory.idl b/offapi/com/sun/star/presentation/TransitionFactory.idl
deleted file mode 100644
index d45cefd14997..000000000000
--- a/offapi/com/sun/star/presentation/TransitionFactory.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_presentation_TransitionFactory_idl__
-#define __com_sun_star_presentation_TransitionFactory_idl__
-
-#include <com/sun/star/presentation/XTransitionFactory.idl>
-
-
-module com {  module sun {  module star { module presentation {
-
-service TransitionFactory : XTransitionFactory;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index c99cc09bfcff..4cd4622b0245 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -1,56 +1,84 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
+/**************************************************************
  *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * This file incorporates work covered by the following license notice:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
 #ifndef _com_sun_star_presentation_XSlideShow_idl
 #define _com_sun_star_presentation_XSlideShow_idl
 
+#ifndef __com_sun_star_uno_XInterface_idl__
 #include <com/sun/star/uno/XInterface.idl>
+#endif
+#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
+#endif
+#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
+#endif
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
 #include <com/sun/star/rendering/XSpriteCanvas.idl>
+#endif
+#ifndef __com_sun_star_animations_XAnimationNode_idl__
 #include <com/sun/star/animations/XAnimationNode.idl>
+#endif
+#endif
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
+#ifndef __com_sun_star_drawing_XDrawPage_idl__
 #include <com/sun/star/drawing/XDrawPage.idl>
+#endif
+#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
 #include <com/sun/star/drawing/XDrawPagesSupplier.idl>
+#endif
+#ifndef __com_sun_star_drawing_XShape_idl__
 #include <com/sun/star/drawing/XShape.idl>
+#endif
+#ifndef __com_sun_star_presentation_XSlideShowView_idl__
 #include <com/sun/star/presentation/XSlideShowView.idl>
+#endif
+#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
 #include <com/sun/star/presentation/XSlideShowListener.idl>
+#endif
+#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
 #include <com/sun/star/presentation/XShapeEventListener.idl>
+#endif
 
 module com {  module sun {  module star {  module presentation {
 
-/** Slide show interface to perform slide show presentations.<p>
+/** Slideshow interface to perform slideshow presentations.<p>
 
     This interface provides the necessary methods to run and control a
-    slide show from a given set of XDrawPage slides. The slide show can
+    slideshow from a given set of XDrawPage slides. The slideshow can
     be displayed simultaneously on multiple targets.<p>
 
-    Note: To control a running slide show inside a presentation, please
+    Note: To controll a running slideshow inside a presentation, please
     use <type>XPresentation2</type> and <type>XSlideShowController</type>.
 
     @since OOo 3.0
  */
 interface XSlideShow : ::com::sun::star::uno::XInterface
 {
-    /** Trigger the next effect of the slide show.<p>
+    /** Trigger the next effect of the slideshow.<p>
 
         This method triggers the next effect on the currently
-        displayed slide. If there is currently no slide show running,
+        displayed slide. If there is currently no slideshow running,
         this method does nothing. If there are no more effects on the
         current slide, a possible slide transition effect is issued
         and the next slide is displayed.<p>
@@ -63,7 +91,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
      */
     boolean nextEffect();
 
-    /** Undo the last effect in the main sequence of the slide show.<p>
+    /** Undo the last effect in the main sequence of the slideshow.<p>
 
         The current slide is displayed as if the last user-triggered effect
         has never been triggered.  If there is no previous effect on the
@@ -71,7 +99,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         XSlideShowListener objects, which can then trigger a change to the
         previous slide.  Note that this command is executed asynchronously.
         Multiple calls to update() may be necessary to complete its execution.
-        If there is currently no slide show running, this method does
+        If there is currently no slideshow running, this method does
         nothing.<p>
 
         @return <TRUE/>, if the previous effect was successfully
@@ -120,8 +148,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
         The slide to display.
 
         @param xDrawPages
-    For future use.
-    This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is disabled.
+        For future use.
 
         @param xAnimationNode
         The animation node determine the animations to display.
@@ -134,7 +161,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
             <li>name: Prefetch, value: ::com::sun::star::drawing::XDrawPage. When given,
                 this slide is prepared in the background to be displayed next. The next
                 call to displaySlide() with the given slide may be faster if there was
-                enough time for prefetching. If the next call to displaySlide() uses
+                enough time for prefatching. If the next call to displaySlide() uses
                 a different slide, this will still work but will not have any performance
                 improvements
                 </li>
@@ -143,7 +170,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
                 are triggered.  This is typically used when going back one
                 effect leads to the previous slide.  On that slide all
                 effects have to be shown in order to continue the backward
-                traveling.
+                travelling.
                 When <FALSE/>, the default, then no main sequence effect is
                 triggered.
                 </li>
@@ -181,7 +208,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
     /** Query the currently displayed slide.<p>
 
         @return the instance of the current slide. If there's no
-        slide show running at the moment, this method returns an
+        slideshow running at the moment, this method returns an
         empty reference.
      */
     ::com::sun::star::drawing::XDrawPage getCurrentSlide();
@@ -194,7 +221,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
     void registerUserPaintPolygons([in] ::com::sun::star::lang::XMultiServiceFactory xDocFactory);
 
-    /** Change a property of the slide show.<p>
+    /** Change a property of the slideshow.<p>
 
         @param aShowProperty
         Property values, which influence the way the slides are
@@ -273,7 +300,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
     /** Add a slide show listener.<p>
 
         This method adds a listener to the slide show, which will get
-        notified when a registered shape is clicked upon, or a new
+        notified when a registerend shape is clicked upon, or a new
         slide is about to be displayed. Note that the listeners will
         <em>not</em> be notified, when the slide change is directly
         requested by one of the nextSlide(), previousSlide() or
@@ -338,8 +365,9 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
 };
 
+service SlideShow : XSlideShow;
+
 }; }; }; };
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 1eef9672b0ce..7a064e3119dd 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -1,26 +1,34 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
+/**************************************************************
  *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * This file incorporates work covered by the following license notice:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
 #ifndef __com_sun_star_presentation_XTransitionFactory_idl__
 #define __com_sun_star_presentation_XTransitionFactory_idl__
 
+#ifndef __com_sun_star_presentation_XTransition_idl__
 #include <com/sun/star/presentation/XTransition.idl>
+#endif
+#ifndef __com_sun_star_geometry_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
+#endif
 
 
 module com {  module sun {  module star {
@@ -32,7 +40,7 @@ module presentation {
 interface XTransition;
 interface XSlideShowView;
 
-/** TransitionFactory interface to request optional custom Transition instances for slide show transitions.<p>
+/** TransitionFactory interface to request optional custom Transition instances for slideshow transitions.<p>
 
     This interface provides the necessary methods to query and create optional transition effects for a SlideShow<p>
 
@@ -53,7 +61,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
         Subtype for the transition (@see ::com::sun::star::animation::TransitionSubType)
 
         @param view
-        Slide show view to display on
+        Slideshow view to display on
 
         @param leavingBitmap
         Bitmap of the slide that's going to leave the screen
@@ -63,7 +71,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
 
         @param slideOffset
         Offset in pixel from the top, left edge of the view, such that the
-        slide displays similar to normal slide show
+        slide displays similar to normal slideshow
      */
     XTransition createTransition( [in] short                                 transitionType,
                                   [in] short                                 transitionSubType,
@@ -72,8 +80,9 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
                                   [in] com::sun::star::rendering::XBitmap    enteringBitmap );
 };
 
+service TransitionFactory : XTransitionFactory;
+
 }; }; }; };
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */