diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-12-27 00:46:49 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2016-02-13 08:05:09 +0000 |
| commit | 4647e778993250b8c9431e2890750916fb986ecc (patch) | |
| tree | 99d285ec6a33aeca2d9df32d30d2aea801066a37 /include/svtools | |
| parent | 3596613153289dae204b5abdc7446b303021f597 (diff) | |
tdf#81129 Support reading non-BMP characters in HTML documents.
1. Allow character entity ( &#nnnn; ) to exceed 0xffff in HTMLParser::ScanText()
2. Return a character as sal_uInt32 ( utf32 ) instead of sal_Unicode ( utf16 )
from SvParser::GetNextChar().
Conflicts:
sw/qa/extras/htmlexport/htmlexport.cxx
Change-Id: Ida455040970fae800f0f11471b27f53461fb78e4
Reviewed-on: https://gerrit.libreoffice.org/21152
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/svparser.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 3f60a4019613..cfbd1152a625 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -59,7 +59,7 @@ protected: rtl_TextEncoding eSrcEnc; // Source encoding sal_uLong nNextChPos; - sal_Unicode nNextCh; // current character for the "lex" + sal_uInt32 nNextCh; // current character codepoint in UTF32 for the "lex" bool bDownloadingFile : 1; // true: An external file is @@ -128,7 +128,7 @@ public: inline void SetLineNr( sal_uLong nlNum ); // inline bottom inline void SetLinePos( sal_uLong nlPos ); // inline bottom - sal_Unicode GetNextChar(); + sal_uInt32 GetNextChar(); // Return next Unicode codepoint in UTF32. void RereadLookahead(); inline bool IsParserWorking() const { return SVPAR_WORKING == eState; } |