[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Application.xba |    2 +-
 wizards/source/access2base/Form.xba        |    2 ++
 wizards/source/access2base/acConstants.xba |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 38d12da637e745cec290d1ae58e2b8d59f77dfa7
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Wed May 6 12:55:04 2020 +0200
Commit:     Jean-Pierre Ledure <jp at ledure.be>
CommitDate: Wed May 6 12:55:04 2020 +0200

    Access2Base - Version number 7.0
    
    Change-Id: Ia75b4e02bd6def84d66ae89c1c4a688e8a027c23

diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba
index 7268e8216144..224cc394a99d 100644
--- a/wizards/source/access2base/Application.xba
+++ b/wizards/source/access2base/Application.xba
@@ -1866,4 +1866,4 @@ Public Sub _RootInit(Optional ByVal pbForce As Boolean)
 	
 End Sub		'	_RootInit	V1.1.0
 
-</script:module>
+</script:module>
\ No newline at end of file
diff --git a/wizards/source/access2base/Form.xba b/wizards/source/access2base/Form.xba
index 84dee353413a..df18feb34678 100644
--- a/wizards/source/access2base/Form.xba
+++ b/wizards/source/access2base/Form.xba
@@ -503,6 +503,7 @@ Dim oDatabaseForm As Object, iCtlCount As Integer
 	If Not IsLoaded Then Goto Trace_Error_NotOpen
 	'Count number of controls thru the forms collection
 	iControlCount = 0
+
 	iCount = FormsCollection.Count
 	For i = 0 To iCount - 1
 		If i = 0 Then Set oDatabaseForm = DatabaseForm Else Set oDatabaseForm = FormsCollection.getByIndex(i)
@@ -833,6 +834,7 @@ Dim oDoc As Object, oDatabase As Object
 				End If
 			Case DBCONNECTFORM
 				Set ContainerWindow = oDoc.Document.CurrentController.Frame.ContainerWindow
+				Set FormsCollection = oDoc.Document.getDrawPage.Forms
 				Set oDatabase = Application._CurrentDb(_DocEntry, _DbEntry)
 				With oDatabase
 					Set DatabaseForm = .Form
diff --git a/wizards/source/access2base/acConstants.xba b/wizards/source/access2base/acConstants.xba
index e1c04bd6f9be..9678a5b205dc 100644
--- a/wizards/source/access2base/acConstants.xba
+++ b/wizards/source/access2base/acConstants.xba
@@ -9,7 +9,7 @@ REM ============================================================================
 Option Explicit
 
 REM Access2Base -----------------------------------------------------
-Global Const Access2Base_Version = "6.4.0"		'	Alignment on LibreOffice versions
+Global Const Access2Base_Version = "7.0.0"		'	Alignment on LibreOffice versions
 
 REM AcCloseSave
 REM -----------------------------------------------------------------