Return-Path: X-Original-To: apmail-openoffice-dev-archive@www.apache.org Delivered-To: apmail-openoffice-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D58AEA54 for ; Mon, 28 Jan 2013 13:26:21 +0000 (UTC) Received: (qmail 99177 invoked by uid 500); 28 Jan 2013 13:26:21 -0000 Delivered-To: apmail-openoffice-dev-archive@openoffice.apache.org Received: (qmail 98905 invoked by uid 500); 28 Jan 2013 13:26:21 -0000 Mailing-List: contact dev-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list dev@openoffice.apache.org Delivered-To: moderator for dev@openoffice.apache.org Received: (qmail 72170 invoked by uid 99); 28 Jan 2013 12:43:46 -0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of fricknh@aol.com designates 64.12.206.42 as permitted sender) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) Subject: Re: svn commit: r1439359 - /openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx From: Neil In-Reply-To: <20130128121341.AF71C238896F@eris.apache.org> Date: Mon, 28 Jan 2013 05:43:13 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <3749E220-85FD-4982-9666-2D1C258AC983@aol.com> References: <20130128121341.AF71C238896F@eris.apache.org> To: dev@openoffice.apache.org X-Mailer: Apple Mail (2.1499) x-aol-global-disposition: G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mx.aol.com; s=20121107; t=1359376995; bh=3Dke2V8Nt//bqyfa5Jr4hdwLfSsyVQdaleV7soie2yY=; h=From:To:Subject:Message-Id:Date:Mime-Version:Content-Type; b=ZRly87whMt7s8fIqyengZrkWO+1gSQzfTJwA+FNA5DqCce1NuOqHZfx15jqwoN1mv FR24lWEhgW/Wc0g58qQ7COi28yKauuTuRCiCBTv7jjzsHfNB6vHQGuP/24scYWPlkH 1uPuyxLdQ+hEReA6+zIQ6d48Jwrrz1EhL0t6hzOg= X-AOL-SCOLL-SCORE: 0:2:426974112:93952408 X-AOL-SCOLL-URL_COUNT: 0 x-aol-sid: 3039ac1d294351067262377d X-AOL-IP: 76.92.92.113 X-Virus-Checked: Checked by ClamAV on apache.org 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 >=20 > URL: http://svn.apache.org/viewvc?rev=3D1439359&view=3Drev > Log: > #i121534# fix graphite-enabled windows build >=20 > Modified: > openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx >=20 > Modified: openoffice/trunk/main/vcl/win/source/gdi/winlayout.cxx > URL: = http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/gdi/winl= ayout.cxx?rev=3D1439359&r1=3D1439358&r2=3D1439359&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 =3D DisableFontScaling(); > - HDC aHDC =3D static_cast(sal_graphics).mhDC; > + const HDC aHDC =3D = static_cast(sal_graphics).getHDC(); > maImpl.DrawBase() =3D WinLayout::maDrawBase; > maImpl.DrawOffset() =3D WinLayout::maDrawOffset; > const int MAX_GLYPHS =3D 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 ) ); > } >=20 > int GraphiteWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, = int nFactor ) const > @@ -3017,7 +3017,7 @@ SalLayout* WinSalGraphics::GetTextLayout > { > #ifdef ENABLE_GRAPHITE > if (rFontFace.SupportsGraphite()) > - pWinLayout =3D new GraphiteWinLayout(mhDC, rFontFace, = rFontInstance); > + pWinLayout =3D new GraphiteWinLayout( getHDC(), = rFontFace, rFontInstance); > else > #endif // ENABLE_GRAPHITE > // script complexity is determined in upper layers > @@ -3044,7 +3044,7 @@ SalLayout* WinSalGraphics::GetTextLayout > eCharSet =3D mpLogFont->lfCharSet; > #ifdef ENABLE_GRAPHITE > if (rFontFace.SupportsGraphite()) > - pWinLayout =3D new GraphiteWinLayout(mhDC, rFontFace, = rFontInstance); > + pWinLayout =3D new GraphiteWinLayout( getHDC(), = rFontFace, rFontInstance); > else > #endif // ENABLE_GRAPHITE > pWinLayout =3D new SimpleWinLayout( getHDC(), eCharSet, = rFontFace, rFontInstance ); >=20 >=20