INTEGRATION: CWS letterwizardpp2 (1.13.6); FILE MERGED

2006/02/10 10:23:28 bc 1.13.6.1: #i61817# problem with startup under OpenOffice solved
Issue number:
Submitted by:
Reviewed by:

1 files changed, 23 insertions, 4 deletions

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index e701685fd573..1a0db7187df9 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -922,10 +922,10 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
             e.printStackTrace();
         }
 
-        Norms = new String[nameList.length];
-                NormPaths = new String[nameList.length];
+                Vector NormsVector = new Vector();
+                Vector NormsPathVector = new Vector();
+                Vector LanguageLabelsVector = new Vector();
         String [] LanguageLabels;
-        LanguageLabels = new String[Norms.length];
 
         boolean found = false;
         String cIsoCode = "";
@@ -954,13 +954,32 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
             }
 
                         if (found) {
+                            NormsVector.add(cIsoCode);
+                            NormsPathVector.add((String) nameList[i]);
+                            LanguageLabelsVector.add(lc.getLanguageString(MSID));
+                            /*
                             Norms[z] = cIsoCode;
                             NormPaths[z] = (String) nameList[i];
                             LanguageLabels[z] = lc.getLanguageString(MSID);
                             z++;
+                             **/
                         }
         }
 
+
+                Norms = new String[NormsVector.size()];
+                NormsVector.toArray(Norms);
+
+                NormPaths = new String[NormsPathVector.size()];
+                NormsPathVector.toArray(NormPaths);
+
+                LanguageLabels = new String[LanguageLabelsVector.size()];
+                LanguageLabelsVector.toArray(LanguageLabels);
+
+                //Norms = new String[nameList.length];
+                //NormPaths = new String[nameList.length];
+        //LanguageLabels = new String[Norms.length];
+
         setControlProperty("lstLetterNorm", "StringItemList", LanguageLabels);
     }
 
@@ -1156,4 +1175,4 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
         }
     }
 
-}
\ No newline at end of file
+}