diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-14 15:46:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-14 15:46:26 +0100 |
| commit | d8daca4f4a35649a179f0f28457cae9850cacf6f (patch) | |
| tree | 2ad80afcc1432e95a9b227224ee0606ce6e0628e | |
| parent | Make sure output dir exsits for xsltproc (diff) | |
| download | core-d8daca4f4a35649a179f0f28457cae9850cacf6f.tar.gz core-d8daca4f4a35649a179f0f28457cae9850cacf6f.zip | |
Missing WNT --enable-debug String -> OUString conversion parts
Change-Id: Ica20eacd95538fe37d08bf76c7b5a6717a7e8422
| -rw-r--r-- | vcl/source/app/dbggui.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 7a2b99bcf65a..0161df6dfa08 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 cfcf9d68a247..9ebacbff0f5a 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 ) ); |