[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - wizards/source

[Libreoffice Gerrit user]

 wizards/source/access2base/DoCmd.xba |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9459c5b105e0aad25ccfb875354cfd9c7353cbcb
Author:     Jean-Pierre Ledure <jp at ledure.be>
AuthorDate: Mon Aug 13 11:02:06 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 16 17:49:17 2018 +0200

    Access2Base - Fix Filter arg not applied in OpenForm
    
    The Filter argument was not applied in the OpenForm command
    (was simply ignored and could be worked around by user).
    Fixed by retrieval of internal DatabaseForm.
    
    Change-Id: Iefa697425bb5859979b07cca8ab38f6fe604f92d
    Reviewed-on: https://gerrit.libreoffice.org/58915
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index ad564b72afd9..c640af7c5478 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -1139,6 +1139,8 @@ Dim sFilter As String, oForm As Object, oFormsCollection As Object
 	Else
 		sFilter = "(" & pvFilterName & ") And (" & pvWhereCondition & ")"
 	End If
+	Set oFormsCollection = oOpenForm.DrawPage.Forms
+	If oFormsCollection.getCount() > 0 Then Set oForm = oFormsCollection.getByIndex(0) Else Set oForm = Nothing
 	If Not IsNull(oForm) Then
 		If sFilter <> "" Then
 			oForm.Filter = oDatabase._ReplaceSquareBrackets(sFilter)
@@ -2651,4 +2653,4 @@ Dim oShell As Object
 
 End Sub				'	_ShellExecute			V0.8.5
 
-</script:module>
\ No newline at end of file
+</script:module>