ooo-build r12944 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jun 23 19:23:49 2008
New Revision: 12944
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12944&view=rev

Log:
	* patches/dev300/slideshow-media-control.diff: added missing
	file.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/slideshow-media-control.diff

Modified: trunk/patches/dev300/slideshow-media-control.diff
==============================================================================
--- trunk/patches/dev300/slideshow-media-control.diff	(original)
+++ trunk/patches/dev300/slideshow-media-control.diff	Mon Jun 23 19:23:49 2008
@@ -1,25 +1,26 @@
- .../data/org/openoffice/Office/UI/Effects.xcu      |   26 +++++++++-
- .../schema/org/openoffice/Office/UI/Effects.xcs    |    5 ++
- sd/inc/CustomAnimationPreset.hxx                   |    2 +
- sd/inc/helpids.h                                   |   47 ++++++++-------
- sd/source/core/CustomAnimationEffect.cxx           |    9 +++
+ .../data/org/openoffice/Office/UI/Effects.xcu      |   26 ++++++
+ .../schema/org/openoffice/Office/UI/Effects.xcs    |    5 +
+ sd/inc/CustomAnimationPreset.hxx                   |    2 
+ sd/inc/helpids.h                                   |   47 +++++----
+ sd/source/core/CustomAnimationEffect.cxx           |    9 ++
  sd/source/core/CustomAnimationPreset.cxx           |    3 +
- sd/source/ui/animations/CustomAnimation.hrc        |    9 ++-
- .../ui/animations/CustomAnimationCreateDialog.cxx  |    6 ++
- .../ui/animations/CustomAnimationCreateDialog.hxx  |    2 -
- .../ui/animations/CustomAnimationCreateDialog.src  |    6 ++
- sd/xml/effects.xml                                 |   21 +++++++
- .../engine/animationnodes/animationcommandnode.cxx |   61 ++++++++++++++++++++---
- .../engine/animationnodes/animationcommandnode.hxx |   14 +++--
- slideshow/source/engine/shapes/appletshape.cxx     |   33 ++++++++++-
- .../source/engine/shapes/externalshapebase.cxx     |   27 +++++++++-
- .../source/engine/shapes/externalshapebase.hxx     |   18 +++++--
- slideshow/source/engine/shapes/mediashape.cxx      |   45 ++++++++++++++-
- slideshow/source/engine/shapes/viewmediashape.cxx  |   16 +++++
- slideshow/source/engine/shapes/viewmediashape.hxx  |   14 +++++
- slideshow/source/inc/animationnode.hxx             |    5 +-
- xmloff/source/draw/animationimport.cxx             |    8 ++-
- 21 files changed, 318 insertions(+), 59 deletions(-)
+ sd/source/ui/animations/CustomAnimation.hrc        |    9 +-
+ .../ui/animations/CustomAnimationCreateDialog.cxx  |    6 +
+ .../ui/animations/CustomAnimationCreateDialog.hxx  |    2 
+ .../ui/animations/CustomAnimationCreateDialog.src  |    6 +
+ sd/xml/effects.xml                                 |   21 ++++
+ .../engine/animationnodes/animationcommandnode.cxx |   61 +++++++++++++-
+ .../engine/animationnodes/animationcommandnode.hxx |   14 ++-
+ slideshow/source/engine/shapes/appletshape.cxx     |   33 ++++++-
+ .../source/engine/shapes/externalshapebase.cxx     |   27 ++++++
+ .../source/engine/shapes/externalshapebase.hxx     |   18 +++-
+ slideshow/source/engine/shapes/mediashape.cxx      |   45 +++++++++
+ slideshow/source/engine/shapes/viewmediashape.cxx  |   16 +++
+ slideshow/source/engine/shapes/viewmediashape.hxx  |   14 +++
+ slideshow/source/inc/animationnode.hxx             |    5 +
+ slideshow/source/inc/externalmediashape.hxx        |   99 ++++++++++++++++++++
+ xmloff/source/draw/animationimport.cxx             |    8 +-
+ 22 files changed, 417 insertions(+), 59 deletions(-)
 
 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
 index ed41961..5feffb9 100644
@@ -788,6 +789,111 @@
      */
      virtual bool hasPendingAnimation() const = 0;
  };
+diff --git a/slideshow/source/inc/externalmediashape.hxx b/slideshow/source/inc/externalmediashape.hxx
+new file mode 100644
+index 0000000..3ee2e37
+--- /dev/null
++++ slideshow/source/inc/externalmediashape.hxx
+@@ -0,0 +1,99 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile: animatableshape.hxx,v $
++ *
++ *  $Revision: 1.5 $
++ *
++ *  last change: $Author: obo $ $Date: 2007/07/17 15:01:31 $
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library 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 for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX
++#define INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX
++
++#include <boost/shared_ptr.hpp>
++
++#include "shape.hxx"
++
++
++namespace slideshow
++{
++    namespace internal
++    {
++        /** Represents a shape containing media (video, sound).
++
++            This interface adds media handling methods to a shape. It
++            allows starting/stopping and pausing playback.
++         */
++        class ExternalMediaShape : public Shape
++        {
++        public:
++            // Animation methods
++            //------------------------------------------------------------------
++
++            /** Notify the Shape that it should start with playback
++
++				This method enters playback mode on all registered
++				views. It makes the media initially visible (for videos). 
++             */
++            virtual void play() = 0;
++
++            /** Notify the Shape that it should stop playback
++
++				This method leaves playback mode on all registered
++				views. The media is then rewound to the start, and
++            removed from screen (for videos)
++             */
++            virtual void stop() = 0;
++
++            /** Notify the Shape that it should pause playback
++
++				This method stops playback on all registered
++				views. The media stays visible (for videos)
++             */
++            virtual void pause() = 0;
++
++            /** Query whether the media is currently playing.
++             */
++            virtual bool isPlaying() const = 0;
++
++            /** Set media time in seconds.
++
++            @param fTime
++            Time in seconds of the media time line, that should now be
++            presented
++             */
++            virtual void setMediaTime(double fTime) = 0;
++        };
++
++        typedef ::boost::shared_ptr< ExternalMediaShape > ExternalMediaShapeSharedPtr;
++
++    }
++}
++
++#endif /* INCLUDED_SLIDESHOW_EXTERNALMEDIASHAPE_HXX */
 diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
 index 65098a5..1ab184a 100644
 --- xmloff/source/draw/animationimport.cxx