diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2014-05-16 14:55:36 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-05-16 16:55:29 +0000 |
| commit | 6e60f1a69c87f5c443014f14027cca77a719586a (patch) | |
| tree | dfc900614df00e88330ffdf0a7dab71abc724ffe /wizards/source/access2base/Collect.xba | |
| parent | 4a9a10d169653e42028d32ee8e260692ead8cc36 (diff) | |
Access2Base - solve compatibility issues
1) AOO <> LO
"Append" is a reserved word in AOO Basic, not in LO
=> Append method replaced with Add
2) Windows <> Linux
ActiveConnection not ready under Windows for standalone forms when database is (user/password) protected
=> Connection may be postponed to first use of form
Change-Id: I8ba409191ba2a2a4c057480ec3287d7d48262073
Reviewed-on: https://gerrit.libreoffice.org/9372
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'wizards/source/access2base/Collect.xba')
| -rw-r--r-- | wizards/source/access2base/Collect.xba | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wizards/source/access2base/Collect.xba b/wizards/source/access2base/Collect.xba index 80c53a0966ab..96da04d6f7ed 100644 --- a/wizards/source/access2base/Collect.xba +++ b/wizards/source/access2base/Collect.xba @@ -31,6 +31,7 @@ Private Sub Class_Initialize() _CollType = "" _ParentType = "" _ParentName = "" + Set _ParentDatabase = Nothing _Count = 0 End Sub ' Constructor @@ -161,15 +162,15 @@ REM ---------------------------------------------------------------------------- REM --- CLASS METHODS --- REM ----------------------------------------------------------------------------------------------------------------------- -Public Function Append(Optional pvObject As Variant) As Boolean +Public Function Add(Optional pvObject As Variant) As Boolean ' Append a new TableDef or Field object to the TableDefs/Fields collections -Const cstThisSub = "Collection.Append" +Const cstThisSub = "Collection.Add" Utils._SetCalledSub(cstThisSub) If _ErrorHandler() Then On Local Error Goto Error_Function Dim odbDatabase As Object, oConnection As Object, oTables As Object, sName As String, oTable As Object - Append = False + Add = False If IsMissing(pvObject) Then Call _TraceArguments() If Not Utils._CheckArgument(pvObject, 1, vbObject) Then Goto Exit_Function @@ -192,7 +193,7 @@ Dim odbDatabase As Object, oConnection As Object, oTables As Object, sName As St End Select End With - Append = True + Add = True Exit_Function: Utils._ResetCalledSub(cstThisSub) @@ -206,7 +207,7 @@ Error_NotApplicable: Error_Sequence: TraceError(TRACEFATAL, ERRTABLECREATION, Utils._CalledSub(), 0, 1, pvObject._Name) Goto Exit_Function -End Function ' Append V1.1.0 +End Function ' Add V1.1.0 REM ----------------------------------------------------------------------------------------------------------------------- Public Function Delete(ByVal Optional pvName As Variant) As Boolean |