diff options
| author | Tom Verbeek <tv@openoffice.org> | 2001-07-30 13:35:45 +0000 |
|---|---|---|
| committer | Tom Verbeek <tv@openoffice.org> | 2001-07-30 13:35:45 +0000 |
| commit | 652eefba21035b7688e7c4c9808b5e63d3649104 (patch) | |
| tree | 02d780a53b2d9832909222a1931603302f297714 | |
| parent | 6244c55206d64f73d9bbe8dfde238fe371d22789 (diff) | |
#89978# adapted to new registry settings
| -rw-r--r-- | wizards/source/tools/Misc.xba | 9 | ||||
| -rw-r--r-- | wizards/source/tools/ModuleControls.xba | 8 |
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("org.openoffice.UserProfile/International/") - sLocale = oMasterKey.getByName("Locale") + oMasterKey = GetRegistryKeyContent("org.openoffice.Setup/L10N/") + sLocale = oMasterKey.getByName("ooLocale") sLocaleList() = ArrayoutofString(sLocale, "-") aLocLocale.Language = sLocaleList(0) If Ubound(sLocaleList()) > 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("org.openoffice.Setup/Product") - sProdName = oProdNameAccess.getByName("Name") - sVersion = oProdNameAccess.getByName("Version") + sProdName = oProdNameAccess.getByName("ooName") + sVersion = oProdNameAccess.getByName("ooSetupVersion") GetProductName = sProdName & "." & 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) +'Dim ListAny(0) oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess") oFileDialog = CreateUnoService("com.sun.star.ui.dialogs.FilePicker") - ListAny(0) = com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_SIMPLE - oFileDialog.Initialize(ListAny()) + 'ListAny(0) = com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_SIMPLE + 'oFileDialog.initialize(ListAny()) AddFiltersToDialog(FilterNames(), oFileDialog) InitPath = ConvertToUrl(oRefModel.Text) |