ooo-build r12943 - in trunk: . patches/dev300
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12943 - in trunk: . patches/dev300
- Date: Mon, 23 Jun 2008 16:52:15 +0000 (UTC)
Author: thorstenb
Date: Mon Jun 23 16:52:15 2008
New Revision: 12943
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12943&view=rev
Log:
* patches/dev300/slideshow-media-control.diff: finished the
feature. Now, the custom animation create dialog has an extra
"misc" entry for the media actions.
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 16:52:15 2008
@@ -1,30 +1,31 @@
-made videos/sounds controllable from smil event framework
-added UI entries for start, stop, pause media, made XCommand receive a target in the sd anim framework
-
-
----
-
- .../data/org/openoffice/Office/UI/Effects.xcu | 22 ++++-
- sd/source/core/CustomAnimationEffect.cxx | 9 ++
- 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 +-
- 14 files changed, 359 insertions(+), 33 deletions(-)
+ .../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(-)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
-index 0180f06..eab4b67 100644
+index ed41961..5feffb9 100644
--- officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
-@@ -1236,6 +1236,21 @@
+@@ -1231,6 +1231,21 @@
</prop>
</node>
@@ -46,38 +47,119 @@
</node>
<node oor:name="Properties">
<node oor:name="basic" oor:op="replace">
-@@ -1992,7 +2007,7 @@
-
- </prop>
- <prop oor:name="Effects" oor:type="oor:string-list">
-- <value oor:separator=";">ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random</value>
-+ <value oor:separator=";">ooo-entrance-appear;ooo-entrance-fly-in;ooo-entrance-venetian-blinds;ooo-entrance-box;ooo-entrance-checkerboard;ooo-entrance-circle;ooo-entrance-fly-in-slow;ooo-entrance-diamond;ooo-entrance-dissolve-in;ooo-entrance-flash-once;ooo-entrance-peek-in;ooo-entrance-plus;ooo-entrance-random-bars;ooo-entrance-split;ooo-entrance-diagonal-squares;ooo-entrance-wedge;ooo-entrance-wheel;ooo-entrance-wipe;ooo-entrance-random;ooo-media-start</value>
- </prop>
- </node>
- <node oor:name="special" oor:op="replace">
-@@ -2030,7 +2045,7 @@
-
- </prop>
- <prop oor:name="Effects" oor:type="oor:string-list">
-- <value oor:separator=";">ooo-emphasis-fill-color;ooo-emphasis-font;ooo-emphasis-font-color;ooo-emphasis-font-size;ooo-emphasis-font-style;ooo-emphasis-line-color;ooo-emphasis-spin;ooo-emphasis-transparency</value>
-+ <value oor:separator=";">ooo-emphasis-fill-color;ooo-emphasis-font;ooo-emphasis-font-color;ooo-emphasis-font-size;ooo-emphasis-font-style;ooo-emphasis-line-color;ooo-emphasis-spin;ooo-emphasis-transparency;ooo-media-toggle-pause</value>
+@@ -2123,6 +2138,15 @@
</prop>
</node>
- <node oor:name="special" oor:op="replace">
-@@ -2068,7 +2083,7 @@
-
- </prop>
- <prop oor:name="Effects" oor:type="oor:string-list">
-- <value oor:separator=";">ooo-exit-disappear;ooo-exit-fly-out;ooo-exit-venetian-blinds;ooo-exit-box;ooo-exit-checkerboard;ooo-exit-circle;ooo-exit-crawl-out;ooo-exit-diamond;ooo-exit-dissolve;ooo-exit-flash-once;ooo-exit-peek-out;ooo-exit-plus;ooo-exit-random-bars;ooo-exit-diagonal-squares;ooo-exit-split;ooo-exit-wedge;ooo-exit-wheel;ooo-exit-wipe;ooo-exit-random</value>
-+ <value oor:separator=";">ooo-exit-disappear;ooo-exit-fly-out;ooo-exit-venetian-blinds;ooo-exit-box;ooo-exit-checkerboard;ooo-exit-circle;ooo-exit-crawl-out;ooo-exit-diamond;ooo-exit-dissolve;ooo-exit-flash-once;ooo-exit-peek-out;ooo-exit-plus;ooo-exit-random-bars;ooo-exit-diagonal-squares;ooo-exit-split;ooo-exit-wedge;ooo-exit-wheel;ooo-exit-wipe;ooo-exit-random;ooo-media-stop</value>
- </prop>
- </node>
- <node oor:name="special" oor:op="replace">
+ </node>
++ <node oor:name="Misc">
++ <node oor:name="media" oor:op="replace">
++ <prop oor:name="Label" oor:type="xs:string">
++ <value xml:lang="en-US">Media</value>
++ </prop>
++ <prop oor:name="Effects" oor:type="oor:string-list">
++ <value oor:separator=";">ooo-media-start;ooo-media-toggle-pause;ooo-media-stop</value>
++ </prop>
++ </node>
++ </node>
+ </node>
+ </oor:component-data>
+-
+diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
+index e58e74d..4d69654 100644
+--- officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
++++ officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
+@@ -106,6 +106,11 @@
+ <desc>Contains the categories for motion path effects."</desc>
+ </info>
+ </set>
++ <set oor:name="Misc" oor:node-type="PresetCategory">
++ <info>
++ <desc>Contains all the categories that don't fit anywhere else."</desc>
++ </info>
++ </set>
+ </group>
+ </component>
+ </oor:component-schema>
+diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
+index 907e942..8467eb1 100644
+--- sd/inc/CustomAnimationPreset.hxx
++++ sd/inc/CustomAnimationPreset.hxx
+@@ -123,6 +123,7 @@ public:
+ const PresetCategoryList& getEmphasisPresets() const { return maEmphasisPresets; }
+ const PresetCategoryList& getExitPresets() const { return maExitPresets; }
+ const PresetCategoryList& getMotionPathsPresets() const { return maMotionPathsPresets; }
++ const PresetCategoryList& getMiscPresets() const { return maMiscPresets; }
+
+ void changePresetSubType( CustomAnimationEffectPtr pEffect, const rtl::OUString& rPresetSubType ) const;
+
+@@ -144,6 +145,7 @@ private:
+ PresetCategoryList maEmphasisPresets;
+ PresetCategoryList maExitPresets;
+ PresetCategoryList maMotionPathsPresets;
++ PresetCategoryList maMiscPresets;
+
+ static CustomAnimationPresets* mpCustomAnimationPresets;
+ };
+diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
+index 9f264bc..9425065 100644
+--- sd/inc/helpids.h
++++ sd/inc/helpids.h
+@@ -256,26 +256,27 @@
+ #define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179)
+ #define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180)
+ #define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181)
+-
+-#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 182)
+-#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 183)
+-#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 184)
+-#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 185)
+-#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 186)
+-#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 187)
+-#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 188)
+-#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 189)
+-
+-#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 190)
+-
+-#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 191)
+-#define HID_SD_RULER_VERTICAL (HID_SD_START + 192)
+-
+-#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 193)
+-#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 194)
+-#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 195)
+-#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 196)
+-#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 197)
+-#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 198)
+-
+-#define HID_SD_TABLE_DESIGN (HID_SD_START + 199)
++#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182)
++
++#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183)
++#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184)
++#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185)
++#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186)
++#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187)
++#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188)
++#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189)
++#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190)
++
++#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191)
++
++#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192)
++#define HID_SD_RULER_VERTICAL (HID_SD_START + 193)
++
++#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
++#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
++#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
++#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
++#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
++#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
++
++#define HID_SD_TABLE_DESIGN (HID_SD_START + 200)
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
-index 02d6611..2bf295f 100644
+index 5d80114..e7aef33 100644
--- sd/source/core/CustomAnimationEffect.cxx
+++ sd/source/core/CustomAnimationEffect.cxx
-@@ -768,9 +768,16 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
+@@ -691,9 +691,16 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
{
while( xEnumeration->hasMoreElements() )
{
@@ -95,6 +177,108 @@
}
}
}
+diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
+index b680c56..471d8fa 100644
+--- sd/source/core/CustomAnimationPreset.cxx
++++ sd/source/core/CustomAnimationPreset.cxx
+@@ -469,6 +469,9 @@ void CustomAnimationPresets::importResources()
+
+ const OUString aMotionPathsPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/MotionPaths" ) );
+ importPresets( xConfigProvider, aMotionPathsPath, maMotionPathsPresets );
++
++ const OUString aMiscPath( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Effects/Presets/Misc" ) );
++ importPresets( xConfigProvider, aMiscPath, maMiscPresets );
+ }
+ catch( lang::WrappedTargetException& e )
+ {
+diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
+index c05face..41abcdb 100644
+--- sd/source/ui/animations/CustomAnimation.hrc
++++ sd/source/ui/animations/CustomAnimation.hrc
+@@ -52,10 +52,11 @@
+ #define RID_TP_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+5
+ #define RID_TP_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+6
+ #define RID_TP_CUSTOMANIMATION_MOTIONPATH RID_CUSTOMANIMATION_START+7
+-#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+8
+-#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+9
+-#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+10
+-#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+11
++#define RID_TP_CUSTOMANIMATION_MISCEFFECTS RID_CUSTOMANIMATION_START+8
++#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+9
++#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+10
++#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+11
++#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+12
+
+ #define IMG_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0
+ #define IMG_CUSTOMANIMATION_ON_CLICK_H RID_CUSTOMANIMATION_START+1
+diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+index 0b1590d..f2b7c59 100644
+--- sd/source/ui/animations/CustomAnimationCreateDialog.cxx
++++ sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+@@ -86,6 +86,7 @@ const int ENTRANCE = 0;
+ const int EMPHASIS = 1;
+ const int EXIT = 2;
+ const int MOTIONPATH = 3;
++const int MISCEFFECTS = 4;
+
+ extern void fillDurationComboBox( ComboBox* pBox );
+
+@@ -555,6 +556,9 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo
+ mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, MOTIONPATH, rPresets.getMotionPathsPresets(), bHasText );
+ mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH );
+ mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MOTIONPATH, mpTabPages[MOTIONPATH] );
++ mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, MISCEFFECTS, rPresets.getMiscPresets(), bHasText );
++ mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS );
++ mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MISCEFFECTS, mpTabPages[MISCEFFECTS] );
+
+ getCurrentPage()->setDuration( mfDuration );
+ getCurrentPage()->setIsPreview( mbIsPreview );
+@@ -589,6 +593,7 @@ CustomAnimationCreateDialog::~CustomAnimationCreateDialog()
+ delete mpTabPages[EMPHASIS];
+ delete mpTabPages[EXIT];
+ delete mpTabPages[MOTIONPATH];
++ delete mpTabPages[MISCEFFECTS];
+
+ delete mpTabControl;
+ delete mpOKButton;
+@@ -603,6 +608,7 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons
+ case RID_TP_CUSTOMANIMATION_ENTRANCE: return mpTabPages[ENTRANCE];
+ case RID_TP_CUSTOMANIMATION_EMPHASIS: return mpTabPages[EMPHASIS];
+ case RID_TP_CUSTOMANIMATION_EXIT: return mpTabPages[EXIT];
++ case RID_TP_CUSTOMANIMATION_MISCEFFECTS:return mpTabPages[MISCEFFECTS];
+ //case RID_TP_CUSTOMANIMATION_MOTIONPATH:
+ default:
+ return mpTabPages[MOTIONPATH];
+diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+index 7ead051..0b08a65 100644
+--- sd/source/ui/animations/CustomAnimationCreateDialog.hxx
++++ sd/source/ui/animations/CustomAnimationCreateDialog.hxx
+@@ -80,7 +80,7 @@ private:
+ CancelButton* mpCancelButton;
+ HelpButton* mpHelpButton;
+
+- CustomAnimationCreateTabPage* mpTabPages[4];
++ CustomAnimationCreateTabPage* mpTabPages[5];
+ };
+
+ }
+diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src
+index 38f6d42..712f0f8 100644
+--- sd/source/ui/animations/CustomAnimationCreateDialog.src
++++ sd/source/ui/animations/CustomAnimationCreateDialog.src
+@@ -71,6 +71,12 @@ TabDialog DLG_CUSTOMANIMATION_CREATE
+ Identifier = RID_TP_CUSTOMANIMATION_MOTIONPATH;
+ Text [ en-US ] = "Motion Paths";
+ };
++
++ PageItem
++ {
++ Identifier = RID_TP_CUSTOMANIMATION_MISCEFFECTS;
++ Text [ en-US ] = "Misc Effects";
++ };
+ };
+ };
+ OKButton 1
diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml
index ddf5777..983759d 100644
--- sd/xml/effects.xml
@@ -126,10 +310,10 @@
+ </anim:par>
</anim:seq>
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
-index 92a1cb1..d5ca62b 100644
+index 64a8808..8c6a0c4 100644
--- slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ slideshow/source/engine/animationnodes/animationcommandnode.cxx
-@@ -40,6 +40,8 @@
+@@ -35,6 +35,8 @@
#include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx>
#include <com/sun/star/presentation/EffectCommands.hpp>
@@ -138,7 +322,7 @@
#include "animationcommandnode.hxx"
#include "delayevent.hxx"
-@@ -48,30 +50,75 @@
+@@ -43,30 +45,75 @@
#include <boost/bind.hpp>
@@ -220,7 +404,7 @@
// the command stops all currently running sound effects
case EffectCommands::STOPAUDIO:
getContext().mrEventMultiplexer.notifyCommandStopAudio( getSelf() );
-@@ -85,7 +132,7 @@ void AnimationCommandNode::activate_()
+@@ -80,7 +127,7 @@ void AnimationCommandNode::activate_()
bool AnimationCommandNode::hasPendingAnimation() const
{
@@ -230,10 +414,10 @@
} // namespace internal
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
-index e8d4352..9e0706e 100644
+index c757139..6d99754 100644
--- slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ slideshow/source/engine/animationnodes/animationcommandnode.hxx
-@@ -36,6 +36,7 @@
+@@ -31,6 +31,7 @@
#define INCLUDED_SLIDESHOW_ANIMATIONCOMMANDNODE_HXX
#include "basecontainernode.hxx"
@@ -241,7 +425,7 @@
#include "soundplayer.hxx"
#include "com/sun/star/animations/XCommand.hpp"
-@@ -44,9 +45,8 @@ namespace internal {
+@@ -39,9 +40,8 @@ namespace internal {
/** Command node.
@@ -253,7 +437,7 @@
*/
class AnimationCommandNode : public BaseNode
{
-@@ -55,20 +55,20 @@ public:
+@@ -50,20 +50,20 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimationNode> const& xNode,
::boost::shared_ptr<BaseContainerNode> const& pParent,
@@ -279,10 +463,10 @@
} // namespace internal
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
-index 48f9995..8f76278 100644
+index b569042..309496d 100644
--- slideshow/source/engine/shapes/appletshape.cxx
+++ slideshow/source/engine/shapes/appletshape.cxx
-@@ -116,6 +116,9 @@ namespace slideshow
+@@ -111,6 +111,9 @@ namespace slideshow
virtual void implViewsChanged();
virtual bool implStartIntrinsicAnimation();
virtual bool implEndIntrinsicAnimation();
@@ -292,7 +476,7 @@
const ::rtl::OUString maServiceName;
const char** mpPropCopyTable;
-@@ -124,6 +127,7 @@ namespace slideshow
+@@ -119,6 +122,7 @@ namespace slideshow
/// the list of active view shapes (one for each registered view layer)
typedef ::std::vector< ViewAppletShapeSharedPtr > ViewAppletShapeVector;
ViewAppletShapeVector maViewAppletShapes;
@@ -300,7 +484,7 @@
};
AppletShape::AppletShape( const uno::Reference< drawing::XShape >& xShape,
-@@ -136,7 +140,8 @@ namespace slideshow
+@@ -131,7 +135,8 @@ namespace slideshow
maServiceName( rServiceName ),
mpPropCopyTable( pPropCopyTable ),
mnNumPropEntries( nNumPropEntries ),
@@ -310,7 +494,7 @@
{
}
-@@ -270,6 +275,7 @@ namespace slideshow
+@@ -265,6 +270,7 @@ namespace slideshow
::boost::bind( &ViewAppletShape::startApplet,
_1,
::boost::cref( getBounds() )));
@@ -318,7 +502,7 @@
return true;
}
-@@ -282,9 +288,34 @@ namespace slideshow
+@@ -277,9 +283,34 @@ namespace slideshow
maViewAppletShapes.end(),
::boost::mem_fn( &ViewAppletShape::endApplet ) );
@@ -354,10 +538,10 @@
const uno::Reference< drawing::XShape >& xShape,
double nPrio,
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
-index 82b70f6..aa0917e 100644
+index 0aac502..b53b9b5 100644
--- slideshow/source/engine/shapes/externalshapebase.cxx
+++ slideshow/source/engine/shapes/externalshapebase.cxx
-@@ -145,20 +145,41 @@ namespace slideshow
+@@ -140,20 +140,41 @@ namespace slideshow
// ---------------------------------------------------------------------
@@ -403,10 +587,10 @@
{
return render();
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
-index 09a5bf4..a673486 100644
+index 60d5846..88b9b75 100644
--- slideshow/source/engine/shapes/externalshapebase.hxx
+++ slideshow/source/engine/shapes/externalshapebase.hxx
-@@ -38,7 +38,7 @@
+@@ -33,7 +33,7 @@
#include <vector>
@@ -415,7 +599,7 @@
#include "unoview.hxx"
#include "subsettableshapemanager.hxx"
#include "slideshowexceptions.hxx"
-@@ -60,7 +60,7 @@ namespace slideshow
+@@ -55,7 +55,7 @@ namespace slideshow
(including mutual overdraw). It therefore reports yes for
the isBackgroundDetached() question.
*/
@@ -424,7 +608,7 @@
{
public:
/** Create a shape for the given XShape for an external shape
-@@ -84,9 +84,11 @@ namespace slideshow
+@@ -79,9 +79,11 @@ namespace slideshow
// animation methods
//------------------------------------------------------------------
@@ -439,7 +623,7 @@
// render methods
//------------------------------------------------------------------
-@@ -125,6 +127,12 @@ namespace slideshow
+@@ -120,6 +122,12 @@ namespace slideshow
virtual bool implStartIntrinsicAnimation() = 0;
/// override in derived class to stop external viewer
virtual bool implEndIntrinsicAnimation() = 0;
@@ -453,10 +637,10 @@
/// The associated XShape
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
-index 48cdc52..76ec28a 100644
+index 72875da..cfddd76 100644
--- slideshow/source/engine/shapes/mediashape.cxx
+++ slideshow/source/engine/shapes/mediashape.cxx
-@@ -102,10 +102,14 @@ namespace slideshow
+@@ -97,10 +97,14 @@ namespace slideshow
virtual void implViewsChanged();
virtual bool implStartIntrinsicAnimation();
virtual bool implEndIntrinsicAnimation();
@@ -471,7 +655,7 @@
};
-@@ -113,7 +117,8 @@ namespace slideshow
+@@ -108,7 +112,8 @@ namespace slideshow
double nPrio,
const SlideShowContext& rContext ) :
ExternalShapeBase( xShape, nPrio, rContext ),
@@ -481,7 +665,7 @@
{
}
-@@ -234,7 +239,9 @@ namespace slideshow
+@@ -229,7 +234,9 @@ namespace slideshow
::std::for_each( maViewMediaShapes.begin(),
maViewMediaShapes.end(),
::boost::mem_fn( &ViewMediaShape::startMedia ) );
@@ -492,7 +676,7 @@
return true;
}
-@@ -246,9 +253,43 @@ namespace slideshow
+@@ -241,9 +248,43 @@ namespace slideshow
maViewMediaShapes.end(),
::boost::mem_fn( &ViewMediaShape::endMedia ) );
@@ -537,10 +721,10 @@
const uno::Reference< drawing::XShape >& xShape,
double nPrio,
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
-index 080d02c..fecf362 100644
+index df166db..e61b9df 100644
--- slideshow/source/engine/shapes/viewmediashape.cxx
+++ slideshow/source/engine/shapes/viewmediashape.cxx
-@@ -192,6 +192,22 @@ namespace slideshow
+@@ -172,6 +172,22 @@ namespace slideshow
// ---------------------------------------------------------------------
@@ -564,10 +748,10 @@
{
::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas();;
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
-index 77bb22a..4cb7caf 100644
+index 6c040ce..f246fb7 100644
--- slideshow/source/engine/shapes/viewmediashape.hxx
+++ slideshow/source/engine/shapes/viewmediashape.hxx
-@@ -113,6 +113,20 @@ namespace slideshow
+@@ -108,6 +108,20 @@ namespace slideshow
*/
void endMedia();
@@ -589,10 +773,10 @@
//------------------------------------------------------------------
diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx
-index dee4ae5..6d0bec7 100644
+index 9fa2a37..e368f90 100644
--- slideshow/source/inc/animationnode.hxx
+++ slideshow/source/inc/animationnode.hxx
-@@ -155,8 +155,9 @@ public:
+@@ -150,8 +150,9 @@ public:
/** Query node whether it has an animation pending.
@@ -604,116 +788,11 @@
*/
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 e8231ef..97fa8c9 100644
+index 65098a5..1ab184a 100644
--- xmloff/source/draw/animationimport.cxx
+++ xmloff/source/draw/animationimport.cxx
-@@ -887,6 +887,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
+@@ -804,6 +804,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
// query for optional interfaces that are often used later
Reference< XAnimate > xAnimate( mxNode, UNO_QUERY );
@@ -721,7 +800,7 @@
Reference< XTransitionFilter > xTransitionFilter( mxNode, UNO_QUERY );
Reference< XIterateContainer > xIter( mxNode, UNO_QUERY );
-@@ -1033,6 +1034,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
+@@ -950,6 +951,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
{
xIter->setTarget( aTarget );
}
@@ -732,7 +811,7 @@
}
}
break;
-@@ -1313,11 +1318,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
+@@ -1230,11 +1235,10 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
case ANA_Command:
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
