[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - wizards/source

[Jean-Pierre Ledure]

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

New commits:
commit fb6b1f1ebe8bc5be81fb1461dbe590d6ab73755a
Author: Jean-Pierre Ledure <jp at ledure.be>
Date:   Sat May 31 12:11:28 2014 +0200

    Access2Base : bugs fixings in LO 4.3 retrofitted to 4.2
    
    1. Typo in OpenForm
    2. Find(Record/Next) error when search done in gridcontrol of subform
    
    Change-Id: I914c3da021a47ef0410e3b6be038e8e2bad8fa81
    Reviewed-on: https://gerrit.libreoffice.org/9598
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba
index 4f72c12..457d687 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -135,6 +135,7 @@ Dim vFindValue As Variant, oFindrecord As Object
 		If .FindRecord = 0 Then Goto Error_FindRecord
 		.FindRecord = 0
 		Set ofForm = getObject(.Form)
+		If ofForm._Type = OBJCONTROL Then Set ofForm = ofForm.Form		'	Bug Tombola
 		Set ocGrid = getObject(.GridControl)
 
 		'	Move cursor to the initial row. Operation based on last FindRecord, not on user interactions done inbetween
@@ -330,6 +331,7 @@ Dim oFindRecord As _FindParams
 					If vParentGrid.SubType <> CTLGRIDCONTROL Then Goto Error_Target
 					.GridControl = vParentGrid._Shortcut
 					ofParentForm = getObject(_getUpperShortcut(vParentGrid._Shortcut, vParentGrid._Name))
+					If ofParentForm._Type = OBJCONTROL Then Set ofParentForm = ofParentForm.Form		'	Bug Tombola
 					If IsNull(ofParentForm.DatabaseForm) Then Goto Error_DatabaseForm
 					.Target = ocTarget._Shortcut
 					Set vDataField = ocTarget.ControlModel.BoundField
@@ -798,7 +800,7 @@ Dim sFilter As String, oForm As Object, oFormsCollection As Object
 	With ofForm
 		Select Case pvDataMode
 			Case acFormAdd
-				.setAllowAdditions = True
+				.AllowAdditions = True
 				.AllowDeletions = False
 				.AllowEdits = False
 			Case acFormEdit