commit a83de85dad1c296188a24ca046f483381deb0a61
author Michael Meeks <michael.meeks@collabora.com> Thu Mar 19 13:14:32 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 12:11:44 2015 +0100
tree f5c2484cae76c45342a0055a5f73562fd687c608
parent 3a091f8ca2f20d44c32ef954e23f664256686997

remove un-necessary type punning.

Change-Id: I4f05929daa8b78b309d8a0498a2bb3246af9e18a

vcl/source/outdev/outdevstate.cxx

diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index a71c7d6..bc6bd4a 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -641,6 +641,7 @@ void OutputDevice::InitFillColor()
void OutputDevice::ImplReleaseFonts()
{
    mpGraphics->ReleaseFonts();

    mbNewFont = true;
    mbInitFont = true;

vcl/source/outdev/text.cxx

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 5628302..62a92f4 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2738,8 +2738,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
    if (pSalLayout == 0)
        return false;
    long nWidth = pSalLayout->GetTextWidth();
    long nHeight = ((OutputDevice*)&aVDev)->mpFontEntry->mnLineHeight + ((OutputDevice*)&aVDev)->mnEmphasisAscent
        + ((OutputDevice*)&aVDev)->mnEmphasisDescent;
    long nHeight = aVDev->mpFontEntry->mnLineHeight + aVDev->mnEmphasisAscent +
                   aVDev->mnEmphasisDescent;
    pSalLayout->Release();

    if( !nWidth || !nHeight )
@@ -2788,8 +2788,8 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector,
            // draw glyph into virtual device
            aVDev->Erase();
            pSalLayout->DrawBase() += aOffset;
            pSalLayout->DrawBase() += Point( ((OutputDevice*)&aVDev)->mnTextOffX, ((OutputDevice*)&aVDev)->mnTextOffY );
            pSalLayout->DrawText( *((OutputDevice*)&aVDev)->mpGraphics );
            pSalLayout->DrawBase() += Point( aVDev->mnTextOffX, aVDev->mnTextOffY );
            pSalLayout->DrawText( *aVDev->mpGraphics );
            pSalLayout->Release();

            // convert character image into outline