convert include/sfx2/progress.hxx from String to OUString

Change-Id: Iab04310ff81a5f2fab20e924146eb471aa51d115

include/sfx2/progress.hxx

@@ -26,7 +26,9 @@
 #include <tools/link.hxx>
 #include <rtl/ustring.hxx>
 
-class String;
+namespace rtl {
+    class OUString;
+};
 class SfxObjectShell;
 struct SfxProgress_Impl;
 struct PlugInLoadStatus;
@@ -42,13 +44,13 @@ class SFX2_DLLPUBLIC SfxProgress
 
 public:
                             SfxProgress( SfxObjectShell* pObjSh,
-                                         const String& rText,
+                                         const rtl::OUString& rText,
                                          sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False,
                                          sal_Bool bWait = sal_True );
     virtual                 ~SfxProgress();
 
     virtual void            SetText( const OUString& rText );
-    sal_Bool                    SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 );
+    sal_Bool                    SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
     virtual sal_Bool            SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
     sal_uIntPtr                 GetState() const { return nVal; }
 

include/sfx2/request.hxx

@@ -35,7 +35,6 @@ class SfxItemSet;
 class SfxItemPool;
 class SfxShell;
 class SfxSlot;
-class String;
 class SfxViewFrame;
 struct SfxRequest_Impl;
 

sfx2/source/bastyp/progress.cxx

@@ -116,13 +116,13 @@ SfxProgress::SfxProgress
                                     When it is then the application will be
                                     used */
 
-    const String&       rText,  /* Text, which appears before the Statusmonitor
+    const OUString&     rText,  /* Text, which appears before the Statusmonitor
                                   in the status line */
 
-    sal_uIntPtr               nRange, /* Max value for range  */
+    sal_uIntPtr         nRange, /* Max value for range  */
 
-    sal_Bool                bAll,    /* Disable all documents or only the document of the ViewFram */
-    sal_Bool                bWait    /* Activate the wait-Pointer initially (TRUE) */
+    sal_Bool            bAll,    /* Disable all documents or only the document of the ViewFram */
+    sal_Bool            bWait    /* Activate the wait-Pointer initially (TRUE) */
 )
 
 /*  [Description]
@@ -249,9 +249,9 @@ long TimeOut_Impl( void*, void* pArgV )
 
 sal_Bool SfxProgress::SetStateText
 (
-    sal_uLong      nNewVal,     /* New value for the progress-bar */
-    const String&  rNewVal,     /* Status as Text */
-    sal_uLong      nNewRange    /* new maximum value, 0 for retaining the old */
+    sal_uLong       nNewVal,     /* New value for the progress-bar */
+    const OUString& rNewVal,     /* Status as Text */
+    sal_uLong       nNewRange    /* new maximum value, 0 for retaining the old */
 )
 
 {