diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 13:40:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 13:40:51 +0000 |
| commit | d76126f681c0b6ba424e751efe0cb6ae21849328 (patch) | |
| tree | 8d0c6b0dc3f7b8ff9593f0b6ff020b4926896e68 /svtools | |
| parent | aa5a6da991063e381d0d13cdc3c1118f0b0b81fe (diff) | |
INTEGRATION: CWS impress82 (1.28.134); FILE MERGED
2006/01/12 09:50:12 sj 1.28.134.1: #i57205# fixed ExtSetClipRnd action, taking care of correct fill color (use of bkcolor if no fillstyle has been set), fixed font scaling if the fontheicht is described as cell height
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/winmtf.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index 7f90cfac4031..ac4b16c07ef0 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -4,9 +4,9 @@ * * $RCSfile: winmtf.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:46:37 $ + * last change: $Author: hr $ $Date: 2006-01-24 14:40:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -486,10 +486,12 @@ struct SaveStruct RasterOp eRasterOp; Point aActPos; - sal_Bool bRecordPath; WinMtfPathObj aPathObj; WinMtfClipPath aClipPath; XForm aXForm; + + sal_Bool bRecordPath; + sal_Bool bFillStyleSelected; }; DECLARE_STACK( SaveStack, SaveStruct* ); @@ -585,6 +587,7 @@ class WinMtfOutput sal_uInt32 mnRop; sal_Bool mbNopMode; + sal_Bool mbFillStyleSelected; SaveStack maSaveStack; // Stapel fuer aktuelle Zustaende bzw. DCs (Drawing-Contexts) @@ -686,7 +689,7 @@ class WinMtfOutput void IntersectClipRect( const Rectangle& rRect ); void ExcludeClipRect( const Rectangle& rRect ); void MoveClipRegion( const Size& rSize ); - void SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode ); + void SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped ); void UpdateClipRegion(); WinMtfOutput( GDIMetaFile& rGDIMetaFile ); |