INTEGRATION: CWS os109 (1.17.72); FILE MERGED

2007/12/17 08:56:54 os 1.17.72.1: #i73297# fallback to en-US template fixed

wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java

@@ -896,6 +896,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
         String [] allLocales = lc.getIDs();
         Object [] nameList = {"",""};
                 String [] nameList1 = {"",""};
+                String [] nameList1b = {"",""};
                 String [] nameList2 = {"",""};
                 Vector allPaths = new Vector();
         String sLetterSubPath = "/wizard/letter/";
@@ -908,6 +909,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
             for (int i=0; i<(PathParts.length -1); i++) {
                 nuString = nuString + PathParts[i] + "/";
             }
+            String sLocLetterPath;
             sMainPath = nuString;
             sMainPath = FileAccess.deleteLastSlashfromUrl(sMainPath);
 
@@ -921,7 +923,18 @@ public class LetterWizardDialogImpl extends LetterWizardDialog {
             for (int i=0;i<nameList1.length;i++) {
               String theFileName = FileAccess.getFilename(nameList1[i]);
                 if (!theFileName.equalsIgnoreCase("wizard")) {
-                                allPaths.add(nameList1[i]+ sLetterSubPath + theFileName);
+                    sLocLetterPath = FileAccess.deleteLastSlashfromUrl(nameList1[i] + sLetterSubPath);
+                    try{
+                        nameList1b = xSimpleFileAccess.getFolderContents(sLocLetterPath, true);
+                        for (int j=0;j<nameList1b.length;j++) {
+                            String theFileNameb = FileAccess.getFilename(nameList1b[j]);
+                            allPaths.add(nameList1[i]+ sLetterSubPath + theFileNameb);
+                        }
+                    }
+                    catch(Exception e)
+                    {
+                        //if the path is invalid an exception is thrown - try the fallback below then
+                    }
                 }
             }
             for (int i=0;i<nameList2.length;i++) {