diff options
Diffstat (limited to 'wizards/source/access2base/SubForm.xba')
| -rw-r--r-- | wizards/source/access2base/SubForm.xba | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/wizards/source/access2base/SubForm.xba b/wizards/source/access2base/SubForm.xba index bead65c95248..f34d3de4035c 100644 --- a/wizards/source/access2base/SubForm.xba +++ b/wizards/source/access2base/SubForm.xba @@ -17,6 +17,7 @@ REM ---------------------------------------------------------------------------- Private _Type As String ' Must be SUBFORM Private _Shortcut As String Private _Name As String +Private _MainForm As String Private _DocEntry As Integer Private _DbEntry As Integer Private _OrderBy As String @@ -30,6 +31,7 @@ Private Sub Class_Initialize() _Type = OBJSUBFORM _Shortcut = "" _Name = "" + _MainForm = "" _DocEntry = -1 _DbEntry = -1 _OrderBy = "" @@ -409,18 +411,20 @@ Dim j As Integer If bFound Then ocControl._Name = sControls(i) Else Goto Trace_NotFound End Select - ocControl._Shortcut = sParentShortcut & "!" & Utils._Surround(ocControl._Name) - Set ocControl.ControlModel = DatabaseForm.getByName(ocControl._Name) - ocControl._ImplementationName = ocControl.ControlModel.getImplementationName() - ocControl._FormComponent = ParentComponent - If Utils._hasUNOProperty(ocControl.ControlModel, "ClassId") Then ocControl._ClassId = ocControl.ControlModel.ClassId - If ocControl._ClassId > 0 And ocControl._ClassId <> acHiddenControl Then - Set ocControl.ControlView = ParentComponent.CurrentController.getControl(ocControl.ControlModel) - End If - - ocControl._Initialize() - ocControl._DocEntry = _DocEntry - ocControl._DbEntry = _DbEntry + With ocControl + ._Shortcut = sParentShortcut & "!" & Utils._Surround(._Name) + Set .ControlModel = DatabaseForm.getByName(._Name) + ._ImplementationName = .ControlModel.getImplementationName() + ._FormComponent = ParentComponent + If Utils._hasUNOProperty(.ControlModel, "ClassId") Then ._ClassId = .ControlModel.ClassId + If ._ClassId > 0 And ._ClassId <> acHiddenControl Then + Set .ControlView = ParentComponent.CurrentController.getControl(.ControlModel) + End If + + ._Initialize() + ._DocEntry = _DocEntry + ._DbEntry = _DbEntry + End With Set Controls = ocControl Exit_Function: |