diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-08 11:44:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-08 13:04:44 +0100 |
| commit | 4daff1ace2931012901a994d1b4dbff3eaea6e00 (patch) | |
| tree | 9d89b83773e8105c73130025a95cc2c34ea13867 /editeng/source | |
| parent | 39ab5402171c8739cd578e073bcd29bb9bf9bdef (diff) | |
runtime ConvertToUnicode->compile time unicode
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 0b934cd22e8c..d36fbaba3860 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -219,17 +219,15 @@ void SvxRTFParser::NextToken( int nToken ) 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: - aToken = ByteString::ConvertToUnicode( (sal_Char)cCh, - RTL_TEXTENCODING_MS_1252 ); - + aToken = rtl::OUString(cCh); // no Break, aToken is set as Text case RTF_TEXTTOKEN: { |