pywizards: sort lists again

Change-Id: I9b3f1faba3eb3ffc59294b6bfe6816a19fc05185

5 files changed, 25 insertions, 18 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index fbc0dc35c3b4..5fc58146b0d5 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -155,7 +155,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
 
         self.setControlProperty(
             "listPageDesign", "StringItemList",
-            tuple(self.agendaTemplates.keys()))
+            tuple(self.agendaTemplates[0]))
         UnoDataAware.attachListBox(
             self.agenda, "cp_AgendaType", self.listPageDesign, True).updateUI()
         UnoDataAware.attachCheckBox(
@@ -252,7 +252,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
             if AgendaWizardDialogImpl.pageDesign is not SelectedItemPos:
                 AgendaWizardDialogImpl.pageDesign = SelectedItemPos
                 self.agendaTemplate.load(
-                    self.agendaTemplates.values()[SelectedItemPos],
+                    self.agendaTemplates[1][SelectedItemPos],
                     self.topicsControl.scrollfields)
         except Exception:
             traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py
index 28374da593c1..1a578c3e5b20 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -150,7 +150,7 @@ class FileAccess(object):
     def getFolderTitles(self, xMSF, FilterName, FolderName, resDict=None):
         #Returns and ordered dict containing the template's name and path
         
-        LocLayoutFiles = {}
+        locLayoutFiles = []
         try:
             xDocInterface = xMSF.createInstance(
                 "com.sun.star.document.DocumentProperties")
@@ -162,6 +162,7 @@ class FileAccess(object):
             else:
                 FilterName += "-"
             
+            locLayoutDict = {}
             for i in nameList:
                 fileName = self.getFilename(i)
                 if FilterName is None or fileName.startswith(FilterName):
@@ -174,13 +175,20 @@ class FileAccess(object):
                             title = resDict[xDocInterface.Title]
                         else:
                             title = xDocInterface.Title
-                    LocLayoutFiles[title] = i
-
+                    locLayoutDict[title] = i
+            
+            #sort the dictionary and create a list containing the
+            #keys list and the values list
+            keysList = sorted(locLayoutDict.keys())
+            valuesList= []
+            for i in keysList:
+                valuesList.append(locLayoutDict[i])
+            locLayoutFiles.append(keysList)
+            locLayoutFiles.append(valuesList)          
         except Exception:
             traceback.print_exc()
 
-        #TODO: return it sorted
-        return LocLayoutFiles
+        return locLayoutFiles
 
     @classmethod
     def addPath(self, _sPath, _sPath2):
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 96148b737868..bd138cae820a 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -277,7 +277,6 @@ class OfficeDocument(object):
             "com.sun.star.document.TypeDetection")
         return typeDetect.getByName(type)
 
-
     def showMessageBox(
         self, xMSF, windowServiceName, windowAttribute, MessageText):
 
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index f3a1975f6257..d93100d63b14 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -280,9 +280,9 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 self.sFaxPath, self.resources.dictPrivateTemplate)
             
             self.setControlProperty("lstBusinessStyle", "StringItemList",
-                tuple(self.BusinessFiles.keys()))
+                tuple(self.BusinessFiles[0]))
             self.setControlProperty("lstPrivateStyle", "StringItemList",
-                tuple(self.PrivateFiles.keys()))
+                tuple(self.PrivateFiles[0]))
             self.setControlProperty("lstBusinessStyle", "SelectedItems", (0,))
             self.setControlProperty("lstPrivateStyle", "SelectedItems" , (0,))
             return True
@@ -433,7 +433,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         if self.lstBusinessStylePos != selectedItemPos:
             self.lstBusinessStylePos = selectedItemPos
             self.myFaxDoc.loadAsPreview(
-                self.BusinessFiles.values()[selectedItemPos], False)
+                self.BusinessFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setElements()
             self.drawConstants()
@@ -458,7 +458,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         if self.lstPrivateStylePos != selectedItemPos:
             self.lstPrivateStylePos = selectedItemPos
             self.myFaxDoc.loadAsPreview(
-                self.PrivateFiles.values()[selectedItemPos], False)
+                self.PrivateFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setElements()
 
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 0ea4d122c212..e8fe07a946d9 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -381,7 +381,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
         if self.lstBusinessStylePos != selectedItemPos:
             self.lstBusinessStylePos = selectedItemPos
             self.myLetterDoc.loadAsPreview(
-                self.BusinessFiles.values()[selectedItemPos], False)
+                self.BusinessFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.chkBusinessPaperItemChanged()
             self.setElements(False)
@@ -392,7 +392,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
         if self.lstPrivOfficialStylePos != selectedItemPos:
             self.lstPrivOfficialStylePos = selectedItemPos
             self.myLetterDoc.loadAsPreview(
-                self.OfficialFiles.values()[selectedItemPos], False)
+                self.OfficialFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setPossibleSenderData(True)
             self.setElements(False)
@@ -404,7 +404,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
             self.lstPrivateStylePos = selectedItemPos
             self.myLetterDoc.xTextDocument = \
             self.myLetterDoc.loadAsPreview(
-                self.PrivateFiles.values()[selectedItemPos], False)
+                self.PrivateFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setElements(True)
 
@@ -916,13 +916,13 @@ class LetterWizardDialogImpl(LetterWizardDialog):
                 xMSF, "pri", sLetterPath, self.resources.dictPrivateTemplate)
         self.setControlProperty(
             "lstBusinessStyle", "StringItemList",
-            tuple(self.BusinessFiles.keys()))
+            tuple(self.BusinessFiles[0]))
         self.setControlProperty(
             "lstPrivOfficialStyle", "StringItemList",
-            tuple(self.OfficialFiles.keys()))
+            tuple(self.OfficialFiles[0]))
         self.setControlProperty(
             "lstPrivateStyle", "StringItemList",
-            tuple(self.PrivateFiles.keys()))
+            tuple(self.PrivateFiles[0]))
         self.setControlProperty(
             "lstBusinessStyle", "SelectedItems", (0,))
         self.setControlProperty(