Skip to content

C
core
Kaydet (Commit) 800f387a authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

bah, Len->!isEmpty 

Change-Id: Icc09ef129d39575e02de4eaf1e371e3de8758eb3
üst fd2b292f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vcl/win/source/gdi/salgdi3.cxx
Dosyayı görüntüle @ 800f387a
...@@ -212,9 +212,9 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const OUString& rFontFileN ...@@ -212,9 +212,9 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const OUString& rFontFileN
void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDevFontAttributes& rDFA ) 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!"); "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 ) ); aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );
bModified = TRUE; bModified = TRUE;
...@@ -1859,7 +1859,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, ...@@ -1859,7 +1859,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
pInfo->mbCourier = FALSE; pInfo->mbCourier = FALSE;
OUString aName = OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName)); OUString aName = OUString(reinterpret_cast<const sal_Unicode*>(pLogFont->elfLogFont.lfFaceName));
pInfo->mpName = &aName; 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; pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet;
EnumFontFamiliesExW( pInfo->mhDC, pInfo->mpLogFontW, (FONTENUMPROCW)SalEnumFontsProcExW, EnumFontFamiliesExW( pInfo->mhDC, pInfo->mpLogFontW, (FONTENUMPROCW)SalEnumFontsProcExW,
(LPARAM)(void*)pInfo, 0 ); (LPARAM)(void*)pInfo, 0 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment