Kaydet (Commit) 202d9af5 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:flatten in shell

Change-Id: Id58f692168274a942d2b976f10885341dfe63ac3
Reviewed-on: https://gerrit.libreoffice.org/67434
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 329d0ad2
...@@ -94,21 +94,21 @@ static void xml_start_element_handler(void* UserData, const XML_Char* name, cons ...@@ -94,21 +94,21 @@ static void xml_start_element_handler(void* UserData, const XML_Char* name, cons
xml_parser* pImpl = get_parser_instance(UserData); xml_parser* pImpl = get_parser_instance(UserData);
i_xml_parser_event_handler* pDocHdl = pImpl->get_document_handler(); i_xml_parser_event_handler* pDocHdl = pImpl->get_document_handler();
if (pDocHdl) if (!pDocHdl)
{ return;
xml_tag_attribute_container_t attributes;
int i = 0; xml_tag_attribute_container_t attributes;
while(atts[i]) int i = 0;
{
attributes[UTF8ToWString(reinterpret_cast<const char*>(get_local_name(atts[i])))] = UTF8ToWString(reinterpret_cast<const char*>(atts[i+1]));
i += 2; // skip to next pair
}
pDocHdl->start_element( while(atts[i])
UTF8ToWString(reinterpret_cast<const char*>(name)), UTF8ToWString(reinterpret_cast<const char*>(get_local_name(name))), attributes); {
attributes[UTF8ToWString(reinterpret_cast<const char*>(get_local_name(atts[i])))] = UTF8ToWString(reinterpret_cast<const char*>(atts[i+1]));
i += 2; // skip to next pair
} }
pDocHdl->start_element(
UTF8ToWString(reinterpret_cast<const char*>(name)), UTF8ToWString(reinterpret_cast<const char*>(get_local_name(name))), attributes);
} }
static void xml_end_element_handler(void* UserData, const XML_Char* name) static void xml_end_element_handler(void* UserData, const XML_Char* name)
......
...@@ -313,20 +313,20 @@ namespace /* private */ { ...@@ -313,20 +313,20 @@ namespace /* private */ {
recently_used_file& file, recently_used_file& file,
recently_used_item_list_t& item_list) recently_used_item_list_t& item_list)
{ {
if (!item_list.empty()) if (item_list.empty())
{ return;
file.truncate();
file.reset();
file.write(XML_HEADER, strlen(XML_HEADER)); file.truncate();
file.reset();
std::for_each( file.write(XML_HEADER, strlen(XML_HEADER));
item_list.begin(),
item_list.end(),
recent_item_writer(file));
file.write(XML_FOOTER, strlen(XML_FOOTER)); std::for_each(
} item_list.begin(),
item_list.end(),
recent_item_writer(file));
file.write(XML_FOOTER, strlen(XML_FOOTER));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment