vcl/inc/win/saldata.hxx | 1 - vcl/win/source/gdi/salgdi3.cxx | 39 --------------------------------------- 2 files changed, 40 deletions(-)
New commits: commit c1d04217e87e175017898f918cd77fe6529ec0da Author: Christina Rossmanith <chrrossman...@web.de> Date: Tue Jan 31 11:40:22 2012 +0100 Removed unused ImplSalLogFontToFontA() diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 2d6bbf1..cc3a9e4 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -239,7 +239,6 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ); void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult ); // \WIN\SOURCE\GDI\SALGDI3.CXX -void ImplSalLogFontToFontA( HDC hDC, const LOGFONTA& rLogFont, Font& rFont ); void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); bool ImplIsFontAvailable( HDC hDC, const UniString& rName ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 6b6b917..692005d 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1011,45 +1011,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF // ----------------------------------------------------------------------- -void ImplSalLogFontToFontA( HDC hDC, const LOGFONTA& rLogFont, Font& rFont ) -{ - String aFontName( ImplSalGetUniString( rLogFont.lfFaceName ) ); - if ( aFontName.Len() ) - { - rFont.SetName( aFontName ); - rFont.SetCharSet( ImplCharSetToSal( rLogFont.lfCharSet ) ); - rFont.SetFamily( ImplFamilyToSal( rLogFont.lfPitchAndFamily ) ); - rFont.SetPitch( ImplLogPitchToSal( rLogFont.lfPitchAndFamily ) ); - rFont.SetWeight( ImplWeightToSal( rLogFont.lfWeight ) ); - - long nFontHeight = rLogFont.lfHeight; - if ( nFontHeight < 0 ) - nFontHeight = -nFontHeight; - long nDPIY = GetDeviceCaps( hDC, LOGPIXELSY ); - if( !nDPIY ) - nDPIY = 600; - nFontHeight *= 72; - nFontHeight += nDPIY/2; - nFontHeight /= nDPIY; - rFont.SetSize( Size( 0, nFontHeight ) ); - rFont.SetOrientation( (short)rLogFont.lfEscapement ); - if ( rLogFont.lfItalic ) - rFont.SetItalic( ITALIC_NORMAL ); - else - rFont.SetItalic( ITALIC_NONE ); - if ( rLogFont.lfUnderline ) - rFont.SetUnderline( UNDERLINE_SINGLE ); - else - rFont.SetUnderline( UNDERLINE_NONE ); - if ( rLogFont.lfStrikeOut ) - rFont.SetStrikeout( STRIKEOUT_SINGLE ); - else - rFont.SetStrikeout( STRIKEOUT_NONE ); - } -} - -// ----------------------------------------------------------------------- - void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { XubString aFontName( reinterpret_cast<const xub_Unicode*>(rLogFont.lfFaceName) ); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits