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

[Stephan Bergmann]

 vcl/source/app/dbggui.cxx      |    2 +-
 vcl/win/source/gdi/salgdi3.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8daca4f4a35649a179f0f28457cae9850cacf6f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 14 15:46:26 2013 +0100

    Missing WNT --enable-debug String -> OUString conversion parts
    
    Change-Id: Ica20eacd95538fe37d08bf76c7b5a6717a7e8422

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 7a2b99b..0161df6 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1608,7 +1608,7 @@ long SolarMessageBoxExecutor::doIt()
 #ifdef WNT
     sal_Bool bOldCallTimer = pSVData->mbNoCallTimer;
     pSVData->mbNoCallTimer = sal_True;
-    nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.GetBuffer(), L"Debug Output",
+    nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.getStr(), L"Debug Output",
                                      MB_TASKMODAL | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_ICONSTOP );
     pSVData->mbNoCallTimer = bOldCallTimer;
     switch ( nResult )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index cfcf9d6..9ebacbf 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const String& rFontFileNam
 
 void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const ImplDevFontAttributes& rDFA )
 {
-    DBG_ASSERT( rFontFileName.Len() && rDFA.GetFamilyName().Len(), "ImplFontNameCache::AddFontName - invalid data!" );
+    DBG_ASSERT( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty(), "ImplFontNameCache::AddFontName - invalid data!" );
     if ( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty() )
     {
         aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );