diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 15:02:47 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-07 19:52:50 +0000 |
| commit | 1e22cf3d69a0384ceb02b6dad6e5daa9b30775b1 (patch) | |
| tree | f1323300098dffb45ac266297d41de166468327f /include | |
| parent | e439bda5c7cca535b10dd2cd9faad48049d2bb22 (diff) | |
rhbz#1382401: Support surrogate pairs in HTMLOutFuncs
(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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/htmlout.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
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&, |