1 files changed, 2 insertions, 116 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index aa20fb04a089..a9cd5c62fe0b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -144,11 +144,8 @@ namespace connectivity
 
         sal_Int32 ProfileAccess::LoadProductsInfo()
         {
-#ifndef MINIMAL_PROFILEDISCOVER
-            //load mozilla profiles to m_ProductProfileList
-            LoadMozillaProfiles();
-#endif
-            sal_Int32 count=static_cast<sal_Int32>(m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size());
+            //load SeaMonkey 2 profiles to m_ProductProfileList
+            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Mozilla);
 
             //load thunderbird profiles to m_ProductProfileList
             count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
@@ -158,117 +155,6 @@ namespace connectivity
             count += LoadXPToolkitProfiles(MozillaProductType_Firefox);
             return count;
         }
-#ifndef MINIMAL_PROFILEDISCOVER
-        nsresult ProfileAccess::LoadMozillaProfiles()
-        {
-            sal_Int32 index=MozillaProductType_Mozilla;
-            ProductStruct &m_Product = m_ProductProfileList[index];
-            nsresult rv = NS_OK;
-
-            //step 1 : get mozilla registry file
-            nsCOMPtr<nsILocalFile>  localFile;
-            ::rtl::OUString regDir( getRegistryFileName( MozillaProductType_Mozilla ) );
-            // PRUnichar != sal_Unicode in mingw
-            nsAutoString registryDir(reinterpret_cast_mingw_only<const PRUnichar *>(regDir.getStr()));
-            rv = NS_NewLocalFile(registryDir, PR_TRUE,
-                                getter_AddRefs(localFile));
-            NS_ENSURE_SUCCESS(rv,rv);
-            PRBool bExist;
-            rv = localFile->Exists(&bExist);
-            NS_ENSURE_SUCCESS(rv,rv);
-            if (!bExist)
-                return rv;
-            nsCOMPtr<nsIRegistry> registry(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv));
-            NS_ENSURE_SUCCESS(rv,rv);
-            //step 2: open mozilla registry file
-            rv = registry->Open(localFile);
-            NS_ENSURE_SUCCESS(rv,rv);
-
-            nsCOMPtr<nsIEnumerator> enumKeys;
-            nsRegistryKey profilesTreeKey;
-
-            //step 3:Enumerator it
-            rv = registry->GetKey(nsIRegistry::Common,
-                        // PRUnichar != sal_Unicode in mingw
-                        reinterpret_cast_mingw_only<const PRUnichar *>(szProfileSubtreeString.getStr()),
-                        &profilesTreeKey);
-            if (NS_FAILED(rv)) return rv;
-
-            nsXPIDLString tmpCurrentProfile;
-
-            // Get the current profile
-            rv = registry->GetString(profilesTreeKey,
-                            // PRUnichar != sal_Unicode in mingw
-                            reinterpret_cast_mingw_only<const PRUnichar *>(szCurrentProfileString.getStr()),
-                            getter_Copies(tmpCurrentProfile));
-
-            if (tmpCurrentProfile)
-            {
-                // PRUnichar != sal_Unicode in mingw
-                m_Product.setCurrentProfile ( reinterpret_cast_mingw_only<const sal_Unicode *>(NS_STATIC_CAST(const PRUnichar*, tmpCurrentProfile)));
-            }
-
-
-            rv = registry->EnumerateSubtrees( profilesTreeKey, getter_AddRefs(enumKeys));
-            NS_ENSURE_SUCCESS(rv,rv);
-
-            rv = enumKeys->First();
-            NS_ENSURE_SUCCESS(rv,rv);
-
-            while (NS_OK != enumKeys->IsDone())
-            {
-                nsCOMPtr<nsISupports> base;
-
-                rv = enumKeys->CurrentItem( getter_AddRefs(base) );
-                NS_ENSURE_SUCCESS(rv,rv);
-                rv = enumKeys->Next();
-                NS_ENSURE_SUCCESS(rv,rv);
-
-                // Get specific interface.
-                nsCOMPtr <nsIRegistryNode> node;
-                nsIID nodeIID = NS_IREGISTRYNODE_IID;
-
-                rv = base->QueryInterface( nodeIID, getter_AddRefs(node));
-                if (NS_FAILED(rv)) continue;
-
-                // Get node name.
-                nsXPIDLString profile;
-                rv = node->GetName(getter_Copies(profile));
-                if (NS_FAILED(rv)) continue;
-
-                nsRegistryKey profKey;
-                rv = node->GetKey(&profKey);
-                if (NS_FAILED(rv)) continue;
-
-
-                nsCOMPtr<nsILocalFile> tempLocal;
-
-                nsXPIDLString regData;
-                rv = registry->GetString(profKey,
-                        // PRUnichar != sal_Unicode in mingw
-                        reinterpret_cast_mingw_only<const PRUnichar *>(szDirectoryString.getStr()),
-                        getter_Copies(regData));
-                if (NS_FAILED(rv)) continue;
-
-#if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX)
-                    rv = NS_NewNativeLocalFile(nsCString(), PR_TRUE, getter_AddRefs(tempLocal));
-                if (NS_SUCCEEDED(rv))
-                    rv = tempLocal->SetPersistentDescriptor(NS_LossyConvertUCS2toASCII(regData));
-#else
-                rv = NS_NewLocalFile(regData, PR_TRUE, getter_AddRefs(tempLocal));
-#endif
-                //Add found profile to profile lists
-                if (NS_SUCCEEDED(rv) && tempLocal)
-                {
-                    // PRUnichar != sal_Unicode in mingw
-                    ProfileStruct*  profileItem     = new ProfileStruct(MozillaProductType_Mozilla,reinterpret_cast_mingw_only<const sal_Unicode *>(NS_STATIC_CAST(const PRUnichar*, profile)),tempLocal);
-                    m_Product.mProfileList[profileItem->getProfileName()] = profileItem;
-                }
-
-            }
-            return rv;
-        }
-#endif
         //Thunderbird and firefox profiles are saved in profiles.ini
         sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product)
         {