summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-12-09 16:29:58 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-12-09 16:31:14 +0100
commite9293a30a3958f55e7f965139dad52d5fe8ddd9b (patch)
tree9ab268dc50d52b5ba3e305158b97c1060f16d125
parentb2aec1683e83bd295941da409a7aae2343cf8c15 (diff)
fdo#32258: Be a little more gentle with Inet params and simply skip duplicates
-rw-r--r--tools/source/inet/inetmime.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 6490abef10..8a575114a6 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1145,8 +1145,6 @@ sal_Char const * INetMIME::scanParameters(sal_Char const * pBegin,
bool bPresent;
Parameter ** pPos = aList.find(aAttribute, nSection, bPresent);
- if (bPresent)
- break;
bool bExtended = false;
if (p != pEnd && *p == '*')
@@ -1303,7 +1301,8 @@ sal_Char const * INetMIME::scanParameters(sal_Char const * pBegin,
pTokenBegin, static_cast< xub_StrLen >(p - pTokenBegin));
}
- *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage, aValue,
+ if (!bPresent)
+ *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage, aValue,
nSection, bExtended);
}
return parseParameters(aList, pParameters) ? pParameterBegin : pBegin;