[Libreoffice-commits] core.git: vcl/win

Tor Lillqvist tml at collabora.com
Wed Jan 6 00:53:13 PST 2016


 vcl/win/gdi/salfont.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2b9ec36ed7cb3b77d8a5fde798544cf5a7f9ec3e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 6 10:45:08 2016 +0200

    Bin unnecessary variable
    
    Change-Id: I140785838f2665b735b288d689c873502d1d1cfb

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 1f83835..26ade82 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1817,8 +1817,6 @@ bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
     if( !ImplAddTempFont( *GetSalData(), rFontFileURL ) )
         return false;
 
-    UINT nPreferredCharSet = DEFAULT_CHARSET;
-
     // create matching FontData struct
     aDFA.SetSymbolFlag(false); // TODO: how to know it without accessing the font?
     aDFA.SetFamilyType(FAMILY_DONTKNOW);
@@ -1837,7 +1835,7 @@ bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
     */
 
     ImplWinFontData* pFontData = new ImplWinFontData( aDFA, 0,
-        sal::static_int_cast<BYTE>(nPreferredCharSet),
+        sal::static_int_cast<BYTE>(DEFAULT_CHARSET),
         sal::static_int_cast<BYTE>(TMPF_VECTOR|TMPF_TRUETYPE) );
     pFontData->SetFontId( reinterpret_cast<sal_IntPtr>(pFontData) );
     pFontCollection->Add( pFontData );


More information about the Libreoffice-commits mailing list