mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS presfixes01 (1.3.6); FILE MERGED

Browse Source 
2005/02/16 11:14:28 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:00 +00:00
parent 347c0d01ce
commit 9072edfb76
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cppcanvas/source/mtfrenderer/lineaction.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: lineaction.hxx,v $ * $RCSfile: lineaction.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 20:55:01 $ * last change: $Author: vg $ $Date: 2005-03-10 13:24:44 $
* *
* 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_LINEACTION_HXX #ifndef _CPPCANVAS_LINEACTION_HXX
#define _CPPCANVAS_LINEACTION_HXX #define _CPPCANVAS_LINEACTION_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
@@ -103,7 +103,7 @@ namespace cppcanvas
Point maStartPoint; Point maStartPoint;
Point maEndPoint; Point maEndPoint;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
::drafts::com::sun::star::rendering::RenderState maState; ::com::sun::star::rendering::RenderState maState;
}; };
} }
} }

11
cppcanvas/source/mtfrenderer/mtftools.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: mtftools.cxx,v $ * $RCSfile: mtftools.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 20:55:29 $ * last change: $Author: vg $ $Date: 2005-03-10 13:25:00 $
* *
* 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 @@
#include <mtftools.hxx> #include <mtftools.hxx>
#include <outdevstate.hxx> #include <outdevstate.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 _CANVAS_CANVASTOOLS_HXX #ifndef _CANVAS_CANVASTOOLS_HXX
@@ -71,7 +71,6 @@
#endif #endif
using namespace ::drafts::com::sun::star;
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace cppcanvas namespace cppcanvas
@@ -79,7 +78,7 @@ namespace cppcanvas
namespace tools namespace tools
{ {
void initRenderState( ::drafts::com::sun::star::rendering::RenderState& renderState, void initRenderState( ::com::sun::star::rendering::RenderState& renderState,
const struct ::cppcanvas::internal::OutDevState& outdevState ) const struct ::cppcanvas::internal::OutDevState& outdevState )
{ {
::canvas::tools::initRenderState( renderState ); ::canvas::tools::initRenderState( renderState );