Convert Sal to rtl::O(U)String

4 files changed, 12 insertions, 12 deletions

diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 32646b81276e..60f5c2184b3d 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -101,8 +101,8 @@ rtl::OUString SvpSalSystem::GetScreenName( unsigned int nScreen )
    return aBuf.makeStringAndClear();
 }
 
-int SvpSalSystem::ShowNativeMessageBox( const String&,
-                                        const String&,
+int SvpSalSystem::ShowNativeMessageBox( const rtl::OUString&,
+                                        const rtl::OUString&,
                                         int,
                                         int )
 {
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 864dd2ccee60..56869c245c8f 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -159,7 +159,7 @@ void SvpSalFrame::PostPaint() const
     }
 }
 
-void SvpSalFrame::SetTitle( const XubString& )
+void SvpSalFrame::SetTitle( const rtl::OUString& )
 {
 }
 
@@ -368,12 +368,12 @@ void SvpSalFrame::EndExtTextInput( sal_uInt16 )
 {
 }
 
-String SvpSalFrame::GetKeyName( sal_uInt16 )
+rtl::OUString SvpSalFrame::GetKeyName( sal_uInt16 )
 {
-    return String();
+    return rtl::OUString();
 }
 
-String SvpSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 )
+rtl::OUString SvpSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 )
 {
     return String();
 }
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index bcad98e145a6..a8af082982c8 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -52,9 +52,9 @@ using ::rtl::OUStringToOString;
  *  static helpers
  */
 
-static String getPdfDir( const PrinterInfo& rInfo )
+static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
 {
-    String aDir;
+    rtl::OUString aDir;
     sal_Int32 nIndex = 0;
     while( nIndex != -1 )
     {
@@ -63,8 +63,8 @@ static String getPdfDir( const PrinterInfo& rInfo )
         {
             sal_Int32 nPos = 0;
             aDir = aToken.getToken( 1, '=', nPos );
-            if( ! aDir.Len() )
-                aDir = String( ByteString( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
+            if( aDir.isEmpty() )
+                aDir = rtl::OStringToOUString( rtl::OString( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
             break;
         }
     }
@@ -277,7 +277,7 @@ void SvpSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
 {
 }
 
-String SvpSalInstance::GetDefaultPrinter()
+rtl::OUString SvpSalInstance::GetDefaultPrinter()
 {
     PrinterInfoManager& rManager( PrinterInfoManager::get() );
     return rManager.getDefaultPrinter();
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index bfa59524d8cd..988e4760ef77 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -370,7 +370,7 @@ void SvpSalGraphics::GetDevFontSubstList( OutputDevice* )
 // ---------------------------------------------------------------------------
 
 bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
-    const String&, const String& )
+    const rtl::OUString&, const rtl::OUString& )
 {
     return false;
 }