summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorTom Verbeek <tv@openoffice.org>2001-07-30 13:35:45 +0000
committerTom Verbeek <tv@openoffice.org>2001-07-30 13:35:45 +0000
commit652eefba21035b7688e7c4c9808b5e63d3649104 (patch)
tree02d780a53b2d9832909222a1931603302f297714 /wizards
parent6244c55206d64f73d9bbe8dfde238fe371d22789 (diff)
#89978# adapted to new registry settings
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/tools/Misc.xba9
-rw-r--r--wizards/source/tools/ModuleControls.xba8
2 files changed, 9 insertions, 8 deletions
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 2b60febc3b42..9ceb5d637706 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -78,8 +78,8 @@ Dim aLocLocale As New com.sun.star.lang.Locale
Dim sLocale as String
Dim sLocaleList(1)
Dim oMasterKey
- oMasterKey = GetRegistryKeyContent(&quot;org.openoffice.UserProfile/International/&quot;)
- sLocale = oMasterKey.getByName(&quot;Locale&quot;)
+ oMasterKey = GetRegistryKeyContent(&quot;org.openoffice.Setup/L10N/&quot;)
+ sLocale = oMasterKey.getByName(&quot;ooLocale&quot;)
sLocaleList() = ArrayoutofString(sLocale, &quot;-&quot;)
aLocLocale.Language = sLocaleList(0)
If Ubound(sLocaleList()) &gt; 0 Then
@@ -101,11 +101,12 @@ End Function
Function GetProductname() as String
Dim oProdNameAccess as Object
+Dim omyNames(100) as Object
Dim sVersion as String
Dim sProdName as String
oProdNameAccess = GetRegistryKeyContent(&quot;org.openoffice.Setup/Product&quot;)
- sProdName = oProdNameAccess.getByName(&quot;Name&quot;)
- sVersion = oProdNameAccess.getByName(&quot;Version&quot;)
+ sProdName = oProdNameAccess.getByName(&quot;ooName&quot;)
+ sVersion = oProdNameAccess.getByName(&quot;ooSetupVersion&quot;)
GetProductName = sProdName &amp; &quot;.&quot; &amp; sVersion
End Function
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index c2c4d72fe7cc..fab31d51cf1f 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -158,7 +158,7 @@ End Function
Sub GetFolderName(oRefModel as Object)
-Dim oFolderDialog
+Dim oFolderDialog as Object
Dim iAccept as Integer
Dim sPath as String
Dim InitPath as String
@@ -187,11 +187,11 @@ Dim sPath as String
Dim InitPath as String
Dim RefControlName as String
Dim oUcb as object
-Dim ListAny(0)
+&apos;Dim ListAny(0)
oUcb = createUnoService(&quot;com.sun.star.ucb.SimpleFileAccess&quot;)
oFileDialog = CreateUnoService(&quot;com.sun.star.ui.dialogs.FilePicker&quot;)
- ListAny(0) = com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_SIMPLE
- oFileDialog.Initialize(ListAny())
+ &apos;ListAny(0) = com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_SIMPLE
+ &apos;oFileDialog.initialize(ListAny())
AddFiltersToDialog(FilterNames(), oFileDialog)
InitPath = ConvertToUrl(oRefModel.Text)