|
|
|
@ -273,6 +273,23 @@ abstract class Saver
|
|
|
|
|
end.toEnd(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Test if a character is valid in xml character content. See |
|
|
|
|
* http://www.w3.org/TR/REC-xml#NT-Char
|
|
|
|
|
* Excel XSSF deals with special chars. |
|
|
|
|
* https://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java?r1=1025773&r2=1832298&pathrev=1832298&diff_format=h
|
|
|
|
|
*/ |
|
|
|
|
static boolean isBadChar ( char ch ) |
|
|
|
|
{ |
|
|
|
|
return ! ( |
|
|
|
|
Character.isHighSurrogate(ch) || |
|
|
|
|
Character.isLowSurrogate(ch) || |
|
|
|
|
(ch >= 0x20 && ch <= 0xD7FF) || |
|
|
|
|
(ch >= 0xE000 && ch <= 0xFFFD) || |
|
|
|
|
(ch == 0x9) || (ch == 0xA) || (ch == 0xD) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected boolean saveNamespacesFirst ( ) |
|
|
|
|
{ |
|
|
|
|
return _saveNamespacesFirst; |
|
|
|
@ -1548,21 +1565,6 @@ abstract class Saver
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Test if a character is valid in xml character content. See |
|
|
|
|
* http://www.w3.org/TR/REC-xml#NT-Char
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
private boolean isBadChar ( char ch ) |
|
|
|
|
{ |
|
|
|
|
return ! ( |
|
|
|
|
(ch >= 0x20 && ch <= 0xD7FF ) || |
|
|
|
|
(ch >= 0xE000 && ch <= 0xFFFD) || |
|
|
|
|
(ch >= 0x10000 && ch <= 0x10FFFF) || |
|
|
|
|
(ch == 0x9) || (ch == 0xA) || (ch == 0xD) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Test if a character is to be replaced with an escaped value |
|
|
|
|
*/ |
|
|
|
@ -2187,20 +2189,6 @@ abstract class Saver
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Test if a character is valid in xml character content. See |
|
|
|
|
* http://www.w3.org/TR/REC-xml#NT-Char
|
|
|
|
|
*/ |
|
|
|
|
private boolean isBadChar ( char ch ) |
|
|
|
|
{ |
|
|
|
|
return ! ( |
|
|
|
|
(ch >= 0x20 && ch <= 0xD7FF ) || |
|
|
|
|
(ch >= 0xE000 && ch <= 0xFFFD) || |
|
|
|
|
(ch >= 0x10000 && ch <= 0x10FFFF) || |
|
|
|
|
(ch == 0x9) || (ch == 0xA) || (ch == 0xD) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void emitLiteral ( String literal ) |
|
|
|
|
{ |
|
|
|
|
// TODO: systemId production http://www.w3.org/TR/REC-xml/#NT-SystemLiteral
|
|
|
|
|