diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 11:31:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 11:31:54 +0000 |
| commit | fa5d84f5d462a04c8c10d44d281194d0773c8825 (patch) | |
| tree | bfc67851cdee664d6b53bb7ebc2675b345bf2e92 /sax/source | |
| parent | 1778ed23a7838f706139f1da20db8cd3b62001dd (diff) | |
INTEGRATION: CWS cmcfixes35 (1.18.20); FILE MERGED
2007/07/06 11:40:39 cmc 1.18.20.1: #i79002# expand to fit values being tested for
Diffstat (limited to 'sax/source')
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 173652abcf94..0ed4ae0a0d55 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saxwriter.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2006-06-19 23:07:40 $ + * last change: $Author: hr $ $Date: 2007-08-03 12:31:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,6 @@ using namespace ::com::sun::star::io; #include "xml2utf.hxx" #define LINEFEED 10 -#define SAXWRITER_CHECK_FOR_INVALID_CHARS #define SEQUENCESIZE 1024 #define MAXCOLUMNCOUNT 72 @@ -221,25 +220,23 @@ public: inline sal_Bool comment(const rtl::OUString& rComment) throw( SAXException ); }; -const sal_Bool g_bValidCharsBelow32[31] = +const sal_Bool g_bValidCharsBelow32[32] = { // 0 1 2 3 4 5 6 7 0,0,0,0,0,0,0,0, //0 0,1,1,0,0,1,0,0, //8 0,0,0,0,0,0,0,0, //16 - 0,0,0,0,0,0,0 + 0,0,0,0,0,0,0,0 }; inline sal_Bool IsInvalidChar(const sal_Unicode aChar) { sal_Bool bRet(sal_False); -#ifdef SAXWRITER_CHECK_FOR_INVALID_CHARS - // check first for the most common characters + // check first for the most common characters if( aChar < 32 || aChar >= 0xd800 ) bRet = ( (aChar < 32 && ! g_bValidCharsBelow32[aChar]) || aChar == 0xffff || aChar == 0xfffe ); -#endif return bRet; } |