strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS ooo31gsl7_DEV300

Browse source 
2009-03-25 16:03:41 +0100 hdu  r270032 : #i100522# workaround for PDF-export problem with 180-rotated text
2009-03-25 13:42:11 +0100 hdu  r270022 : #i100406# fix xrender resource leak in polygon drawing
This commit is contained in:
Ivo Hinkelmann 2009-04-02 14:21:17 +00:00
parent 06b431efe1
commit 17b430be6f
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vcl/source/gdi/pdfwriter_impl.cxx
View file

@ -6680,6 +6680,7 @@ void PDFWriterImpl::drawHorizontalGlyphs(
appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine );
// check for adjustment
double fTheoreticalGlyphWidth = rGlyphs[nPos].m_aPos.X() - rGlyphs[nPos-1].m_aPos.X();
fTheoreticalGlyphWidth = fabs( fTheoreticalGlyphWidth ); // #i100522# workaround until #i87686# gets fixed
fTheoreticalGlyphWidth = 1000.0 * fTheoreticalGlyphWidth / fXScale / double(nPixelFontHeight);
sal_Int32 nAdjustment = rGlyphs[nPos-1].m_nNativeWidth - sal_Int32(fTheoreticalGlyphWidth+0.5);
if( nAdjustment != 0 )

5
vcl/unx/source/gdi/salgdi.cxx
View file

@ -1385,6 +1385,7 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
rRenderPeer.FillRectangle( PictOpSrc, rEntry.m_aPicture, &aRenderColor, 0, 0, 1, 1 );
// notify xrender of target drawable
// TODO: cache the matching xrender picture in the X11SalGraphics
Picture aDst = rRenderPeer.CreatePicture( hDrawable_, pVisualFormat, 0, NULL );
// set clipping
@ -1396,6 +1397,10 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly
rRenderPeer.CompositeTrapezoids( PictOpOver,
rEntry.m_aPicture, aDst, pMaskFormat, 0, 0, &aTrapVector[0], aTrapVector.size() );
// release xrender-counterpart of target drawable
// TODO: use scoped xrender picture
rRenderPeer.FreePicture( aDst );
return TRUE;
}