diff options
Diffstat (limited to 'wizards/source/access2base/Database.xba')
| -rw-r--r-- | wizards/source/access2base/Database.xba | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba index dacf29f597d8..c4a674c566a8 100644 --- a/wizards/source/access2base/Database.xba +++ b/wizards/source/access2base/Database.xba @@ -605,7 +605,12 @@ Const cstThisSub = "Database.OutputTo" If IsMissing(pvOutputFormat) Then pvOutputFormat = "" If Not Utils._CheckArgument(pvOutputFormat, 3, vbString) Then Goto Exit_Function If pvOutputFormat <> "" Then - If Not Utils._CheckArgument(UCase(pvOutputFormat), 3, vbString, Array(UCase(acFormatHTML), "HTML", "")) _ + If Not Utils._CheckArgument(UCase(pvOutputFormat), 3, vbString, Array( _ + UCase(acFormatHTML), "HTML" _ + , UCase(acFormatXLS), "XLS" _ + , UCase(acFormatCALC), "ODS" _ + , UCase(acFormatTXT), "TXT", "CSV" _ + , "")) _ Then Goto Exit_Function ' A 2nd time to allow case unsensitivity End If If IsMissing(pvOutputFile) Then pvOutputFile = "" @@ -637,7 +642,7 @@ Dim sOutputFormat As String, iTemplate As Integer, iOutputFile As Integer, bOutp If pvOutputFormat = "" Then sOutputFormat = _PromptFormat() ' Prompt user for format If sOutputFormat = "" Then Goto Exit_Function - If Not Utils._CheckArgument(UCase(pvOutputFormat), 3, vbString, Array(UCase(acFormatHTML), "HTML", "")) _ + If Not Utils._CheckArgument(UCase(sOutputFormat), 3, vbString, Array(UCase(acFormatHTML), "HTML", "")) _ Then Goto Exit_Function ' Today only value, later maybe Calc ? Else sOutputFormat = UCase(pvOutputFormat) @@ -655,7 +660,7 @@ Dim sOutputFormat As String, iTemplate As Integer, iOutputFile As Integer, bOutp 'Create file bOutput = _OutputToHTML(oTable, sOutputFile, pvTemplateFile) - Set oTable = Nothing + oTable.Dispose() 'Launch application, if requested If bOutput Then |