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

Change-Id: I8c3ffa5add610d859091ef5f9251247a3dd0b6b7

include/sfx2/sfxhtml.hxx

@@ -34,7 +34,7 @@ class SfxObjectShell;
 
 class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
 {
-    String                  aScriptType;
+    OUString                aScriptType;
 
     SfxMedium*              pMedium;
     SfxMedium *pDLMedium;   // Medium for Download Files
@@ -56,18 +56,18 @@ public:
     static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions);
     bool ParseMapOptions(ImageMap * pImageMap)
     { return ParseMapOptions(pImageMap, GetOptions()); }
-    static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+    static bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
                                  const HTMLOptions& rOptions,
                                  sal_uInt16 nEventMouseOver = 0,
                                  sal_uInt16 nEventMouseOut = 0 );
-    inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+    inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
                                  sal_uInt16 nEventMouseOver = 0,
                                  sal_uInt16 nEventMouseOut = 0);
 
     // <TD SDVAL="..." SDNUM="...">
     static double GetTableDataOptionsValNum( sal_uInt32& nNumForm,
-            LanguageType& eNumLang, const String& aValStr,
-            const String& aNumStr, SvNumberFormatter& rFormatter );
+            LanguageType& eNumLang, const OUString& aValStr,
+            const OUString& aNumStr, SvNumberFormatter& rFormatter );
 
 protected:
     // Start a file download. This is done asynchronously or synchronously.
@@ -95,10 +95,10 @@ protected:
 
     // Default (without iterator) is JavaScript
     ScriptType GetScriptType( SvKeyValueIterator* ) const;
-    const String& GetScriptTypeString( SvKeyValueIterator* ) const;
+    const OUString& GetScriptTypeString( SvKeyValueIterator* ) const;
 };
 
-inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
                                             sal_uInt16 nEventMouseOver,
                                             sal_uInt16 nEventMouseOut)
 {

sfx2/source/bastyp/sfxhtml.cxx

@@ -107,7 +107,7 @@ bool SfxHTMLParser::ParseMapOptions(
     return aName.Len() > 0;
 }
 
-bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
                                      const HTMLOptions& rOptions,
                                      sal_uInt16 nEventMouseOver,
                                      sal_uInt16 nEventMouseOut )
@@ -313,35 +313,35 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
 
 ScriptType SfxHTMLParser::GetScriptType( SvKeyValueIterator *pHTTPHeader ) const
 {
-    if( !aScriptType.Len() )
+    if( aScriptType.isEmpty() )
         ((SfxHTMLParser *)this)->GetScriptType_Impl( pHTTPHeader );
 
     return eScriptType;
 }
 
-const String& SfxHTMLParser::GetScriptTypeString(
+const OUString& SfxHTMLParser::GetScriptTypeString(
                                     SvKeyValueIterator *pHTTPHeader ) const
 {
-    if( !aScriptType.Len() )
+    if( aScriptType.isEmpty() )
         ((SfxHTMLParser *)this)->GetScriptType_Impl( pHTTPHeader );
 
     return aScriptType;
 }
 
 double SfxHTMLParser::GetTableDataOptionsValNum( sal_uInt32& nNumForm,
-        LanguageType& eNumLang, const String& aValStr, const String& aNumStr,
+        LanguageType& eNumLang, const OUString& aValStr, const OUString& aNumStr,
         SvNumberFormatter& rFormatter )
 {
-    LanguageType eParseLang = (LanguageType )aNumStr.ToInt32();
+    LanguageType eParseLang = (LanguageType )aNumStr.toInt32();
     sal_uInt32 nParseForm = rFormatter.GetFormatForLanguageIfBuiltIn( 0, eParseLang );
     double fVal;
     rFormatter.IsNumberFormat( aValStr, nParseForm, fVal );
     if ( comphelper::string::getTokenCount(aNumStr, ';') > 2 )
     {
-        eNumLang = (LanguageType)aNumStr.GetToken( 1, ';' ).ToInt32();
-        xub_StrLen nPos = aNumStr.Search( ';' );
-        nPos = aNumStr.Search( ';', nPos + 1 );
-        OUString aFormat( aNumStr.Copy( nPos + 1 ) );
+        eNumLang = (LanguageType)aNumStr.getToken( 1, ';' ).toInt32();
+        sal_Int32 nPos = aNumStr.indexOf( ';' );
+        nPos = aNumStr.indexOf( ';', nPos + 1 );
+        OUString aFormat( aNumStr.copy( nPos + 1 ) );
         sal_Int32 nCheckPos;
         short nType;
         if ( eNumLang != LANGUAGE_SYSTEM )