convert sc/source/filter/inc/html*.hxx from String to OUString

Change-Id: I26a49497b8b66281e6e8d7924a05de7a71d623c5

6 files changed, 17 insertions, 17 deletions

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index f5e2713d7d1a..3e0fbaa84c82 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -208,9 +208,9 @@ static OString lcl_makeHTMLColorTriplet(const Color& rColor)
 
 //////////////////////////////////////////////////////////////////////////////
 
-ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument* pDocP,
+ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocument* pDocP,
                             const ScRange& rRangeP,
-                            sal_Bool bAllP, const String& rStreamPathP ) :
+                            sal_Bool bAllP, const OUString& rStreamPathP ) :
     ScExportBase( rStrmP, pDocP, rRangeP ),
     aBaseURL( rBaseURL ),
     aStreamPath( rStreamPathP ),
@@ -1260,7 +1260,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
         if( pFileNameMap )
         {
             // Did we already move the file?
-            std::map<String, String>::iterator it = pFileNameMap->find( rFileNm );
+            std::map<OUString, OUString>::iterator it = pFileNameMap->find( rFileNm );
             if( it != pFileNameMap->end() )
             {
                 rFileNm = it->second;
@@ -1269,7 +1269,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
         }
         else
         {
-            pFileNameMap.reset( new std::map<String, String>() );
+            pFileNameMap.reset( new std::map<OUString, OUString>() );
         }
 
         SvFileStream aTmp( aFileUrl.PathToFileName(), STREAM_READ );
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 109675d6e922..0bb62f7f8e03 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -62,7 +62,7 @@ ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, co
     return new ScHTMLImport( pDocP, rBaseURL, rRange, bCalcWidthHeight );
 }
 
-ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) :
+ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) :
     ScEEImport( pDocP, rRange )
 {
     Size aPageSize;
@@ -110,7 +110,7 @@ ScHTMLImport::~ScHTMLImport()
 }
 
 
-void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange )
+void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange )
 {
     ScComplexRefData aRefData;
     aRefData.InitRange( rRange );
@@ -204,7 +204,7 @@ String ScFormatFilterPluginImpl::GetHTMLRangeNameList( ScDocument* pDoc, const S
     return ScHTMLImport::GetHTMLRangeNameList( pDoc, rOrigName );
 }
 
-String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName )
+OUString ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName )
 {
     OSL_ENSURE( pDoc, "ScHTMLImport::GetHTMLRangeNameList - missing document" );
 
@@ -215,7 +215,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig
     sal_Int32 nStringIx = 0;
     for( xub_StrLen nToken = 0; nToken < nTokenCnt; nToken++ )
     {
-        String aToken( rOrigName.GetToken( 0, ';', nStringIx ) );
+        String aToken( rOrigName.getToken( 0, ';', nStringIx ) );
         if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) )
         {   // build list with all HTML tables
             sal_uLong nIndex = 1;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 186427ebf7bf..3a415f752186 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -215,7 +215,7 @@ ScDocument& ScHTMLParser::GetDoc()
 // ============================================================================
 
 ScHTMLLayoutParser::ScHTMLLayoutParser(
-    EditEngine* pEditP, const String& rBaseURL, const Size& aPageSizeP,
+    EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP,
     ScDocument* pDocP ) :
         ScHTMLParser( pEditP, pDocP ),
         aPageSize( aPageSizeP ),
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 9256b99fc06a..bbf86038966f 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -44,7 +44,7 @@ namespace editeng { class SvxBorderLine; }
 struct ScHTMLStyle
 {   // Defaults aus StyleSheet
     Color               aBackgroundColor;
-    String              aFontFamilyName;
+    OUString            aFontFamilyName;
     sal_uInt32              nFontHeight;        // Item-Value
     sal_uInt16              nFontSizeNumber;    // HTML value 1-7
     sal_uInt8                nDefaultScriptType; // Font values are valid for the default script type
@@ -100,7 +100,7 @@ class ScHTMLExport : public ScExportBase
     OUString            aStreamPath;
     OUString            aCId;           // Content-Id fuer Mail-Export
     OutputDevice*       pAppWin;        // fuer Pixelei
-    boost::scoped_ptr< std::map<String, String> >  pFileNameMap;        // fuer CopyLocalFileToINet
+    boost::scoped_ptr< std::map<OUString, OUString> >  pFileNameMap;        // fuer CopyLocalFileToINet
     OUString            aNonConvertibleChars;   // collect nonconvertible characters
     rtl_TextEncoding    eDestEnc;
     SCTAB               nUsedTables;
@@ -154,8 +154,8 @@ class ScHTMLExport : public ScExportBase
     const sal_Char*         GetIndentStr() { return sIndent; }
 
 public:
-                        ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&,
-                                        sal_Bool bAll, const String& aStreamPath );
+                        ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&,
+                                        sal_Bool bAll, const OUString& aStreamPath );
     virtual             ~ScHTMLExport();
     sal_uLong               Write();
     const OUString&     GetNonConvertibleChars() const
diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx
index 84bdc0af1117..151017b683ac 100644
--- a/sc/source/filter/inc/htmlimp.hxx
+++ b/sc/source/filter/inc/htmlimp.hxx
@@ -27,17 +27,17 @@ class ScHTMLParser;
 class ScHTMLImport : public ScEEImport
 {
 private:
-    static void         InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange );
+    static void         InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange );
 
 public:
-    ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight );
+    ScHTMLImport( ScDocument* pDoc, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight );
     virtual ~ScHTMLImport();
     const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; }
 
     virtual void        WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0,
                                          SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
 
-    static String       GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
+    static OUString     GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName );
 };
 
 
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 978e94fcc4ef..f26209080b0d 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -224,7 +224,7 @@ private:
     void                FontOn( ImportInfo* );
 
 public:
-                        ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* );
+                        ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* );
     virtual             ~ScHTMLLayoutParser();
     virtual sal_uLong   Read( SvStream&, const OUString& rBaseURL  );
     virtual const ScHTMLTable*  GetGlobalTable() const;