MWS_SRX644: migrate branch mws_srx644 -> HEAD

4 files changed, 28 insertions, 3 deletions

diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 30881aba9c18..a1c6f5f0a88a 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -113,7 +113,7 @@ Dim sProdName as String
 	oProdNameAccess = GetRegistryKeyContent("org.openoffice.Setup/Product")
 	sProdName = oProdNameAccess.getByName("ooName")
 	sVersion = oProdNameAccess.getByName("ooSetupVersion")
-	GetProductName = sProdName & " " & sVersion
+	GetProductName = sProdName & sVersion
 End Function
 
 
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index 9fb2dc140258..23c3ed256941 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -339,8 +339,9 @@ Dim OverwriteModel as Object
 		OverwriteModel.lblQueryforSave.Label = QueryString
 		OverwriteModel.cmdNo.DefaultButton = True
 		DlgOverwrite.GetControl("cmdNo").SetFocus()
+		iGeneralOverwrite = 999
 		LocRetValue = DlgOverwrite.execute()
-		If LocRetValue = 0 Then
+		If iGeneralOverwrite = 999 Then
 			iGeneralOverwrite = SBOVERWRITECANCEL
 		End If
 		DlgOverwrite.dispose()
@@ -365,4 +366,4 @@ End Sub
 Sub SetOVERWRITEToNever()
 	iGeneralOverwrite = SBOVERWRITENEVER
 	DlgOverwrite.EndExecute()
-End Sub</script:module>
+End Sub</script:module>
\ No newline at end of file
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index 7a5e8872cac8..6dce4d6695f5 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -261,6 +261,24 @@ Dim CurFieldValue
 End Function
 
 
+&apos; Searches for a Value in multidimensial Array by querying all Searchindices of the passed dimension 
+&apos; and delivers the Index where the Searchvalue is found as a part string
+Function GetIndexForPartStringinMultiArray(SearchList(), SearchValue, SearchIndex as Integer) as Integer
+Dim i as integer
+Dim MaxIndex as Integer
+Dim CurFieldValue
+	MaxIndex = Ubound(SearchList(),1)
+	For i = Lbound(SearchList()) to MaxIndex
+		CurFieldValue = SearchList(i,SearchIndex)
+		If Instr(CurFieldValue, SearchValue) &gt; 0 Then
+			GetIndexForPartStringinMultiArray() = i
+			Exit Function
+		End if
+	Next
+	GetIndexForPartStringinMultiArray = -1
+End Function
+
+
 Function ArrayfromMultiArray(MultiArray as String, iDim as Integer)
 Dim MaxIndex as Integer	
 Dim i as Integer
diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba
index b6018339e799..69010dbdea7d 100644
--- a/wizards/source/tools/UCB.xba
+++ b/wizards/source/tools/UCB.xba
@@ -8,6 +8,7 @@ Dim CurDirMaxCount as Integer
 Dim sDirArray(SBMAXDIRCOUNT-1) as String
 Dim DirIndex As Integer
 Dim iDirCount as Integer
+Dim bInterruptSearch as Boolean
 
 Sub Main()
 Dim LocsfileContent(0) as String
@@ -15,6 +16,7 @@ Dim LocsfileContent(0) as String
 	ReadDirectories(&quot;file:///space&quot;, LocsfileContent(), True, False, false)
 End Sub
 
+&apos;        ReadDirectories(      sSourceDir,          bRecursive,          bCheckRealType, False, sFileContent(), sLocExtension)
 
 Function ReadDirectories(ByVal AnchorDir As String, bRecursive as Boolean,  bcheckFileType as Boolean, bGetByTitle as Boolean, Optional sFileContent(), Optional sExtension as String)
 Dim i as integer
@@ -47,6 +49,10 @@ Dim sFileArray(StartUbound,1) as String
 			If Ubound(DirContent()) &lt;&gt; -1 Then
 				FileCountinDir = Ubound(DirContent())+ 1
 				For i = 0 to FilecountinDir -1
+					If bInterruptSearch = True Then
+						Exit Do
+					End If
+					
 					Filename = DirContent(i)
 					If oUcbObject.IsFolder(FileName) Then
 						If brecursive Then