[Libreoffice-commits] .: tools/source

[Cédric Bosdonnat]

 tools/source/inet/inetmime.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e9293a30a3958f55e7f965139dad52d5fe8ddd9b
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Dec 9 16:29:58 2010 +0100

    fdo#32258: Be a little more gentle with Inet params and simply skip duplicates

diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 6490abe..8a57511 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;