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

INTEGRATION: CWS presfixes01 (1.4.6); FILE MERGED

Browse Source 
2005/02/16 11:14:36 fs 1.4.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:21 +00:00
parent 41b69914a2
commit 54e804342b
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cppcanvas/source/wrapper/implbitmapcanvas.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbitmapcanvas.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:59:31 $
* last change: $Author: vg $ $Date: 2005-03-10 13:28:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,11 +62,11 @@
#ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX
#define _CPPCANVAS_IMPLBITMAPCANVAS_HXX
#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 _DRAFTS_COM_SUN_STAR_RENDERING_XBITMAP_HPP__
#include <drafts/com/sun/star/rendering/XBitmap.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XBITMAP_HPP__
#include <com/sun/star/rendering/XBitmap.hpp>
#endif
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
@@ -93,7 +93,7 @@ namespace cppcanvas
{
public:
ImplBitmapCanvas( const ::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
virtual ~ImplBitmapCanvas();
virtual ::basegfx::B2ISize getSize() const;
@@ -107,8 +107,8 @@ namespace cppcanvas
// default: disabled assignment
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& );
const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas;
const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XBitmap > mxBitmap;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;
};
}
}

22
cppcanvas/source/wrapper/implcanvas.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implcanvas.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: rt $ $Date: 2004-11-26 20:59:59 $
* last change: $Author: vg $ $Date: 2005-03-10 13:29:21 $
*
* 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_VIEWSTATE_HPP__
#include <drafts/com/sun/star/rendering/ViewState.hpp>
#ifndef _COM_SUN_STAR_RENDERING_VIEWSTATE_HPP__
#include <com/sun/star/rendering/ViewState.hpp>
#endif
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
@@ -87,10 +87,10 @@ namespace basegfx
class B2DPolyPolygon;
}
namespace drafts { namespace com { namespace sun { namespace star { namespace rendering
namespace com { namespace sun { namespace star { namespace rendering
{
class XCanvas;
} } } } }
} } } }
/* Definition of ImplCanvas */
@@ -105,7 +105,7 @@ namespace cppcanvas
{
public:
ImplCanvas( const ::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XCanvas >& rCanvas );
::com::sun::star::rendering::XCanvas >& rCanvas );
virtual ~ImplCanvas();
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix );
@@ -121,9 +121,9 @@ namespace cppcanvas
virtual CanvasSharedPtr clone() const;
virtual ::com::sun::star::uno::Reference<
::drafts::com::sun::star::rendering::XCanvas > getUNOCanvas() const;
::com::sun::star::rendering::XCanvas > getUNOCanvas() const;
virtual ::drafts::com::sun::star::rendering::ViewState getViewState() const;
virtual ::com::sun::star::rendering::ViewState getViewState() const;
// take compiler-provided default copy constructor
//ImplCanvas(const ImplCanvas&);
@@ -132,9 +132,9 @@ namespace cppcanvas
// default: disabled assignment
ImplCanvas& operator=( const ImplCanvas& );
::drafts::com::sun::star::rendering::ViewState maViewState;
::com::sun::star::rendering::ViewState maViewState;
PolyPolygonSharedPtr mpClipPolyPolygon;
const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XCanvas > mxCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas;
};
}