[Libreoffice-commits] .: 3 commits - vcl/win

[David Tardon]

 vcl/win/source/gdi/salgdi3.cxx     |   21 ++++++++++-----------
 vcl/win/source/gdi/salprn.cxx      |    2 +-
 vcl/win/source/window/salframe.cxx |    4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit d1916dfdb3d9b264c97415c03e7c4eb358dd9cd5
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 21 10:16:18 2011 +0100

    the string is sal_Unicode, not sal_Char

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index b648c75..fd0ff89 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2646,7 +2646,7 @@ rtl::OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
     if( !nKeyBufLen )
         return rtl::OUString();
 
-    return rtl::OUString::createFromAscii( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) );
+    return rtl::OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) );
 }
 
 // -----------------------------------------------------------------------
commit 81b71b2ca666871780965aeac3eaa166a69d9b72
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 21 10:10:45 2011 +0100

    init members in correct order

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3512c58..d47f5c9 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1195,26 +1195,25 @@ const void * GrFontData::getTable(unsigned int name, size_t *len) const
 ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS,
     int nHeight, BYTE eWinCharSet, BYTE nPitchAndFamily )
 :   ImplFontData( rDFS, 0 ),
-    meWinCharSet( eWinCharSet ),
-    mnPitchAndFamily( nPitchAndFamily ),
-    mpFontCharSets( NULL ),
-    mpUnicodeMap( NULL ),
-    mbGsubRead( false ),
+    mnId( 0 ),
     mbDisableGlyphApi( false ),
     mbHasKoreanRange( false ),
     mbHasCJKSupport( false ),
 #ifdef ENABLE_GRAPHITE
+    mpGraphiteData(NULL),
     mbHasGraphiteSupport( false ),
 #endif
     mbHasArabicSupport ( false ),
     mbFontCapabilitiesRead( false ),
+    mpUnicodeMap( NULL ),
+    mpEncodingVector( NULL ),
+    mpFontCharSets( NULL ),
+    mnFontCharSetCount( 0 ),
+    meWinCharSet( eWinCharSet ),
+    mnPitchAndFamily( nPitchAndFamily ),
     mbAliasSymbolsLow( false ),
     mbAliasSymbolsHigh( false ),
-    mnId( 0 ),
-    mpEncodingVector( NULL )
-#ifdef ENABLE_GRAPHITE
-    ,mpGraphiteData(NULL)
-#endif
+    mbGsubRead( false )
 {
     SetBitmapSize( 0, nHeight );
 
commit 69dd81e2f26baf1e8362bee464a98b93c135e74e
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 21 10:06:27 2011 +0100

    use correct rtl::OUString function

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c587235..3512c58 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2354,7 +2354,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
     aDFA.mbDevice     = true;
 
     // Search Font Name in Cache
-    if( !rFontName.Len() && mpFontAttrCache )
+    if( rFontName.isEmpty() && mpFontAttrCache )
         aDFA = mpFontAttrCache->GetFontAttr( rFontFileURL );
 
     // Retrieve font name from font resource
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 6a4c0e0..b8f79d8 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1619,7 +1619,7 @@ sal_Bool WinSalPrinter::StartJob( const rtl::OUString* pFileName,
 
     // bring up a file choser if printing to file port but no file name given
     OUString aOutFileName;
-    if( mpInfoPrinter->maPortName.EqualsIgnoreCaseAscii( "FILE:" ) && !(pFileName && pFileName->Len()) )
+    if( mpInfoPrinter->maPortName.EqualsIgnoreCaseAscii( "FILE:" ) && !(pFileName && !pFileName->isEmpty()) )
     {
 
         uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 083746b..b648c75 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1109,7 +1109,7 @@ void WinSalFrame::SetTitle( const rtl::OUString& rTitle )
 {
     DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" );
 
-    if ( !SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.GetBuffer()) ) )
+    if ( !SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) ) )
     {
         ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle );
         SetWindowTextA( mhWnd, aAnsiTitle.GetBuffer() );