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.*
This commit is contained in:
@@ -2,9 +2,9 @@
|
|||||||
*
|
*
|
||||||
* $RCSfile: implfont.hxx,v $
|
* $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
|
* The Contents of this file are made available subject to the terms of
|
||||||
* either of the following licenses
|
* either of the following licenses
|
||||||
@@ -70,8 +70,8 @@
|
|||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XCANVAS_HPP__
|
#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__
|
||||||
#include <drafts/com/sun/star/rendering/XCanvas.hpp>
|
#include <com/sun/star/rendering/XCanvas.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _CPPCANVAS_FONT_HXX
|
#ifndef _CPPCANVAS_FONT_HXX
|
||||||
@@ -83,10 +83,10 @@ namespace rtl
|
|||||||
class OUString;
|
class OUString;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace drafts { namespace com { namespace sun { namespace star { namespace rendering
|
namespace com { namespace sun { namespace star { namespace rendering
|
||||||
{
|
{
|
||||||
class XCanvasFont;
|
class XCanvasFont;
|
||||||
} } } } }
|
} } } }
|
||||||
|
|
||||||
/* Definition of Font class */
|
/* Definition of Font class */
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@ namespace cppcanvas
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ImplFont( const ::com::sun::star::uno::Reference<
|
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 ::rtl::OUString& rFontName,
|
||||||
const double& rCellSize );
|
const double& rCellSize );
|
||||||
|
|
||||||
@@ -110,11 +110,11 @@ namespace cppcanvas
|
|||||||
virtual double getCellSize() const;
|
virtual double getCellSize() const;
|
||||||
|
|
||||||
virtual ::com::sun::star::uno::Reference<
|
virtual ::com::sun::star::uno::Reference<
|
||||||
::drafts::com::sun::star::rendering::XCanvasFont > getUNOFont() const;
|
::com::sun::star::rendering::XCanvasFont > getUNOFont() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XCanvas > mxCanvas;
|
::com::sun::star::uno::Reference< ::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::XCanvasFont > mxFont;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user