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

[Caolán McNamara]

 vcl/win/source/gdi/salgdi3.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 800f387af08f243e7d532ad7a78df1e3d6ad80e4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 22 13:34:52 2013 +0100

    bah, Len->!isEmpty
    
    Change-Id: Icc09ef129d39575e02de4eaf1e371e3de8758eb3

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c9b7f6b..8e9dee6 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -212,9 +212,9 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const OUString& rFontFileN
 
 void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDevFontAttributes& rDFA )
 {
-    SAL_WARN_IF(!rFontFileName.Len() || rDFA.GetFamilyName().isEmpty(),
+    SAL_WARN_IF(rFontFileName.isEmpty() || rDFA.GetFamilyName().isEmpty(),
         "vcl.gdi", "ImplFontNameCache::AddFontName - invalid data!");
-    if ( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty() )
+    if ( !rFontFileName.isEmpty() && !rDFA.GetFamilyName().isEmpty() )
     {
         aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );
         bModified = TRUE;
@@ -1859,7 +1859,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
                 pInfo->mbCourier = FALSE;
             OUString aName = OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName));
             pInfo->mpName = &aName;
-            memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) );
+            memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.getLength()+1)*sizeof( wchar_t ) );
             pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;
             EnumFontFamiliesExW( pInfo->mhDC, pInfo->mpLogFontW, (FONTENUMPROCW)SalEnumFontsProcExW,
                                  (LPARAM)(void*)pInfo, 0 );