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

INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED

Browse Source 
2004/07/20 19:09:04 thb 1.2.2.3: #110496# Unified include statements; removed external prefix from boost includes
2004/06/25 10:30:29 thb 1.2.2.2: #110496# Some header cleanups (missing forward declarations), changed Canvas and derived to emulate covariant return types on clone() (not directly possible with shared_ptr)
2004/04/05 15:58:52 thb 1.2.2.1: Resync with canvas01 changes
This commit is contained in:
Rüdiger Timm
2004-11-26 19:59:31 +00:00
parent 57119d302d
commit d7e4f13d91
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cppcanvas/source/wrapper/implbitmapcanvas.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbitmapcanvas.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: thb $ $Date: 2004-03-18 10:41:09 $
* last change: $Author: rt $ $Date: 2004-11-26 20:59:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,7 +73,7 @@
#include <basegfx/tools/canvastools.hxx>
#endif
#include "implbitmapcanvas.hxx"
#include <implbitmapcanvas.hxx>
using namespace ::drafts::com::sun::star;
@@ -104,7 +104,7 @@ namespace cppcanvas
return ::basegfx::unotools::b2ISizeFromIntegerSize2D( mxBitmap->getSize() );
}
BitmapCanvasSharedPtr ImplBitmapCanvas::cloneBitmapCanvas() const
CanvasSharedPtr ImplBitmapCanvas::clone() const
{
return BitmapCanvasSharedPtr( new ImplBitmapCanvas( *this ) );
}

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

@@ -2,9 +2,9 @@
*
* $RCSfile: implbitmapcanvas.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2004-09-08 16:59:24 $
* last change: $Author: rt $ $Date: 2004-11-26 20:59:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,7 @@
#include <cppcanvas/bitmapcanvas.hxx>
#endif
#include "implcanvas.hxx"
#include <implcanvas.hxx>
namespace cppcanvas
@@ -98,7 +98,7 @@ namespace cppcanvas
virtual ::basegfx::B2ISize getSize() const;
virtual BitmapCanvasSharedPtr cloneBitmapCanvas() const;
virtual CanvasSharedPtr clone() const;
// take compiler-provided default copy constructor
//ImplBitmapCanvas(const ImplBitmapCanvas&);