diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-15 20:41:18 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-15 22:28:42 -0500 |
commit | ec243f43411290bb7f56176e29cb92929dab2953 (patch) | |
tree | 78d1e3d4b0e86b1246f035ca60f94b29e5254f84 /svtools/source/svhtml | |
parent | 578969c51cb7b012fb522d4296c8069a611de29d (diff) |
Revert "tools: replace boost::ptr_vector with std::unordered_map"
This reverts commit 218be53fe00aebed43df0b041de609b30f99ce95.
MacOSX breaker
Diffstat (limited to 'svtools/source/svhtml')
-rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 2627bc1ac9b9..0158436859c8 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -2092,10 +2092,9 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const OUString& rMime ) INetContentTypeParameterList aParameters; if (INetContentTypes::parse(rMime, sType, sSubType, &aParameters)) { - auto const iter = aParameters.find("charset"); - if (iter != aParameters.end()) + const INetContentTypeParameter * pCharset = aParameters.find("charset"); + if (pCharset != 0) { - const INetContentTypeParameter * pCharset = &iter->second; OString sValue(OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); return GetExtendedCompatibilityTextEncoding( rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); } |