INTEGRATION: CWS presfixes01 (1.3.6); FILE MERGED

2005/02/16 11:14:29 fs 1.3.6.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.*
This commit is contained in:
Vladimir Glazounov
2005-03-10 12:25:52 +00:00
parent 356cd299f0
commit a084e4af73
2 changed files with 9 additions and 10 deletions

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: pointaction.cxx,v $ * $RCSfile: pointaction.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 20:56:08 $ * last change: $Author: vg $ $Date: 2005-03-10 13:25:38 $
* *
* 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
@@ -66,8 +66,8 @@
#ifndef _RTL_LOGFILE_HXX_ #ifndef _RTL_LOGFILE_HXX_
#include <rtl/logfile.hxx> #include <rtl/logfile.hxx>
#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 _SV_GEN_HXX #ifndef _SV_GEN_HXX
@@ -88,7 +88,6 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star;
namespace cppcanvas namespace cppcanvas
{ {

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: pointaction.hxx,v $ * $RCSfile: pointaction.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 20:56:22 $ * last change: $Author: vg $ $Date: 2005-03-10 13:25:52 $
* *
* 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
@@ -62,8 +62,8 @@
#ifndef _CPPCANVAS_POINTACTION_HXX #ifndef _CPPCANVAS_POINTACTION_HXX
#define _CPPCANVAS_POINTACTION_HXX #define _CPPCANVAS_POINTACTION_HXX
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__ #ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__
#include <drafts/com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/RenderState.hpp>
#endif #endif
#ifndef _SV_GEN_HXX #ifndef _SV_GEN_HXX
@@ -104,7 +104,7 @@ namespace cppcanvas
::Point maPoint; ::Point maPoint;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
::drafts::com::sun::star::rendering::RenderState maState; ::com::sun::star::rendering::RenderState maState;
}; };
} }
} }