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:30 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:26:22 +00:00
parent a084e4af73
commit 893bfed878
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: polypolyaction.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:56:36 $
* last change: $Author: vg $ $Date: 2005-03-10 13:26:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,11 +66,11 @@
#include <rtl/logfile.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
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_TEXTURINGMODE_HPP_
#include <drafts/com/sun/star/rendering/TexturingMode.hpp>
#ifndef _COM_SUN_STAR_RENDERING_TEXTURINGMODE_HPP_
#include <com/sun/star/rendering/TexturingMode.hpp>
#endif
#ifndef _SV_GEN_HXX
@@ -91,7 +91,6 @@
using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star;
namespace cppcanvas
{

24
cppcanvas/source/mtfrenderer/polypolyaction.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: polypolyaction.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:56:50 $
* last change: $Author: vg $ $Date: 2005-03-10 13:26:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,15 +66,15 @@
#include <com/sun/star/uno/Reference.hxx>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__
#include <drafts/com/sun/star/rendering/RenderState.hpp>
#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__
#include <com/sun/star/rendering/RenderState.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
#include <drafts/com/sun/star/rendering/XPolyPolygon2D.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_TEXTURE_HPP_
#include <drafts/com/sun/star/rendering/Texture.hpp>
#ifndef _COM_SUN_STAR_RENDERING_TEXTURE_HPP_
#include <com/sun/star/rendering/Texture.hpp>
#endif
#include <action.hxx>
@@ -106,7 +106,7 @@ namespace cppcanvas
PolyPolyAction( const ::PolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
const ::drafts::com::sun::star::rendering::Texture& );
const ::com::sun::star::rendering::Texture& );
PolyPolyAction( const ::PolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
@@ -126,11 +126,11 @@ namespace cppcanvas
PolyPolyAction& operator = ( const PolyPolyAction& );
::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;
::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;
CanvasSharedPtr mpCanvas;
::drafts::com::sun::star::rendering::RenderState maState;
::com::sun::star::rendering::RenderState maState;
::drafts::com::sun::star::rendering::Texture maTexture;
::com::sun::star::rendering::Texture maTexture;
::com::sun::star::uno::Sequence< double > maFillColor;
::com::sun::star::uno::Sequence< double > maStrokeColor;