diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-10-06 21:45:43 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-10-06 21:46:06 +0200 |
| commit | 10542d925849ac573d33482c1b99af7279433dc3 (patch) | |
| tree | d3bc4485a14234c133751a3114e4fd4751bc0d01 /connectivity/source/drivers/mozab/mozillasrc | |
| parent | 442b7f6b747855b0899662166927aba82032afde (diff) | |
some cppcheck cleaning
Change-Id: I433a34f53e0e31e8bf41a080233955c2781bfd72
Diffstat (limited to 'connectivity/source/drivers/mozab/mozillasrc')
| -rw-r--r-- | connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 4b6e2733101e..e841826a6d98 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -121,9 +121,8 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) //enum all sub folders static nsresult enumSubs(nsIAbDirectory * parentDir,nsISupportsArray * array) { - nsresult rv = NS_OK ; nsCOMPtr<nsISimpleEnumerator> subDirectories; - rv = parentDir->GetChildNodes(getter_AddRefs(subDirectories)); + nsresult rv = parentDir->GetChildNodes(getter_AddRefs(subDirectories)); if (NS_FAILED(rv)) { return rv; } rv = enumSubs(subDirectories,array); @@ -206,12 +205,11 @@ static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **a if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; } *aSubs = nsnull ; - nsresult retCode = NS_OK ; nsCOMPtr<nsISupportsArray> array ; NS_NewISupportsArray(getter_AddRefs(array)) ; - retCode = insertPABDescription(); + nsresult retCode = insertPABDescription(); NS_ENSURE_SUCCESS(retCode, retCode) ; nsCOMPtr<nsIRDFService> rdfService(do_GetService(kRDFServiceCID, &retCode)) ; @@ -747,14 +745,12 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl: OSL_TRACE("Create table"); // Get the mozilla addressbooks from the base directory. - nsresult rv = NS_OK; - MNSMozabProxy xMProxy; RunArgs args; args.funcIndex = ProxiedFunc::FUNC_NEW_ADDRESS_BOOK; args.argCount = 1; args.arg1 = (void*)&aTableName; - rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); + nsresult rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); _pCon->setForceLoadTables(sal_True); //force reload table next time if (rv == NS_ERROR_FILE_IS_LOCKED) |