diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:40:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:40:59 +0000 |
| commit | 6401534cc973ee95b0f6b91f192832dcf8e519c2 (patch) | |
| tree | 8ed3ba5641c13b36f9532cfaa44f84e32902ce6e /svtools/source/svrtf/rtfout.cxx | |
| parent | ac9deead6a1afc7dd44c95fdeb00825b04144ff7 (diff) | |
INTEGRATION: CWS frrtf02 (1.5.182); FILE MERGED
2005/03/14 14:41:26 flr 1.5.182.2: merged locally
2005/03/14 13:06:25 flr 1.5.182.1: #i43933# do not export UTF-8 chars in RTF
Diffstat (limited to 'svtools/source/svrtf/rtfout.cxx')
| -rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 5a57b4cf83ee..025222c29134 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfout.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-10-28 13:02:55 $ + * last change: $Author: rt $ $Date: 2005-03-29 12:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -174,7 +174,8 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR; bool bWriteAsUnicode = !(sBuf.convertToString(&sConverted, - eDestEnc, nFlags)); + eDestEnc, nFlags)) + || (RTL_TEXTENCODING_UTF8==eDestEnc); // #i43933# do not export UTF-8 chars in RTF; if (bWriteAsUnicode) { sBuf.convertToString(&sConverted, |