strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS presfixes01 (1.3.6); FILE MERGED

Browse source 
2005/02/16 11:14:27 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:24:30 +00:00
parent 256a120970
commit 347c0d01ce
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cppcanvas/source/mtfrenderer/bitmapaction.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: bitmapaction.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:54:18 $
* last change: $Author: vg $ $Date: 2005-03-10 13:23:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -66,8 +66,8 @@
#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
#include <cppcanvas/canvas.hxx>
@ -78,10 +78,10 @@ class Size;
class BitmapEx;
class Color;
namespace drafts { namespace com { namespace sun { namespace star { namespace rendering
namespace com { namespace sun { namespace star { namespace rendering
{
class XBitmap;
} } } } }
} } } }
/* Definition of internal::BitmapAction class */
@ -127,9 +127,9 @@ namespace cppcanvas
BitmapAction& operator = ( const BitmapAction& );
::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XBitmap > mxBitmap;
::com::sun::star::rendering::XBitmap > mxBitmap;
CanvasSharedPtr mpCanvas;
::drafts::com::sun::star::rendering::RenderState maState;
::com::sun::star::rendering::RenderState maState;
};
}
}

9
cppcanvas/source/mtfrenderer/lineaction.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: lineaction.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:54:46 $
* last change: $Author: vg $ $Date: 2005-03-10 13:24:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -65,8 +65,8 @@
#ifndef _RTL_LOGFILE_HXX_
#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 _SV_GEN_HXX
@ -89,7 +89,6 @@
using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star;
namespace cppcanvas
{