openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Neil <fric...@aol.com>
Subject Re: svn commit: r1439359 - /openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx
Date Mon, 28 Jan 2013 12:43:13 GMT
Unsubscribe


On Jan 28, 2013, at 5:13 AM, hdu@apache.org wrote:

> Author: hdu
> Date: Mon Jan 28 12:13:41 2013
> New Revision: 1439359
> 
> URL: http://svn.apache.org/viewvc?rev=1439359&view=rev
> Log:
> #i121534# fix graphite-enabled windows build
> 
> Modified:
>    openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx
> 
> Modified: openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx
> URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx?rev=1439359&r1=1439358&r2=1439359&view=diff
> ==============================================================================
> --- openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx (original)
> +++ openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx Mon Jan 28 12:13:41 2013
> @@ -2937,7 +2937,7 @@ void  GraphiteWinLayout::AdjustLayout(Im
> void GraphiteWinLayout::DrawText(SalGraphics &sal_graphics) const
> {
>     HFONT hOrigFont = DisableFontScaling();
> -    HDC aHDC = static_cast<WinSalGraphics&>(sal_graphics).mhDC;
> +    const HDC aHDC = static_cast<WinSalGraphics&>(sal_graphics).getHDC();
>     maImpl.DrawBase() = WinLayout::maDrawBase;
>     maImpl.DrawOffset() = WinLayout::maDrawOffset;
>     const int MAX_GLYPHS = 2;
> @@ -2956,7 +2956,7 @@ void GraphiteWinLayout::DrawText(SalGrap
> 		              NULL, (LPCWSTR)&(glyphWStr), nGlyphs, NULL);
>     } while (nGlyphs);
>     if( hOrigFont )
> -          DeleteFont( SelectFont( mhDC, hOrigFont ) );
> +          DeleteFont( SelectFont( aHDC, hOrigFont ) );
> }
> 
> int GraphiteWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
> @@ -3017,7 +3017,7 @@ SalLayout* WinSalGraphics::GetTextLayout
>     {
> #ifdef ENABLE_GRAPHITE
>         if (rFontFace.SupportsGraphite())
> -            pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
> +            pWinLayout = new GraphiteWinLayout( getHDC(), rFontFace, rFontInstance);
>         else
> #endif // ENABLE_GRAPHITE
>         // script complexity is determined in upper layers
> @@ -3044,7 +3044,7 @@ SalLayout* WinSalGraphics::GetTextLayout
>             eCharSet = mpLogFont->lfCharSet;
> #ifdef ENABLE_GRAPHITE
>         if (rFontFace.SupportsGraphite())
> -            pWinLayout = new GraphiteWinLayout(mhDC, rFontFace, rFontInstance);
> +            pWinLayout = new GraphiteWinLayout( getHDC(), rFontFace, rFontInstance);
>         else
> #endif // ENABLE_GRAPHITE
>             pWinLayout = new SimpleWinLayout( getHDC(), eCharSet, rFontFace, rFontInstance
);
> 
> 


Mime
View raw message