diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-20 11:54:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:28 +0200 |
commit | 784db67fb5920d651ec1a4369af7fd57a2da1531 (patch) | |
tree | ae03eabd20ab930aaedf2cb7d27ce7f3e7ad500b /include/svtools | |
parent | ef0960383f912f4385734ec428f94a00a50dac29 (diff) |
convert include/svtools/htmlout.hxx from String to OUString
Change-Id: I2fcc3335945202672a5f8ab36ae6bdb395e83476
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/htmlout.hxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index bc91591de49a..789ee1943617 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -28,7 +28,6 @@ class Color; class ImageMap; -class String; class SvStream; class SvxMacroTableDtor; class SvNumberFormatter; @@ -58,57 +57,57 @@ struct HTMLOutFuncs static const sal_Char sNewLine[]; // \015\012 #endif - SVT_DLLPUBLIC static OString ConvertStringToHTML( const String& sSrc, + SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, sal_Bool bOn = sal_True, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, HTMLOutContext& rContext, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); - SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const String&, const ImageMap&, const String&, + SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&, const HTMLOutEvent *pEventTable, sal_Bool bOutStarBasic, const sal_Char *pDelim = 0, const sal_Char *pIndentArea = 0, const sal_Char *pIndentMap = 0, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); SVT_DLLPUBLIC static SvStream& FlushToAscii( SvStream&, HTMLOutContext& rContext ); SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm, - const String& rBaseURL, - const String& rSource, + const OUString& rBaseURL, + const OUString& rSource, const OUString& rLanguage, ScriptType eScriptType, - const String& rSrc, + const OUString& rSrc, const OUString *pSBLibrary = 0, const OUString *pSBModule = 0, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); // der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem // nur aus 0 bestehen Eintrag terminiert ist. SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&, const HTMLOutEvent*, sal_Bool bOutStarBasic, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = 0 ); // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum( sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - String *pNonConvertableChars = 0); + OUString *pNonConvertableChars = 0); }; #endif |