summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 16:47:26 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 16:47:26 +0000
commitf27e437e90de7e28d7c455537e6189fae1e52d86 (patch)
tree925f6fa050b170557c6cd20b5a5686ceb4652c8f /shell
parentbd17c3b0283315a9181fb78d9373839f289d1884 (diff)
INTEGRATION: CWS os2port03 (1.8.64); FILE MERGED
2008/07/17 05:25:35 obr 1.8.64.2: RESYNC: (1.8-1.9); FILE MERGED 2008/04/15 14:32:18 ydario 1.8.64.1: Issue number: i85203 Submitted by: ydario Reviewed by: ydario
Diffstat (limited to 'shell')
-rw-r--r--shell/source/all/xml_parser.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index f3ef64832250..1c898afde0a2 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xml_parser.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
* This file is part of OpenOffice.org.
*
@@ -205,8 +205,8 @@ void xml_parser::parse(const char* XmlData, size_t Length, bool IsFinal)
{
if (0 == XML_Parse(xml_parser_, XmlData, Length, IsFinal))
throw xml_parser_exception(
- XML_ErrorString(XML_GetErrorCode(xml_parser_)),
- XML_GetErrorCode(xml_parser_),
+ (char*)XML_ErrorString(XML_GetErrorCode(xml_parser_)),
+ (int)XML_GetErrorCode(xml_parser_),
XML_GetCurrentLineNumber(xml_parser_),
XML_GetCurrentColumnNumber(xml_parser_),
XML_GetCurrentByteIndex(xml_parser_));