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/11/22 15:23:46 thb 1.2.2.4: #110496# Avoiding ternary operators returning different types on their branches: triggers Solaris compiler bug
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:30 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:44 +00:00
parent d7e4f13d91
commit 92a8fe504d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cppcanvas/source/wrapper/implcanvas.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implcanvas.cxx,v $ * $RCSfile: implcanvas.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: thb $ $Date: 2004-03-18 10:41:10 $ * last change: $Author: rt $ $Date: 2004-11-26 20:59:44 $
* *
* 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,7 +59,7 @@
* *
************************************************************************/ ************************************************************************/
#include "implcanvas.hxx" #include <implcanvas.hxx>
#ifndef _RTL_USTRING_HXX_ #ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
@@ -78,8 +78,8 @@
#include <canvas/canvastools.hxx> #include <canvas/canvastools.hxx>
#include <cppcanvas/polypolygon.hxx> #include <cppcanvas/polypolygon.hxx>
#include "implfont.hxx" #include <implfont.hxx>
#include "implcolor.hxx" #include <implcolor.hxx>
using namespace ::drafts::com::sun::star; using namespace ::drafts::com::sun::star;
@@ -119,7 +119,11 @@ namespace cppcanvas
void ImplCanvas::setClip( const PolyPolygonSharedPtr& rClipPoly ) void ImplCanvas::setClip( const PolyPolygonSharedPtr& rClipPoly )
{ {
mpClipPolyPolygon = rClipPoly; mpClipPolyPolygon = rClipPoly;
maViewState.Clip = rClipPoly.get() != NULL ? rClipPoly->getUNOPolyPolygon() : NULL;
if( rClipPoly.get() )
maViewState.Clip = rClipPoly->getUNOPolyPolygon();
else
maViewState.Clip.clear();
} }
PolyPolygonSharedPtr ImplCanvas::getClip() const PolyPolygonSharedPtr ImplCanvas::getClip() const
@@ -137,7 +141,7 @@ namespace cppcanvas
return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) ); return ColorSharedPtr( new ImplColor( getUNOCanvas()->getDevice() ) );
} }
CanvasSharedPtr ImplCanvas::cloneCanvas() const CanvasSharedPtr ImplCanvas::clone() const
{ {
return CanvasSharedPtr( new ImplCanvas( *this ) ); return CanvasSharedPtr( new ImplCanvas( *this ) );
} }