From 1e22cf3d69a0384ceb02b6dad6e5daa9b30775b1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 7 Oct 2016 15:02:47 +0200 Subject: rhbz#1382401: Support surrogate pairs in HTMLOutFuncs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 375b99cad4a79d26a6cbcd0f71bc12b312d95818) Conflicts: svtools/source/svhtml/htmlout.cxx plus cherry-pick of 6131bf9c96fb2ae37decf13e453f27304707271b "Minor performance improvement of previous patch" Change-Id: Ib578f758e4f5f355a79a014c2ad4660924dd34a4 Reviewed-on: https://gerrit.libreoffice.org/29592 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/svtools/htmlout.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 715f0ba7534b..e8a5d50ad526 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -60,7 +60,7 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, bool bOn = true, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); - SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, + SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_uInt32 cChar, HTMLOutContext& rContext, OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, -- cgit