mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ExternalMediaShape to IExternalMediaShapeBase

Browse Source 
"I" because of interface.
"Base" because it's an interface of a base class
and because it's easy to mix it up with the inherited MediaShape.
(MediaShape also an externally rendered thing so
the name ExternalMediaShape doesn't make any
difference between the two classes)

Change-Id: I4a03dd090034092942eea39d35894ce6cfc9947b
This commit is contained in:
Zolnai Tamás
2014-04-16 09:28:51 +02:00
parent 728acd3390
commit cae4370bce
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slideshow/source/engine/animationnodes/animationcommandnode.cxx
View File

@@ -49,7 +49,7 @@ AnimationCommandNode::AnimationCommandNode( uno::Reference<animations::XAnimatio
uno::Reference< drawing::XShape > xShape( mxCommandNode->getTarget(), uno::Reference< drawing::XShape > xShape( mxCommandNode->getTarget(),
uno::UNO_QUERY ); uno::UNO_QUERY );
ShapeSharedPtr pShape( getContext().mpSubsettableShapeManager->lookupShape( xShape ) ); ShapeSharedPtr pShape( getContext().mpSubsettableShapeManager->lookupShape( xShape ) );
mpShape = ::boost::dynamic_pointer_cast< ExternalMediaShape >( pShape ); mpShape = ::boost::dynamic_pointer_cast< IExternalMediaShapeBase >( pShape );
} }
void AnimationCommandNode::dispose() void AnimationCommandNode::dispose()

4
slideshow/source/engine/animationnodes/animationcommandnode.hxx
View File

@@ -20,7 +20,7 @@
#define INCLUDED_SLIDESHOW_ANIMATIONCOMMANDNODE_HXX #define INCLUDED_SLIDESHOW_ANIMATIONCOMMANDNODE_HXX
#include "basecontainernode.hxx" #include "basecontainernode.hxx"
#include "externalmediashape.hxx" #include "iexternalmediashapebase.hxx"
#include "soundplayer.hxx" #include "soundplayer.hxx"
#include "com/sun/star/animations/XCommand.hpp" #include "com/sun/star/animations/XCommand.hpp"
@@ -49,7 +49,7 @@ private:
virtual bool hasPendingAnimation() const SAL_OVERRIDE; virtual bool hasPendingAnimation() const SAL_OVERRIDE;
private: private:
ExternalMediaShapeSharedPtr mpShape; IExternalMediaShapeBaseSharedPtr mpShape;
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::animations::XCommand > mxCommandNode; ::com::sun::star::animations::XCommand > mxCommandNode;
}; };

4
slideshow/source/engine/shapes/externalshapebase.hxx
View File

@@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include "externalmediashape.hxx" #include "iexternalmediashapebase.hxx"
#include "unoview.hxx" #include "unoview.hxx"
#include "subsettableshapemanager.hxx" #include "subsettableshapemanager.hxx"
#include "slideshowexceptions.hxx" #include "slideshowexceptions.hxx"
@@ -44,7 +44,7 @@ namespace slideshow
(including mutual overdraw). It therefore reports yes for (including mutual overdraw). It therefore reports yes for
the isBackgroundDetached() question. the isBackgroundDetached() question.
*/ */
class ExternalShapeBase : public ExternalMediaShape class ExternalShapeBase : public IExternalMediaShapeBase
{ {
public: public:
/** Create a shape for the given XShape for an external shape /** Create a shape for the given XShape for an external shape

7
slideshow/source/inc/externalmediashape.hxx → slideshow/source/inc/iexternalmediashapebase.hxx
View File

@@ -29,12 +29,13 @@ namespace slideshow
{ {
namespace internal namespace internal
{ {
/** Represents a shape containing media (video, sound). /** Represents a shape containing playable content rendered by
external engine (e.g. media or applet).
This interface adds media handling methods to a shape. It This interface adds media handling methods to a shape. It
allows starting/stopping and pausing playback. allows starting/stopping and pausing playback.
*/ */
class ExternalMediaShape : public Shape class IExternalMediaShapeBase : public Shape
{ {
public: public:
// Animation methods // Animation methods
@@ -75,7 +76,7 @@ namespace slideshow
virtual void setMediaTime(double fTime) = 0; virtual void setMediaTime(double fTime) = 0;
}; };
typedef ::boost::shared_ptr< ExternalMediaShape > ExternalMediaShapeSharedPtr; typedef ::boost::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr;
} }
} }