Skip to content

C
core
Kaydet (Commit) a83de85d authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

remove un-necessary type punning. 

Change-Id: I4f05929daa8b78b309d8a0498a2bb3246af9e18a
üst 3a091f8c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
vcl/source/outdev/outdevstate.cxx
Dosyayı görüntüle @ a83de85d
...@@ -641,6 +641,7 @@ void OutputDevice::InitFillColor() ...@@ -641,6 +641,7 @@ void OutputDevice::InitFillColor()
void OutputDevice::ImplReleaseFonts() void OutputDevice::ImplReleaseFonts()
{ {
mpGraphics->ReleaseFonts(); mpGraphics->ReleaseFonts();
mbNewFont = true; mbNewFont = true;
mbInitFont = true; mbInitFont = true;
......
vcl/source/outdev/text.cxx
Dosyayı görüntüle @ a83de85d
...@@ -2738,8 +2738,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, ...@@ -2738,8 +2738,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
if (pSalLayout == 0) if (pSalLayout == 0)
return false; return false;
long nWidth = pSalLayout->GetTextWidth(); long nWidth = pSalLayout->GetTextWidth();
long nHeight = ((OutputDevice*)&aVDev)->mpFontEntry->mnLineHeight + ((OutputDevice*)&aVDev)->mnEmphasisAscent long nHeight = aVDev->mpFontEntry->mnLineHeight + aVDev->mnEmphasisAscent +
+ ((OutputDevice*)&aVDev)->mnEmphasisDescent; aVDev->mnEmphasisDescent;
pSalLayout->Release(); pSalLayout->Release();
if( !nWidth || !nHeight ) if( !nWidth || !nHeight )
...@@ -2788,8 +2788,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, ...@@ -2788,8 +2788,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
// draw glyph into virtual device // draw glyph into virtual device
aVDev->Erase(); aVDev->Erase();
pSalLayout->DrawBase() += aOffset; pSalLayout->DrawBase() += aOffset;
pSalLayout->DrawBase() += Point( ((OutputDevice*)&aVDev)->mnTextOffX, ((OutputDevice*)&aVDev)->mnTextOffY ); pSalLayout->DrawBase() += Point( aVDev->mnTextOffX, aVDev->mnTextOffY );
pSalLayout->DrawText( *((OutputDevice*)&aVDev)->mpGraphics ); pSalLayout->DrawText( *aVDev->mpGraphics );
pSalLayout->Release(); pSalLayout->Release();
// convert character image into outline // convert character image into outline
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment