#92590# Routines for Gimmicks macros added

5 files changed, 14 insertions, 41 deletions

diff --git a/wizards/source/tools/Debug.xba b/wizards/source/tools/Debug.xba
index 45d0ac0ff30e..ea03e82e967a 100644
--- a/wizards/source/tools/Debug.xba
+++ b/wizards/source/tools/Debug.xba
@@ -12,6 +12,7 @@ Dim sObjectStrings(2) as String
 Dim sProperties() as String
 Dim n as Integer
 Dim m as Integer
+Dim MaxIndex as Integer
 	sObjectStrings(0) = LocObject.dbg_Properties
 	sObjectStrings(1) = LocObject.dbg_Methods
 	sObjectStrings(2) = LocObject.dbg_SupportedInterfaces
diff --git a/wizards/source/tools/Listbox.xba b/wizards/source/tools/Listbox.xba
index b61afad93b55..5116d5256389 100644
--- a/wizards/source/tools/Listbox.xba
+++ b/wizards/source/tools/Listbox.xba
@@ -20,7 +20,7 @@ Dim NullArray()
 End Sub
 
 
-Sub FormMoveSelected(aEvent as Object)
+Sub FormMoveSelected()
 	Call MoveSelectedListBox(oDialogModel.lstFields, oDialogModel.lstSelFields)
 	Call FormSetMoveRights()
 	oDialogModel.lstSelFields.Tag = True
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index cfc9684c65ed..b9e4848c2bf4 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -89,13 +89,21 @@ Dim oMasterKey
 End Function
 
 
-Function GetRegistryKeyContent(sKeyName as string)
+Function GetRegistryKeyContent(sKeyName as string, Optional bforUpdate as Boolean)
 Dim oConfigProvider as Object
 Dim aNodePath(0) as new com.sun.star.beans.PropertyValue
 	oConfigProvider = createUnoService("com.sun.star.configuration.ConfigurationProvider")
 	aNodePath(0).Name = "nodepath"
 	aNodePath(0).Value = sKeyName
-	GetRegistryKeyContent = oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", aNodePath())
+	If IsMissing(bForUpdate) Then
+		GetRegistryKeyContent() = oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", aNodePath())
+	Else
+		If bForUpdate Then
+			GetRegistryKeyContent() = oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", aNodePath())
+		Else
+			GetRegistryKeyContent() = oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", aNodePath())
+		End If
+	End If
 End Function
 
 
@@ -406,6 +414,7 @@ Sub Main
 	Next i
 End Sub
 
+
 Function GetDocumentType(oDocument)
 	If oDocument.SupportsService("com.sun.star.sheet.SpreadsheetDocument") Then
 		GetDocumentType() = "scalc"
@@ -419,7 +428,6 @@ Function GetDocumentType(oDocument)
 End Function
 
 
-
 Function GetNumberFormatType(oDocFormats, oFormatObject as Object) as Integer
 Dim ThisFormatKey as Long
 Dim oObjectFormat as Object
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index 1d6122ee6711..49db6b5b786f 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -267,5 +267,4 @@ Dim sProdName as String
 	oDialog.SetCurrentFilter(FilterNames(0,0)
 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 c1ab298bd677..9c46eb763c1c 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -285,41 +285,6 @@ Dim i%, OldReplLen%, BigLen%
 End Function
 
 
-&apos; Converts an &quot;ordinary&quot; path to a &quot;URL-Path&quot;
-&apos;Function ConverttoURL(ByVal BigString as String) as String
-&apos;Dim Separator as String
-&apos;	If sProductname = &quot;&quot; Then
-&apos;		sProductname = GetProductname()
-&apos;	End If
-&apos;	If BigString &lt;&gt; &quot;&quot; Then
-&apos;		If IsFatOffice() Then
-&apos;			Separator = GetPathSeparator()
-&apos;			&apos; Is the delivered Path already a URL
-&apos;			If Instr(1,UCase(BigString),&quot;FILE:///&quot;) = 0 Then
-&apos;				BigString = ReplaceString(BigString,&quot;/&quot;,Separator)
-&apos;				BigString = &quot;file:///&quot; &amp; BigString
-&apos;			End If
-&apos;		End If
-&apos;		ConvertToURL = BigString
-&apos;	Else
-&apos;		ConvertToUrl = &quot;&quot;
-&apos;	End If
-&apos;End Function
-
-
-&apos; Converts an &quot;URL-Path&quot; to an ordinary &quot;Path&quot;
-&apos;Function ConvertfromURL(ByVal BigString as String) as String
-&apos;Dim Separator as String
-&apos;	Separator = GetPathSeparator()
-&apos;	If Left(Ucase(BigString),8)= &quot;FILE:///&quot; Then
-&apos;		BigString = Mid(BigString, 9, Len(BigString)-8)
-&apos;		BigString = ReplaceString(BigString,Separator,&quot;/&quot;)
-&apos;		BigString = ReplaceString(BigString,&quot;:&quot;,&quot;|&quot;)
-&apos;		ConvertFromUrl = BigString
-&apos;	End If
-&apos;End Function
-
-
 &apos; Retrieves the second value for a next to &apos;SearchString&apos; in
 &apos; a two-dimensional string-Array
 Function FindSecondValue(SearchString as String, TwoDimList() as String ) as String
@@ -353,7 +318,7 @@ End Function
 Function FileNameoutofPath(ByVal Path as String, Separator as String) as String
 Dim i as Integer
 Dim SepList() as String
-	SepList() = ArrayoutofString(Path,&quot;/&quot;,i)
+	SepList() = ArrayoutofString(Path, Separator,i)
 	FileNameoutofPath = SepList(i)
 End Function