From 46dc80b4111fdb8f39c151d9ce7ac7d9193dfee9 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 10 Mar 2005 12:31:50 +0000 Subject: [PATCH] INTEGRATION: CWS presfixes01 (1.4.6); FILE MERGED 2005/02/16 11:14:39 fs 1.4.6.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.* --- cppcanvas/source/wrapper/implsprite.hxx | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index 23390b373a3b..3c772ac25e90 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implsprite.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-11-26 21:02:15 $ + * last change: $Author: vg $ $Date: 2005-03-10 13:31:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,11 +65,11 @@ #ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ #include #endif -#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XSPRITECANVAS_HPP_ -#include +#ifndef _COM_SUN_STAR_RENDERING_XSPRITECANVAS_HPP_ +#include #endif -#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XSPRITE_HPP_ -#include +#ifndef _COM_SUN_STAR_RENDERING_XSPRITE_HPP_ +#include #endif #ifndef BOOST_SHARED_PTR_HPP_INCLUDED @@ -91,14 +91,14 @@ namespace cppcanvas { public: ImplSprite( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, + ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XSprite >& rSprite, + ::com::sun::star::rendering::XSprite >& rSprite, const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); ImplSprite( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, + ::com::sun::star::rendering::XSpriteCanvas >& rParentCanvas, const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XAnimatedSprite >& rSprite, + ::com::sun::star::rendering::XAnimatedSprite >& rSprite, const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplSprite(); @@ -113,10 +113,10 @@ namespace cppcanvas virtual void hide(); virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XSprite > getUNOSprite() const; + ::com::sun::star::rendering::XSprite > getUNOSprite() const; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XGraphicDevice > + ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const; private: @@ -124,9 +124,9 @@ namespace cppcanvas ImplSprite(const ImplSprite&); ImplSprite& operator=( const ImplSprite& ); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XSprite > mxSprite; - const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XAnimatedSprite > mxAnimatedSprite; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite; + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > mxAnimatedSprite; ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; }; }