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

Michael Stahl mstahl at redhat.com
Thu Mar 14 07:58:13 PDT 2013


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

New commits:
commit 3dd2eafcab221b4c0ceea00a14745a7a57d01580
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 14 15:41:22 2013 +0100

    vcl: fix WNT only debug code OUStrings
    
    Change-Id: Ie864629499806d798ce4a4525c385bf1617b0160

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 9ebacbf..31992b8 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,8 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const String& rFontFileNam
 
 void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const ImplDevFontAttributes& rDFA )
 {
-    DBG_ASSERT( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty(), "ImplFontNameCache::AddFontName - invalid data!" );
+    SAL_WARN_IF(!rFontFileName.Len() || rDFA.GetFamilyName().isEmpty(),
+        "vcl.gdi", "ImplFontNameCache::AddFontName - invalid data!");
     if ( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty() )
     {
         aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );


More information about the Libreoffice-commits mailing list