MWS_SRX644: migrate branch mws_srx644 -> HEAD

1 files changed, 10 insertions, 2 deletions

diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 08c6e4fc33e5..731d9bc8635a 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -30,7 +30,7 @@ Public sKeyName(SBMAXAPPLCOUNT-1) as String
 Public sValueName(SBMAXAPPLCOUNT-1) as String
 Public sCRLF as String
 Public MSFilterName(5,2) as String
-Public XMLFilterName(7,2)
+Public XMLFilterName(7,2) as String
 
 ' e.g.:
 ' XMLFilterName(x,0) = "sdw" 						' in documents we take the extensions; in SO-templates the appropriate Filtername
@@ -63,6 +63,8 @@ Public Const SBAPPLKEY = 9
 ' Applications(X,8) = "File:///..." 	(TargetUrl of the templates)
 ' Applications(X,9) = 0				    (Key to the original Index of the Applications)
 
+Public Const SBMAXEXTENSIONLENGTH = 7
+
 
 Sub FillStep_Welcome()
 Dim i as Integer
@@ -367,7 +369,6 @@ Sub	SetupMSConfiguration()
 End Sub
 
 
-
 Sub SetupXMLConfiguration()
 	iApplSection = 1000
 	Wizardmode = SBXMLMODE
@@ -381,6 +382,7 @@ Sub SetupXMLConfiguration()
 	XMLFilterName(1,0) = "sdc"
 	XMLFilterName(1,1) = "StarOffice XML (Calc)"
 	XMLFilterName(1,2) = "sxc"
+
 	XMLFilterName(2,0) = "sdd|sda"
 	XMLFilterName(2,1) = "StarOffice XML (Impress)|sdraw: StarOffice XML (Draw)"
 	XMLFilterName(2,2) = "sxi|sxd"
@@ -496,6 +498,12 @@ Sub InitializeProgressPage(oDialog as Object)
 End Sub
 
 
+Sub	SetProgressDisplay(AbsFound as Integer)
+	ImportDialog.LabelRetrieval.Label = sProgressPage_2 &  "  " & ReplaceString(sProgressPage_5, Str(AbsFound) & " ", "%1")
+	ImportDialog.LabelCurDocumentRetrieval.Label =  sProgressFound & " " & CStr(AbsDocuFound) &  " " & sProgressMoreDocs
+	ImportDialog.LabelCurTemplateRetrieval.Label = sProgressFound & " " & CStr(AbsTemplateFound) & " " & sProgressMoreTemplates
+End Sub
+
 Sub TakoverFolderName(aEvent as Object)
 Dim RefControlName as String
 Dim oRefControl