diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:02:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:02:00 +0000 |
| commit | ea9ff5eac9547878e4ec219282ad2e974d6bfef2 (patch) | |
| tree | 6da1aa7111e7566ad94e7571419de51749a61388 /svtools | |
| parent | 7279d4ba3290cbff825637a0ce4ec247d4e7d8a0 (diff) | |
INTEGRATION: CWS sj15 (1.21.262); FILE MERGED
2005/01/21 11:10:25 sj 1.21.262.2: #118798# linestyle has to be transparent for emr_bitblt
2005/01/19 15:20:26 sj 1.21.262.1: #i37894# size of bitmap actions can be negative
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/enhwmf.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx index 4ba539a3cc1c..1215b9e69ade 100644 --- a/svtools/source/filter.vcl/wmf/enhwmf.cxx +++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: enhwmf.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2004-06-17 13:20:09 $ + * last change: $Author: vg $ $Date: 2005-02-21 16:02:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -848,8 +848,8 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta break; // todo: supporting all 256 ternary rasterops } pOut->Push(); - UINT32 nOldRop = pOut->SetRasterOp( nNewRop ); - pOut->DrawRect( Rectangle( aDestOrg, aDestExt ) ); + sal_uInt32 nOldRop = pOut->SetRasterOp( nNewRop ); + pOut->DrawRect( Rectangle( aDestOrg, aDestExt ), sal_False ); // SJ: 118798, not using edge for bitblit pOut->SetRasterOp( nOldRop ); pOut->Pop(); } @@ -868,6 +868,9 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta >> xformSrc >> nColor >> iUsageSrc >> offBmiSrc >> cbBmiSrc >> offBitsSrc >> cbBitsSrc >> cxSrc >> cySrc; + cxDest = abs( cxDest ); // sj: i37894, size can be negative + cyDest = abs( cyDest ); + Bitmap aBitmap; Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); @@ -915,6 +918,9 @@ BOOL EnhWMFReader::ReadEnhWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMeta *pWMF >> xDest >> yDest >> xSrc >> ySrc >> cxSrc >> cySrc >> offBmiSrc >> cbBmiSrc >> offBitsSrc >> cbBitsSrc >> iUsageSrc >> dwRop >> cxDest >> cyDest; + cxDest = abs( cxDest ); // sj: i37894, size can be negative + cyDest = abs( cyDest ); + Bitmap aBitmap; Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); |