diff options
| -rw-r--r-- | wizards/source/access2base/DoCmd.xba | 12 | ||||
| -rw-r--r-- | wizards/source/access2base/Trace.xba | 13 | ||||
| -rw-r--r-- | wizards/source/access2base/Utils.xba | 19 |
3 files changed, 25 insertions, 19 deletions
diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index fd6423963063..9b6500c30897 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -2302,15 +2302,9 @@ REM ---------------------------------------------------------------------------- Private Function _PromptFormat(ByVal pvList As Variant) As String ' Return user selection in Format dialog -Dim oDialog As Object, oDialogLib As Object, iOKCancel As Integer, oControl As Object - Set oDialogLib = DialogLibraries - If oDialogLib.hasByName("Access2BaseDev") Then - If Not oDialogLib.IsLibraryLoaded("Access2BaseDev") Then oDialogLib.loadLibrary("Access2BaseDev") - Set oDialog = CreateUnoDialog(DialogLibraries.Access2BaseDev.dlgFormat) - Else - If Not oDialogLib.IsLibraryLoaded("Access2Base") Then oDialogLib.loadLibrary("Access2Base") - Set oDialog = CreateUnoDialog(DialogLibraries.Access2Base.dlgFormat) - End If +Dim oDialog As Object, iOKCancel As Integer, oControl As Object + + Set oDialog = CreateUnoDialog(Utils._GetDialogLib().dlgFormat) oDialog.Title = _GetLabel("DLGFORMAT_TITLE") Set oControl = oDialog.Model.getByName("lblFormat") diff --git a/wizards/source/access2base/Trace.xba b/wizards/source/access2base/Trace.xba index 3b3f4dff85c5..fdc08d4d623c 100644 --- a/wizards/source/access2base/Trace.xba +++ b/wizards/source/access2base/Trace.xba @@ -31,17 +31,10 @@ Public Sub TraceConsole() ' Display the Trace dialog with current trace log values and parameter choices If _ErrorHandler() Then On Local Error Goto Error_Sub -Dim sLineBreak As String, oDialogLib As Object, oTraceDialog As Object +Dim sLineBreak As String, oTraceDialog As Object sLineBreak = vbNewLine - - Set oDialogLib = DialogLibraries - If oDialogLib.hasByName("Access2BaseDev") Then - If Not oDialogLib.IsLibraryLoaded("Access2BaseDev") Then oDialogLib.loadLibrary("Access2BaseDev") - Set oTraceDialog = CreateUnoDialog(DialogLibraries.Access2BaseDev.dlgTrace) - Else - If Not oDialogLib.IsLibraryLoaded("Access2Base") Then oDialogLib.loadLibrary("Access2Base") - Set oTraceDialog = CreateUnoDialog(DialogLibraries.Access2Base.dlgTrace) - EndIf + + Set oTraceDialog = CreateUnoDialog(Utils._GetDialogLib().dlgTrace) oTraceDialog.Title = _GetLabel("DLGTRACE_TITLE") ' HelpText ??? Dim oEntries As Object, oTraceLog As Object, oClear As Object, oMinLevel As Object, oNbEntries As Object, oDump As Object diff --git a/wizards/source/access2base/Utils.xba b/wizards/source/access2base/Utils.xba index a7be0b3551e9..c2b6172b2484 100644 --- a/wizards/source/access2base/Utils.xba +++ b/wizards/source/access2base/Utils.xba @@ -197,6 +197,25 @@ Dim oPip As Object, sLocation As String End Function ' ExtensionLocation REM ----------------------------------------------------------------------------------------------------------------------- +Private Function _GetDialogLib() As Object +' Return actual Access2Base dialogs library + +Dim oDialogLib As Object + + Set oDialogLib = DialogLibraries + If oDialogLib.hasByName("Access2BaseDev") Then + If Not oDialogLib.IsLibraryLoaded("Access2BaseDev") Then oDialogLib.loadLibrary("Access2BaseDev") + Set _GetDialogLib = DialogLibraries.Access2BaseDev + ElseIf oDialogLib.hasByName("Access2Base") Then + If Not oDialogLib.IsLibraryLoaded("Access2Base") Then oDialogLib.loadLibrary("Access2Base") + Set _GetDialogLib = DialogLibraries.Access2Base + Else + Set _GetDialogLib = Nothing + EndIf + +End Function + +REM ----------------------------------------------------------------------------------------------------------------------- Private Function _GetResultSetColumnValue(poResultSet As Object _ , ByVal piColIndex As Integer _ , Optional ByVal pbReturnBinary As Boolean _ |