From 737f61ba4c202834e70bbaa746b4a9ce0137a891 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 21 Nov 2011 09:00:21 +0100
Subject: Convert Sal to rtl::O(U)String

---
 vcl/inc/salinst.hxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'vcl/inc/salinst.hxx')

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 67affdbec700..a676eb07625e 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -38,13 +38,15 @@
 #include "vcl/displayconnectiondispatch.hxx"
 #include "vcl/dllapi.h"
 
-#include "tools/string.hxx"
-
 #include "rtl/ref.hxx"
-#include "rtl/string.hxx"
 
 #include <list>
 
+namespace rtl
+{
+    class OUString;
+}
+
 struct SystemParentData;
 struct SalPrinterQueueInfo;
 struct SalStatus;
@@ -113,7 +115,7 @@ public:
     virtual void                GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0;
     virtual void                GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0;
     virtual void                DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0;
-    virtual String              GetDefaultPrinter() = 0;
+    virtual rtl::OUString              GetDefaultPrinter() = 0;
 
     // SalTimer
     virtual SalTimer*           CreateSalTimer() = 0;
@@ -195,7 +197,7 @@ void DestroySalInstance( SalInstance* pInst );
 // - SalInstance-Functions -
 // -------------------------
 
-void SalAbort( const XubString& rErrorText, bool bDumpCore );
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore );
 
 VCL_PLUGIN_PUBLIC const ::rtl::OUString& SalGetDesktopEnvironment();
 
-- 
cgit v1.2.3