summaryrefslogtreecommitdiff
path: root/shell/source/all
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-03-26 12:48:21 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-03-26 12:48:21 +0000
commitf21d1b5f2c59dd0493432c5f7d5853c6df4626f8 (patch)
tree8f1d044aed4918d3990001a5d83b94a7d9d365b7 /shell/source/all
parent2f45532e3b5e0227f0162a2ac34b8d949fb6c3c7 (diff)
INTEGRATION: CWS mingwport03 (1.6.32); FILE MERGED
2006/11/09 00:07:19 vg 1.6.32.2: RESYNC: (1.6-1.7); FILE MERGED 2006/09/18 14:33:34 vg 1.6.32.1: #i53572# MinGW port
Diffstat (limited to 'shell/source/all')
-rw-r--r--shell/source/all/xml_parser.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index d997d51b5250..a3f1baff02b5 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xml_parser.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 01:34:34 $
+ * last change: $Author: vg $ $Date: 2007-03-26 13:48:21 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -134,12 +134,12 @@ static void xml_start_element_handler(void* UserData, const XML_Char* name, cons
while(atts[i])
{
- attributes[get_local_name(atts[i])] = atts[i+1];
+ attributes[reinterpret_cast<const char_t*>(get_local_name(atts[i]))] = reinterpret_cast<const char_t*>(atts[i+1]);
i += 2; // skip to next pair
}
pDocHdl->start_element(
- name, get_local_name(name), attributes);
+ reinterpret_cast<const char_t*>(name), reinterpret_cast<const char_t*>(get_local_name(name)), attributes);
}
}
@@ -151,7 +151,7 @@ static void xml_end_element_handler(void* UserData, const XML_Char* name)
xml_parser* pImpl = get_parser_instance(UserData);
i_xml_parser_event_handler* pDocHdl = pImpl->get_document_handler();
if (pDocHdl)
- pDocHdl->end_element(name, get_local_name(name));
+ pDocHdl->end_element(reinterpret_cast<const char_t*>(name), reinterpret_cast<const char_t*>(get_local_name(name)));
}
//###################################################
@@ -164,9 +164,9 @@ static void xml_character_data_handler(void* UserData, const XML_Char* s, int le
if (pDocHdl)
{
if (has_only_whitespaces(s,len))
- pDocHdl->ignore_whitespace(string_t(s, len));
+ pDocHdl->ignore_whitespace(string_t(reinterpret_cast<const char_t*>(s), len));
else
- pDocHdl->characters(string_t(s, len));
+ pDocHdl->characters(string_t(reinterpret_cast<const char_t*>(s), len));
}
}
@@ -178,7 +178,7 @@ static void xml_comment_handler(void* UserData, const XML_Char* Data)
xml_parser* pImpl = get_parser_instance(UserData);
i_xml_parser_event_handler* pDocHdl = pImpl->get_document_handler();
if (pDocHdl)
- pDocHdl->comment(Data);
+ pDocHdl->comment(reinterpret_cast<const char_t*>(Data));
}
} // extern "C"