diff options
| -rw-r--r-- | wizards/source/access2base/Application.xba | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 41c9a1d42e4f..13b97fda0927 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -573,9 +573,10 @@ Exit_Sub: End Sub ' CloseConnection V1.2.0 REM ----------------------------------------------------------------------------------------------------------------------- -Public Function CommandBars(Optional ByVal pvIndex As Variant) As Variant +Public Function CommandBars(Optional ByVal pvIndex As Variant, Optional ByRef poWindow As Object) As Variant ' Return an object of type CommandBar indicated by its index or its name (CASE-INSENSITIVE string) ' If no pvIndex argument, return a Collection type +' (Unpublished) With poWindow, force the frame in which toolbars are detected If _ErrorHandler() Then On Local Error Goto Error_Function Const cstThisSub = "CommandBars" @@ -596,9 +597,8 @@ Const cstCustom = "CUSTOM" iObjectsCount = 0 bFound = False - iBuiltin = 1 ' Default = builtin - Set oWindow = _SelectWindow() + If IsMissing(poWindow) Then Set oWindow = _SelectWindow() Else Set oWindow = poWindow If IsNull(oWindow.Frame) Then Goto Trace_WindowError ' List of 21 modules @@ -639,6 +639,7 @@ Const cstCustom = "CUSTOM" Set oModuleUI = CreateUnoService("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") For k = 0 To UBound(vModules) For j = 0 To UBound(sSupportedModules) + iBuiltin = 1 ' Default = builtin If vModules(k) = sSupportedModules(j) Then ' Supported modules only Set oToolbar = oModuleUI.getUIConfigurationManager(vModules(k)) vUIElements() = oToolbar.getUIElementsInfo(0) @@ -686,7 +687,7 @@ Const cstCustom = "CUSTOM" Case Else If pvIndex = iObjectsCount - 1 Then bFound = True End Select - If bFound Then + If bFound Then Set oObject = _NewCommandBar("", sToolbarName, sToolbarFullName, iBuiltin) Set oObject._Window = oWindow.Frame Set oObject._Toolbar = oToolbar |