diff options
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 4 | ||||
| -rw-r--r-- | include/cppcanvas/spritecanvas.hxx | 4 | ||||
| -rw-r--r-- | offapi/com/sun/star/rendering/XSpriteCanvas.idl | 11 |
4 files changed, 9 insertions, 14 deletions
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index c6b43a6a9af1..78701786fe15 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -51,8 +51,6 @@ namespace cppcanvas ImplSpriteCanvas::ImplSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : ImplCanvas( uno::Reference< rendering::XCanvas >(rCanvas, uno::UNO_QUERY) ), - ImplBitmapCanvas( uno::Reference< rendering::XBitmapCanvas >(rCanvas, - uno::UNO_QUERY) ), mxSpriteCanvas( rCanvas ), mpTransformArbiter( new TransformationArbiter() ) { @@ -61,10 +59,8 @@ namespace cppcanvas ImplSpriteCanvas::ImplSpriteCanvas(const ImplSpriteCanvas& rOrig) : Canvas(), - BitmapCanvas(), SpriteCanvas(), ImplCanvas( rOrig ), - ImplBitmapCanvas( rOrig ), mxSpriteCanvas( rOrig.getUNOSpriteCanvas() ), mpTransformArbiter( new TransformationArbiter() ) { diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 2e70b9aa42f1..1999c5630ff0 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -29,14 +29,14 @@ #include <cppcanvas/spritecanvas.hxx> -#include <implbitmapcanvas.hxx> +#include <implcanvas.hxx> namespace cppcanvas { namespace internal { - class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplBitmapCanvas + class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas { public: ImplSpriteCanvas( const ::com::sun::star::uno::Reference< diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index d5e6a27d65db..91fc52b3cc41 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -28,7 +28,7 @@ #include <boost/shared_ptr.hpp> -#include <cppcanvas/bitmapcanvas.hxx> +#include <cppcanvas/canvas.hxx> #include <cppcanvas/sprite.hxx> #include <cppcanvas/customsprite.hxx> @@ -49,7 +49,7 @@ namespace cppcanvas /** SpriteCanvas interface */ - class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable + class SpriteCanvas : public virtual Canvas, private boost::noncopyable { public: virtual bool updateScreen( bool bUpdateAll ) const = 0; diff --git a/offapi/com/sun/star/rendering/XSpriteCanvas.idl b/offapi/com/sun/star/rendering/XSpriteCanvas.idl index eb98a4f3e830..f15b02b8efeb 100644 --- a/offapi/com/sun/star/rendering/XSpriteCanvas.idl +++ b/offapi/com/sun/star/rendering/XSpriteCanvas.idl @@ -30,7 +30,7 @@ interface XSprite; interface XAnimatedSprite; interface XCustomSprite; -/** Specialization of a XBitmapCanvas, where moving, animated objects +/** Specialization of a XCanvas, where moving, animated objects (called sprites) are supported.<p> @attention The screen output of canvas drawing operations is @@ -44,9 +44,9 @@ interface XCustomSprite; (because there's a defined moment in time where content display can happen, namely the XBufferController::showBuffer()) call. If you don't need sprite functionality, and don't want the - updateScreen hassle, simply use the XBitmapCanvas. + updateScreen hassle, simply use the XCanvas. */ -interface XSpriteCanvas : XBitmapCanvas +interface XSpriteCanvas : XCanvas { /** Create a sprite object from the specified animation sequence. A sprite is a back-buffered object with its own, @@ -98,9 +98,8 @@ interface XSpriteCanvas : XBitmapCanvas object. The cloned sprite always shows the same content as its - original. Furthermore, cloned copies of a hidden original are - never visible, although cloned copies of a visible original - can of course be invisible. + original, but of course the sprite position, visibility, alpha + etc. can be modified independently. @param original The original sprite to copy the content from. This sprite must |