String to OUString

Change-Id: I8c51db8fce8c5eea1ac7bd5751aa7f3212ef1166
Reviewed-on: https://gerrit.libreoffice.org/5790
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 11 insertions, 13 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 4446ad0d86fd..778171927b50 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -130,7 +130,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
                                   sal_Int32 nFileFormat,
                                   sal_Bool bTemplate = sal_False ) const;
 
-    virtual sal_Bool        SetData( const String& rData );
+    virtual sal_Bool        SetData( const OUString& rData );
     virtual sal_uLong       GetMiscStatus() const;
     virtual void        OnDocumentPrinterChanged( Printer * );
     virtual sal_Bool    InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
@@ -179,7 +179,7 @@ public:
     SfxPrinter *GetPrinter()    { GetPrt(); return pPrinter; }
     void        SetPrinter( SfxPrinter * );
 
-    const String GetComment() const;
+    const OUString GetComment() const;
 
     // to replace chars that can not be saved with the document...
     sal_Bool    ReplaceBadChars();
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 394f7fb9926e..378cc3de9e85 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -90,7 +90,7 @@
 
 enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
 
-String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent );
+OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent );
 
 class SmFormat : public SfxBroadcaster
 {
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 163009904136..e5cc5a4b55bc 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -19,9 +19,7 @@
 #ifndef PARSE_HXX
 #define PARSE_HXX
 
-
 #include <vcl/svapp.hxx>
-#include <tools/string.hxx>
 
 #include <set>
 #include <stack>
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index f05c6a52e5c3..637600a08212 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -98,13 +98,13 @@ public:
 
     const ResStringArray& GetUiSymbolNamesArray() const     { return aUiSymbolNamesAry; }
     const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
-    const String          GetUiSymbolName( const String &rExportName ) const;
-    const String          GetExportSymbolName( const String &rUiName ) const;
+    const OUString        GetUiSymbolName( const OUString &rExportName ) const;
+    const OUString        GetExportSymbolName( const OUString &rUiName ) const;
 
     const ResStringArray& GetUiSymbolSetNamesArray() const     { return aUiSymbolSetNamesAry; }
     const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
-    const String          GetUiSymbolSetName( const String &rExportName ) const;
-    const String          GetExportSymbolSetName( const String &rUiName ) const;
+    const OUString        GetUiSymbolSetName( const OUString &rExportName ) const;
+    const OUString        GetExportSymbolSetName( const OUString &rUiName ) const;
 
     const ResStringArray* Get50NamesArray( LanguageType nLang );
     const ResStringArray* Get60NamesArray( LanguageType nLang );
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index e3071373651c..60e36fb24037 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -243,16 +243,16 @@ class SmViewShell: public SfxViewShell
 protected:
 
     Size GetTextLineSize(OutputDevice& rDevice,
-                         const String& rLine);
+                         const OUString& rLine);
     Size GetTextSize(OutputDevice& rDevice,
-                     const String& rText,
+                     const OUString& rText,
                      long          MaxWidth);
     void DrawTextLine(OutputDevice& rDevice,
                       const Point&  rPosition,
-                      const String& rLine);
+                      const OUString& rLine);
     void DrawText(OutputDevice& rDevice,
                   const Point&  rPosition,
-                  const String& rText,
+                  const OUString& rText,
                   sal_uInt16        MaxWidth);
 
     virtual sal_uInt16 Print(SfxProgress &rProgress, sal_Bool bIsAPI);