INTEGRATION: CWS presfixes01 (1.3.6); FILE MERGED

2005/02/16 11:14:36 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:29:08 +00:00
parent bd8dc0a1a6
commit 41b69914a2
2 changed files with 12 additions and 12 deletions

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbitmapcanvas.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:59:16 $
* last change: $Author: vg $ $Date: 2005-03-10 13:28:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,11 +59,11 @@
*
************************************************************************/
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XCANVAS_HPP__
#include <drafts/com/sun/star/rendering/XCanvas.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__
#include <com/sun/star/rendering/XCanvas.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XBITMAPCANVAS_HPP__
#include <drafts/com/sun/star/rendering/XBitmapCanvas.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XBITMAPCANVAS_HPP__
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#endif
#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
@@ -76,7 +76,7 @@
#include <implbitmapcanvas.hxx>
using namespace ::drafts::com::sun::star;
using namespace ::com::sun::star;
using namespace ::com::sun::star;
namespace cppcanvas

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implcanvas.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:59:44 $
* last change: $Author: vg $ $Date: 2005-03-10 13:29:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,8 +71,8 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XCANVAS_HPP_
#include <drafts/com/sun/star/rendering/XCanvas.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP_
#include <com/sun/star/rendering/XCanvas.hpp>
#endif
#include <canvas/canvastools.hxx>
@@ -82,7 +82,7 @@
#include <implcolor.hxx>
using namespace ::drafts::com::sun::star;
using namespace ::com::sun::star;
using namespace ::com::sun::star;
namespace cppcanvas