INTEGRATION: CWS dr32 (1.1.8); FILE MERGED

2005/01/21 10:26:11 jmarmion 1.1.8.1: #i28561# xmerge changes for LaTex support.
Issue number:
Submitted by:
Reviewed by:

1 files changed, 12 insertions, 2 deletions

diff --git a/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 8b0a2c9e4d00..708053167a45 100644
--- a/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -52,7 +52,6 @@
  *
  *
  ************************************************************************/
-
 package org.openoffice.xmerge.util.registry;
 
 import java.util.*;
@@ -189,7 +188,8 @@ public final class ConverterInfoMgr {
         ConverterInfo converterInfo;
         boolean       rc = false;
 
-        Enumeration ciEnum = converterInfoList.elements();
+        // FIX (HJ): Has to use an iterator, since we are removing items
+        /*Enumeration ciEnum = converterInfoList.elements();
         while (ciEnum.hasMoreElements())
         {
             converterInfo = (ConverterInfo)ciEnum.nextElement();
@@ -197,6 +197,16 @@ public final class ConverterInfoMgr {
                converterInfoList.remove(converterInfo);
                rc = true;
             }
+        }*/
+
+        Iterator ciIter = converterInfoList.iterator();
+        while (ciIter.hasNext())
+        {
+            converterInfo = (ConverterInfo)ciIter.next();
+            if (jar.equals(converterInfo.getJarName())) {
+               ciIter.remove();
+               rc = true;
+            }
         }
         return rc;
     }