From b3b2e752d22f0c3821de4588ba6f34859b0b3ac0 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 10 Mar 2005 12:30:50 +0000 Subject: INTEGRATION: CWS presfixes01 (1.3.10); FILE MERGED 2005/02/16 11:14:38 fs 1.3.10.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.* --- cppcanvas/source/wrapper/implfont.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cppcanvas') diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 6679f7df0f49..cd0a20fa9584 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implfont.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-09-08 17:00:16 $ + * last change: $Author: vg $ $Date: 2005-03-10 13:30:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include #endif -#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XCANVAS_HPP__ -#include +#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__ +#include #endif #ifndef _CPPCANVAS_FONT_HXX @@ -83,10 +83,10 @@ namespace rtl class OUString; } -namespace drafts { namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XCanvasFont; -} } } } } +} } } } /* Definition of Font class */ @@ -100,7 +100,7 @@ namespace cppcanvas { public: ImplFont( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XCanvas >& rCanvas, + ::com::sun::star::rendering::XCanvas >& rCanvas, const ::rtl::OUString& rFontName, const double& rCellSize ); @@ -110,11 +110,11 @@ namespace cppcanvas virtual double getCellSize() const; virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::rendering::XCanvasFont > getUNOFont() const; + ::com::sun::star::rendering::XCanvasFont > getUNOFont() const; private: - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XCanvas > mxCanvas; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XCanvasFont > mxFont; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > mxFont; }; } } -- cgit