convert include/svtools/htmlout.hxx from String to OUString

Change-Id: I2fcc3335945202672a5f8ab36ae6bdb395e83476

7 files changed, 9 insertions, 9 deletions

diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 9c28498cfd88..6ff8a89b83ca 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -110,7 +110,7 @@ class ScFormatFilterPlugin {
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
                  sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
     virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, bool bAll,
-                  const String& rStreamPath, String& rNonConvertibleChars ) = 0;
+                  const String& rStreamPath, OUString& rNonConvertibleChars ) = 0;
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ) = 0;
 
     virtual ScOrcusFilters* GetOrcusFilters() = 0;
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 18bc5299f6e6..091678b0010b 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -135,7 +135,7 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] =
 
 FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& rBaseURL, ScDocument* pDoc,
         const ScRange& rRange, const CharSet /*eNach*/, bool bAll,
-        const String& rStreamPath, String& rNonConvertibleChars )
+        const String& rStreamPath, OUString& rNonConvertibleChars )
 {
     ScHTMLExport aEx( rStrm, rBaseURL, pDoc, rRange, bAll, rStreamPath );
     FltError nErr = aEx.Write();
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index e89685c83aa9..9384d415cf87 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -306,7 +306,7 @@ public:
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
                  sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
     virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, bool bAll,
-                  const String& rStreamPath, String& rNonConvertibleChars );
+                  const String& rStreamPath, OUString& rNonConvertibleChars );
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest );
 
     virtual ScOrcusFilters* GetOrcusFilters();
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 585f7a21a0b5..c33651cf1ea7 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -101,7 +101,7 @@ class ScHTMLExport : public ScExportBase
     String              aCId;           // Content-Id fuer Mail-Export
     OutputDevice*       pAppWin;        // fuer Pixelei
     boost::scoped_ptr< std::map<String, String> >  pFileNameMap;        // fuer CopyLocalFileToINet
-    String              aNonConvertibleChars;   // collect nonconvertible characters
+    OUString            aNonConvertibleChars;   // collect nonconvertible characters
     rtl_TextEncoding    eDestEnc;
     SCTAB               nUsedTables;
     short               nIndent;
@@ -158,7 +158,7 @@ public:
                                         sal_Bool bAll, const String& aStreamPath );
     virtual             ~ScHTMLExport();
     sal_uLong               Write();
-    const String&       GetNonConvertibleChars() const
+    const OUString&     GetNonConvertibleChars() const
                             { return aNonConvertibleChars; }
 };
 
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fe9cdba01bf5..de153d101f25 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2381,7 +2381,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
             ScImportExport aImExport( &aDocument );
             aImExport.SetStreamPath( rMed.GetName() );
             bRet = aImExport.ExportStream( *pStream, rMed.GetBaseURL( true ), SOT_FORMATSTR_ID_HTML );
-            if ( bRet && aImExport.GetNonConvertibleChars().Len() )
+            if ( bRet && !aImExport.GetNonConvertibleChars().isEmpty() )
                 SetError( *new StringErrorInfo(
                     SCWARN_EXPORT_NONCONVERTIBLE_CHARS,
                     aImExport.GetNonConvertibleChars(),
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a2312058b573..e2c67fad0363 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2231,7 +2231,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const CharSet, sal_uInt32 ) RETURN_ERROR
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const CharSet, sal_uInt32 ) RETURN_ERROR
     virtual FltError ScExportHTML( SvStream&, const String&, ScDocument*, const ScRange&, const CharSet, bool,
-                  const String&, String& ) RETURN_ERROR
+                  const String&, OUString& ) RETURN_ERROR
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const CharSet ) RETURN_ERROR
 
     virtual ScOrcusFilters* GetOrcusFilters() { return NULL; }
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 2691b118bbf7..fef8300c3bda 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -52,7 +52,7 @@ class ScImportExport
     ScDocument* pUndoDoc;
     ScRange     aRange;
     String      aStreamPath;
-    String      aNonConvertibleChars;
+    OUString    aNonConvertibleChars;
     sal_uLong   nSizeLimit;
     sal_Unicode cSep;                   // Separator
     sal_Unicode cStr;                   // String Delimiter
@@ -147,7 +147,7 @@ public:
     bool IsOverflowCell() const { return bOverflowCell; }
     bool IsOverflow() const { return bOverflowRow || bOverflowCol || bOverflowCell; }
 
-    const String& GetNonConvertibleChars() const { return aNonConvertibleChars; }
+    const OUString& GetNonConvertibleChars() const { return aNonConvertibleChars; }
 
     bool IsApi() const { return mbApi; }
     void SetApi( bool bApi ) { mbApi = bApi; }