diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-04-24 12:47:16 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-02 11:54:51 +0100 |
commit | 0fcd27f28aea1c850c8d8f11485b6a5d9bb974ea (patch) | |
tree | ebe745c3fd3eb2fd0a937e09f532a95ac6370bb2 | |
parent | a617eecdb6b2f8d6bb1b20674f8be8ce4d60f2d1 (diff) |
fdo#38176 fix RTF export of non-breaking space/hyphen/optional hyphen
(cherry-picked from commits ef7cc64 and dfc7c67)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 195cb8eb422e..0904ac810265 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -914,7 +914,15 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEn } if (pStr) { aBuf.append(pStr); - aBuf.append(' '); + switch (c) + { + case 0xa0: + case 0x1e: + case 0x1f: + break; + default: + aBuf.append(' '); + } } return aBuf.makeStringAndClear(); } |