Merge branch 'msoutlookaddrbook'

src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java

@@ -827,16 +827,17 @@ private boolean onMailUser(String id)
         }
         catch(MsOutlookMAPIHResultException ex)
         {
-            if(ex.getHResult() == 0x80070057 // E_INVALIDARG
+            if(ex.getHresultString().equals("MAPI_E_0x57")
                     && firstIMAPIPropGetPropFailureLogged == false)
             {
                 firstIMAPIPropGetPropFailureLogged = true;
                 throw ex;
             }
-            else if(ex.getHResult() != 0x80070057) // NOT E_INVALIDARG
+            else if(!ex.getHresultString().equals("MAPI_E_0x57"))
             {
                 throw ex;
             }
+            return true;
         }
 
         long objType = 0;

src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookMAPIHResultException.java

@@ -99,4 +99,14 @@ private static String toString(long hResult)
             return s.toString();
         }
     }
+
+    /**
+     * Returns the string representation for the current hResult code.
+     *
+     * @return The string representation for the current hResult code.
+     */
+    public String getHresultString()
+    {
+        return MsOutlookMAPIHResultException.toString(this.getHResult());
+    }
 }