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

[Thomas Arnhold]

 vcl/win/source/gdi/salprn.cxx      |   12 ++++++------
 vcl/win/source/window/salframe.cxx |    8 ++++----
 vcl/win/source/window/salmenu.cxx  |   18 ++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 4bd28f7931a533a8ad2b0787f19ce26e6818d5b4
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 4 11:32:10 2013 +0200

    XubString to OUString
    
    Change-Id: Ia7514abaa494a367d51db9d9990cd94cff6ed503
    Reviewed-on: https://gerrit.libreoffice.org/5802
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>

diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 217dca8..19122e7 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -200,7 +200,7 @@ void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
             {
                 if( pWinInfo2->pDriverName )
                     pInfo->maDriver = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pDriverName) );
-                XubString aPortName;
+                OUString aPortName;
                 if ( pWinInfo2->pPortName )
                     aPortName = OUString( reinterpret_cast< const sal_Unicode* >(pWinInfo2->pPortName) );
                 // pLocation can be 0 (the Windows docu doesn't describe this)
@@ -235,13 +235,13 @@ OUString WinSalInstance::GetDefaultPrinter()
     if( nChars )
     {
         LPWSTR  pStr = (LPWSTR)rtl_allocateMemory(nChars*sizeof(WCHAR));
-        XubString aDefPrt;
+        OUString aDefPrt;
         if( GetDefaultPrinterW( pStr, &nChars ) )
         {
-            aDefPrt = reinterpret_cast<sal_Unicode* >(pStr);
+            aDefPrt = OUString(reinterpret_cast<sal_Unicode* >(pStr));
         }
         rtl_freeMemory( pStr );
-        if( aDefPrt.Len() )
+        if( !aDefPrt.isEmpty() )
             return aDefPrt;
     }
 
@@ -1231,7 +1231,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData )
 
 OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin )
 {
-    XubString aPaperBinName;
+    OUString aPaperBinName;
 
     DWORD nBins = ImplDeviceCaps( this, DC_BINNAMES, NULL, pSetupData );
     if ( (nPaperBin < nBins) && (nBins != GDI_ERROR) )
@@ -1239,7 +1239,7 @@ OUString WinSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pSetupData, sal
         sal_Unicode* pBuffer = new sal_Unicode[nBins*24];
         DWORD nRet = ImplDeviceCaps( this, DC_BINNAMES, (BYTE*)pBuffer, pSetupData );
         if ( nRet && (nRet != GDI_ERROR) )
-            aPaperBinName = pBuffer + (nPaperBin*24);
+            aPaperBinName = OUString( pBuffer + (nPaperBin*24) );
         delete [] pBuffer;
     }
 
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index f290c29..9b4e12c 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2904,11 +2904,11 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     // is to wide for the dialogs
     if ( rSettings.GetLanguageTag().getLanguageType() == LANGUAGE_RUSSIAN )
     {
-        XubString aFontName = aAppFont.GetName();
-        XubString aFirstName = aFontName.GetToken( 0, ';' );
-        if ( aFirstName.EqualsIgnoreCaseAscii( "MS Sans Serif" ) )
+        OUString aFontName = aAppFont.GetName();
+        OUString aFirstName = aFontName.getToken( 0, ';' );
+        if ( aFirstName.equalsIgnoreAsciiCase( "MS Sans Serif" ) )
         {
-            aFontName.InsertAscii( "Arial;", 0 );
+            aFontName = "Arial;" + aFontName;
             aAppFont.SetName( aFontName );
         }
     }
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 8b8a92b..e7a3aad 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -328,14 +328,13 @@ void WinSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OU
 #endif
 
         // combine text and accelerator text
-        XubString aStr( pWItem->mText );
+        OUString aStr( pWItem->mText );
         if( pWItem->mAccelText.getLength() )
         {
-            aStr.AppendAscii("\t");
-            aStr.Append( pWItem->mAccelText );
+            aStr += "\t" + pWItem->mAccelText;
         }
-        pWItem->mInfo.dwTypeData = (LPWSTR) aStr.GetBuffer();
-        pWItem->mInfo.cch = aStr.Len();
+        pWItem->mInfo.dwTypeData = (LPWSTR) aStr.getStr();
+        pWItem->mInfo.cch = aStr.getLength();
 
         if(!::SetMenuItemInfoW( mhMenu, nPos, TRUE, &pWItem->mInfo ))
             myerr = GetLastError();
@@ -357,14 +356,13 @@ void WinSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const
             pWItem->mInfo.fType |= MFT_OWNERDRAW;
 #endif
         // combine text and accelerator text
-        XubString aStr( pWItem->mText );
+        OUString aStr( pWItem->mText );
         if( pWItem->mAccelText.getLength() )
         {
-            aStr.AppendAscii("\t");
-            aStr.Append( pWItem->mAccelText );
+            aStr += "\t" + pWItem->mAccelText;
         }
-        pWItem->mInfo.dwTypeData = (LPWSTR) aStr.GetBuffer();
-        pWItem->mInfo.cch = aStr.Len();
+        pWItem->mInfo.dwTypeData = (LPWSTR) aStr.getStr();
+        pWItem->mInfo.cch = aStr.getLength();
 
         if(!::SetMenuItemInfoW( mhMenu, nPos, TRUE, &pWItem->mInfo ))
             myerr = GetLastError();