diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 21:58:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-08 13:04:50 +0100 |
| commit | a840652371e6e42778c0e72bea658a3dc11449cb (patch) | |
| tree | 658fc723c337befb440c9d34fc4159b2f59a0df5 /sw | |
| parent | ce906b8096081dee15dc8cc96e570d5b0b587955 (diff) | |
runtime ConvertToUnicode->compile time unicode constants
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/rtf/rtffld.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index f910aec6ebca..eb0b46539d29 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -1002,7 +1002,7 @@ void SwRTFParser::ReadField() int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! int bFldInst = sal_False, bFldRslt = sal_False; String sFieldStr, sFieldNm; - sal_uInt8 cCh; + sal_Unicode cCh; int nToken; while (nNumOpenBrakets && IsParserWorking()) @@ -1156,16 +1156,15 @@ void SwRTFParser::ReadField() case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; - case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; - case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; - case RTF_BULLET: cCh = 149; goto INSINGLECHAR; - case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; - case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; - case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; - case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; + case RTF_EMDASH: cCh = 0x2014; goto INSINGLECHAR; + case RTF_ENDASH: cCh = 0x2013; goto INSINGLECHAR; + case RTF_BULLET: cCh = 0x2022; goto INSINGLECHAR; + case RTF_LQUOTE: cCh = 0x2018; goto INSINGLECHAR; + case RTF_RQUOTE: cCh = 0x2019; goto INSINGLECHAR; + case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR; + case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR; INSINGLECHAR: - sFieldStr += ByteString::ConvertToUnicode( cCh, - RTL_TEXTENCODING_MS_1252 ); + sFieldStr += cCh; break; // kein Break, aToken wird als Text gesetzt |