sax/source/fastparser/fastparser.cxx | 82 +++++++++++++++++------------------
1 file changed, 41 insertions(+), 41 deletions(-)
New commits:
commit 838a6011c19870ea36695aab4b4497dcbd1880f5
Author: Michael Meeks <michael.me...@collabora.com>
Date: Fri Dec 20 16:45:15 2013 +0000
fastparser: move lclGetErrorMessage into the anonymous namespace.
Change-Id: I70e1597f917c2a8dedb5b38807dfde7ec05a1a39
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 9171652..f2f90c4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -528,6 +528,47 @@ Event& Entity::getEvent( CallbackType aType )
return rEvent;
}
+OUString lclGetErrorMessage( XML_Error xmlE, const OUString& sSystemId,
sal_Int32 nLine )
+{
+ const sal_Char* pMessage = "";
+ switch( xmlE )
+ {
+ case XML_ERROR_NONE: pMessage = "No";
break;
+ case XML_ERROR_NO_MEMORY: pMessage = "no
memory"; break;
+ case XML_ERROR_SYNTAX: pMessage = "syntax";
break;
+ case XML_ERROR_NO_ELEMENTS: pMessage = "no
elements"; break;
+ case XML_ERROR_INVALID_TOKEN: pMessage = "invalid
token"; break;
+ case XML_ERROR_UNCLOSED_TOKEN: pMessage = "unclosed
token"; break;
+ case XML_ERROR_PARTIAL_CHAR: pMessage = "partial
char"; break;
+ case XML_ERROR_TAG_MISMATCH: pMessage = "tag
mismatch"; break;
+ case XML_ERROR_DUPLICATE_ATTRIBUTE: pMessage = "duplicate
attribute"; break;
+ case XML_ERROR_JUNK_AFTER_DOC_ELEMENT: pMessage = "junk after
doc element"; break;
+ case XML_ERROR_PARAM_ENTITY_REF: pMessage = "parameter
entity reference"; break;
+ case XML_ERROR_UNDEFINED_ENTITY: pMessage = "undefined
entity"; break;
+ case XML_ERROR_RECURSIVE_ENTITY_REF: pMessage = "recursive
entity reference"; break;
+ case XML_ERROR_ASYNC_ENTITY: pMessage = "async
entity"; break;
+ case XML_ERROR_BAD_CHAR_REF: pMessage = "bad char
reference"; break;
+ case XML_ERROR_BINARY_ENTITY_REF: pMessage = "binary
entity reference"; break;
+ case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF: pMessage = "attribute
external entity reference"; break;
+ case XML_ERROR_MISPLACED_XML_PI: pMessage = "misplaced
xml processing instruction"; break;
+ case XML_ERROR_UNKNOWN_ENCODING: pMessage = "unknown
encoding"; break;
+ case XML_ERROR_INCORRECT_ENCODING: pMessage = "incorrect
encoding"; break;
+ case XML_ERROR_UNCLOSED_CDATA_SECTION: pMessage = "unclosed
cdata section"; break;
+ case XML_ERROR_EXTERNAL_ENTITY_HANDLING: pMessage = "external
entity reference"; break;
+ case XML_ERROR_NOT_STANDALONE: pMessage = "not
standalone"; break;
+ default:;
+ }
+
+ OUStringBuffer aBuffer( '[' );
+ aBuffer.append( sSystemId );
+ aBuffer.append( " line " );
+ aBuffer.append( nLine );
+ aBuffer.append( "]: " );
+ aBuffer.appendAscii( pMessage );
+ aBuffer.append( " error" );
+ return aBuffer.makeStringAndClear();
+}
+
// throw an exception, but avoid callback if
// during a threaded produce
void Entity::throwException( const ::rtl::Reference< FastLocatorImpl >
&xDocumentLocator,
@@ -902,47 +943,6 @@ void FastSaxParserImpl::setLocale( const Locale & Locale )
throw (RuntimeExcepti
maData.maLocale = Locale;
}
-static OUString lclGetErrorMessage( XML_Error xmlE, const OUString& sSystemId,
sal_Int32 nLine )
-{
- const sal_Char* pMessage = "";
- switch( xmlE )
- {
- case XML_ERROR_NONE: pMessage = "No";
break;
- case XML_ERROR_NO_MEMORY: pMessage = "no
memory"; break;
- case XML_ERROR_SYNTAX: pMessage = "syntax";
break;
- case XML_ERROR_NO_ELEMENTS: pMessage = "no
elements"; break;
- case XML_ERROR_INVALID_TOKEN: pMessage = "invalid
token"; break;
- case XML_ERROR_UNCLOSED_TOKEN: pMessage = "unclosed
token"; break;
- case XML_ERROR_PARTIAL_CHAR: pMessage = "partial
char"; break;
- case XML_ERROR_TAG_MISMATCH: pMessage = "tag
mismatch"; break;
- case XML_ERROR_DUPLICATE_ATTRIBUTE: pMessage = "duplicate
attribute"; break;
- case XML_ERROR_JUNK_AFTER_DOC_ELEMENT: pMessage = "junk after
doc element"; break;
- case XML_ERROR_PARAM_ENTITY_REF: pMessage = "parameter
entity reference"; break;
- case XML_ERROR_UNDEFINED_ENTITY: pMessage = "undefined
entity"; break;
- case XML_ERROR_RECURSIVE_ENTITY_REF: pMessage = "recursive
entity reference"; break;
- case XML_ERROR_ASYNC_ENTITY: pMessage = "async
entity"; break;
- case XML_ERROR_BAD_CHAR_REF: pMessage = "bad char
reference"; break;
- case XML_ERROR_BINARY_ENTITY_REF: pMessage = "binary
entity reference"; break;
- case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF: pMessage = "attribute
external entity reference"; break;
- case XML_ERROR_MISPLACED_XML_PI: pMessage = "misplaced
xml processing instruction"; break;
- case XML_ERROR_UNKNOWN_ENCODING: pMessage = "unknown
encoding"; break;
- case XML_ERROR_INCORRECT_ENCODING: pMessage = "incorrect
encoding"; break;
- case XML_ERROR_UNCLOSED_CDATA_SECTION: pMessage = "unclosed
cdata section"; break;
- case XML_ERROR_EXTERNAL_ENTITY_HANDLING: pMessage = "external
entity reference"; break;
- case XML_ERROR_NOT_STANDALONE: pMessage = "not
standalone"; break;
- default:;
- }
-
- OUStringBuffer aBuffer( '[' );
- aBuffer.append( sSystemId );
- aBuffer.append( " line " );
- aBuffer.append( nLine );
- aBuffer.append( "]: " );
- aBuffer.appendAscii( pMessage );
- aBuffer.append( " error" );
- return aBuffer.makeStringAndClear();
-}
-
void FastSaxParserImpl::deleteUsedEvents()
{
Entity& rEntity = getEntity();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
