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:39 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:32:03 +00:00
parent 46dc80b411
commit ffa5dbd2fd
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppcanvas/source/wrapper/implpolypolygon.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implpolypolygon.cxx,v $ * $RCSfile: implpolypolygon.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 21:01:35 $ * last change: $Author: vg $ $Date: 2005-03-10 13:31:02 $
* *
* 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
@@ -63,11 +63,11 @@
#include <rtl/math.hxx> #include <rtl/math.hxx>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_PATHJOINTYPE_HPP_ #ifndef _COM_SUN_STAR_RENDERING_PATHJOINTYPE_HPP_
#include <drafts/com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_PATHCAPTYPE_HPP_ #ifndef _COM_SUN_STAR_RENDERING_PATHCAPTYPE_HPP_
#include <drafts/com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathCapType.hpp>
#endif #endif
#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
@@ -81,7 +81,7 @@
#include <tools.hxx> #include <tools.hxx>
using namespace ::drafts::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star; using namespace ::com::sun::star;

28
cppcanvas/source/wrapper/implpolypolygon.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implpolypolygon.hxx,v $ * $RCSfile: implpolypolygon.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 21:01:47 $ * last change: $Author: vg $ $Date: 2005-03-10 13:31:14 $
* *
* 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
@@ -65,23 +65,23 @@
#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ #ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__ #ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
#include <drafts/com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__ #ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
#include <drafts/com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__ #ifndef _COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__
#include <drafts/com/sun/star/rendering/StrokeAttributes.hpp> #include <com/sun/star/rendering/StrokeAttributes.hpp>
#endif #endif
#include <cppcanvas/polypolygon.hxx> #include <cppcanvas/polypolygon.hxx>
#include <canvasgraphichelper.hxx> #include <canvasgraphichelper.hxx>
namespace drafts { namespace com { namespace sun { namespace star { namespace rendering namespace com { namespace sun { namespace star { namespace rendering
{ {
struct RealPoint2D; struct RealPoint2D;
} } } } } } } } }
namespace cppcanvas namespace cppcanvas
@@ -94,7 +94,7 @@ namespace cppcanvas
public: public:
ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas, ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly ); ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
virtual ~ImplPolyPolygon(); virtual ~ImplPolyPolygon();
@@ -112,16 +112,16 @@ namespace cppcanvas
virtual bool draw() const; virtual bool draw() const;
virtual ::com::sun::star::uno::Reference< virtual ::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const; ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const;
private: private:
// default: disabled copy/assignment // default: disabled copy/assignment
ImplPolyPolygon(const ImplPolyPolygon&); ImplPolyPolygon(const ImplPolyPolygon&);
ImplPolyPolygon& operator= ( const ImplPolyPolygon& ); ImplPolyPolygon& operator= ( const ImplPolyPolygon& );
const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;
::drafts::com::sun::star::rendering::StrokeAttributes maStrokeAttributes; ::com::sun::star::rendering::StrokeAttributes maStrokeAttributes;
::com::sun::star::uno::Sequence< double > maFillColor; ::com::sun::star::uno::Sequence< double > maFillColor;
::com::sun::star::uno::Sequence< double > maStrokeColor; ::com::sun::star::uno::Sequence< double > maStrokeColor;

14
cppcanvas/source/wrapper/implsprite.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implsprite.cxx,v $ * $RCSfile: implsprite.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 21:02:02 $ * last change: $Author: vg $ $Date: 2005-03-10 13:31:36 $
* *
* 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
@@ -59,11 +59,11 @@
* *
************************************************************************/ ************************************************************************/
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XSPRITE_HPP_ #ifndef _COM_SUN_STAR_RENDERING_XSPRITE_HPP_
#include <drafts/com/sun/star/rendering/XSprite.hpp> #include <com/sun/star/rendering/XSprite.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XANIMATEDSPRITE_HPP_ #ifndef _COM_SUN_STAR_RENDERING_XANIMATEDSPRITE_HPP_
#include <drafts/com/sun/star/rendering/XAnimatedSprite.hpp> #include <com/sun/star/rendering/XAnimatedSprite.hpp>
#endif #endif
#ifndef _BGFX_TOOLS_CANVASTOOLS_HXX #ifndef _BGFX_TOOLS_CANVASTOOLS_HXX
@@ -80,7 +80,7 @@
#include <implsprite.hxx> #include <implsprite.hxx>
using namespace ::drafts::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace cppcanvas namespace cppcanvas

10
cppcanvas/source/wrapper/implspritecanvas.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implspritecanvas.cxx,v $ * $RCSfile: implspritecanvas.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2004-11-26 21:02:29 $ * last change: $Author: vg $ $Date: 2005-03-10 13:32:03 $
* *
* 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,15 +66,15 @@
#include <basegfx/tools/canvastools.hxx> #include <basegfx/tools/canvastools.hxx>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_INTERPOLATIONMODE_HPP_ #ifndef _COM_SUN_STAR_RENDERING_INTERPOLATIONMODE_HPP_
#include <drafts/com/sun/star/rendering/InterpolationMode.hpp> #include <com/sun/star/rendering/InterpolationMode.hpp>
#endif #endif
#include <implspritecanvas.hxx> #include <implspritecanvas.hxx>
#include <implcustomsprite.hxx> #include <implcustomsprite.hxx>
using namespace ::drafts::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace cppcanvas namespace cppcanvas