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

Change-Id: If97096c7679c9cdd030a2aed67c2c2c17ed086c7

include/sfx2/frmhtmlw.hxx

@@ -43,18 +43,18 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
 {
     SAL_DLLPRIVATE static const sal_Char sNewLine[];
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
-                                const sal_Char *pIndent, const String& rName,
-                                const String& rContent, sal_Bool bHTTPEquiv,
+                                const sal_Char *pIndent, const OUString& rName,
+                                const OUString& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = 0 );
     SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const sal_Char *pName,
-                                const String& rContent, sal_Bool bHTTPEquiv,
+                                const OUString& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = 0 );
 
 public:
-    static void Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
+    static void Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::document::XDocumentProperties>&,
             const sal_Char *pIndent,
@@ -62,14 +62,14 @@ public:
             OUString *pNonConvertableChars = 0 );
 
     static void Out_FrameDescriptor(
-        SvStream&, const String& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
+        SvStream&, const OUString& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
         rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
         OUString *pNonConvertableChars = 0 );
 };
 
 inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                             const sal_Char *pIndent, const sal_Char *pName,
-                            const String& rContent, sal_Bool bHTTPEquiv,
+                            const OUString& rContent, sal_Bool bHTTPEquiv,
                             rtl_TextEncoding eDestEnc,
                             OUString *pNonConvertableChars )
 {

sfx2/source/bastyp/frmhtmlw.cxx

@@ -63,8 +63,8 @@ const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012";
 
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                   const sal_Char *pIndent,
-                                  const String& rName,
-                                  const String& rContent, sal_Bool bHTTPEquiv,
+                                  const OUString& rName,
+                                  const OUString& rContent, sal_Bool bHTTPEquiv,
                                      rtl_TextEncoding eDestEnc,
                                   OUString *pNonConvertableChars  )
 {
@@ -85,7 +85,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
     HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">";
 }
 
-void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
+void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         const uno::Reference<document::XDocumentProperties> & i_xDocProps,
         const sal_Char *pIndent,
         rtl_TextEncoding eDestEnc,
@@ -247,7 +247,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
 }
 
 void SfxFrameHTMLWriter::Out_FrameDescriptor(
-    SvStream& rOut, const String& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
+    SvStream& rOut, const OUString& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
     rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars )
 {
     try