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:45 thb 1.2.2.3: #110496# Avoiding ternary operators returning different types on their branches: triggers Solaris compiler bug
2004/07/20 19:09:02 thb 1.2.2.2: #110496# Unified include statements; removed external prefix from boost includes
2004/04/05 15:58:50 thb 1.2.2.1: Resync with canvas01 changes
This commit is contained in:
Rüdiger Timm
2004-11-26 19:57:57 +00:00
parent 570383c885
commit 83dafdac88
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppcanvas/source/tools/canvasgraphichelper.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: canvasgraphichelper.cxx,v $ * $RCSfile: canvasgraphichelper.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: thb $ $Date: 2004-03-18 10:41:07 $ * last change: $Author: rt $ $Date: 2004-11-26 20:57:57 $
* *
* 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 "canvasgraphichelper.hxx" #include <canvasgraphichelper.hxx>
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP_ #ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP_
#include <drafts/com/sun/star/rendering/XGraphicDevice.hpp> #include <drafts/com/sun/star/rendering/XGraphicDevice.hpp>
@@ -79,7 +79,7 @@
#endif #endif
#include <cppcanvas/polypolygon.hxx> #include <cppcanvas/polypolygon.hxx>
#include "tools.hxx" #include <tools.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -125,7 +125,11 @@ namespace cppcanvas
void CanvasGraphicHelper::setClip( const PolyPolygonSharedPtr& rClipPoly ) void CanvasGraphicHelper::setClip( const PolyPolygonSharedPtr& rClipPoly )
{ {
mpClipPolyPolygon = rClipPoly; mpClipPolyPolygon = rClipPoly;
maRenderState.Clip = rClipPoly.get() != NULL ? rClipPoly->getUNOPolyPolygon() : NULL;
if( rClipPoly.get() )
maRenderState.Clip = rClipPoly->getUNOPolyPolygon();
else
maRenderState.Clip.clear();
} }
PolyPolygonSharedPtr CanvasGraphicHelper::getClip() const PolyPolygonSharedPtr CanvasGraphicHelper::getClip() const