Kaydet (Commit) 53d261f2 authored tarafından Jean-Pierre Ledure's avatar Jean-Pierre Ledure

Access2Base - Avoid use of outdated routines

in getObject, getValue and setValue functions

Change-Id: I98ff54bf62cfb34218d1fdb43fb37ba21846b068
üst 076084a7
...@@ -461,7 +461,7 @@ Dim oDoc As Object ...@@ -461,7 +461,7 @@ Dim oDoc As Object
Case OBJFORM, OBJSUBFORM, OBJCONTROL, OBJDIALOG Case OBJFORM, OBJSUBFORM, OBJCONTROL, OBJDIALOG
vCurrentObject = vCurrentObject.Controls(sComponents(iCurrentIndex)) vCurrentObject = vCurrentObject.Controls(sComponents(iCurrentIndex))
End Select End Select
If sCurrentProperty <> "" Then vCurrentObject = PropertiesGet._getProperty(vCurrentObject, sCurrentProperty) If sCurrentProperty <> "" Then vCurrentObject = vCurrentObject.getProperty(sCurrentProperty)
Next iCurrentIndex Next iCurrentIndex
Set getObject = vCurrentObject Set getObject = vCurrentObject
...@@ -714,10 +714,11 @@ Dim vItem As Variant, sProperty As String ...@@ -714,10 +714,11 @@ Dim vItem As Variant, sProperty As String
Set vItem = getObject(pvObject) Set vItem = getObject(pvObject)
sProperty = Utils._FinalProperty(pvObject) sProperty = Utils._FinalProperty(pvObject)
If sProperty = "" Then sProperty = "Value" ' Default value if final property in shortcut is absent If sProperty = "" Then sProperty = "Value" ' Default value if final property in shortcut is absent
getValue = PropertiesGet._getProperty(vItem, sProperty) getValue = vItem.getProperty(sproperty)
Utils._ResetCalledSub("getValue") Utils._ResetCalledSub("getValue")
Else Else
getValue = PropertiesGet._getProperty(pvObject, "Value") Set vItem = pvObject
getValue = vItem.getProperty("Value")
End If End If
End Function ' getValue End Function ' getValue
......
...@@ -334,13 +334,14 @@ Dim vItem As Variant, sProperty As String ...@@ -334,13 +334,14 @@ Dim vItem As Variant, sProperty As String
If IsMissing(pvObject) Or IsMissing(pvValue) Or IsEmpty(pvObject) Then Call _TraceArguments("setValue") If IsMissing(pvObject) Or IsMissing(pvValue) Or IsEmpty(pvObject) Then Call _TraceArguments("setValue")
If VarType(pvObject) = vbString Then If VarType(pvObject) = vbString Then
Utils._SetCalledSub("setValue") Utils._SetCalledSub("setValue")
vItem = getObject(pvObject) Set vItem = getObject(pvObject)
sProperty = Utils._FinalProperty(pvObject) sProperty = Utils._FinalProperty(pvObject)
If sProperty = "" Then sProperty = "Value" If sProperty = "" Then sProperty = "Value"
setValue = PropertiesSet._setProperty(vItem, sProperty, pvValue) setValue = vItem.setProperty(sProperty, pvValue)
Utils._ResetCalledSub("setValue") Utils._ResetCalledSub("setValue")
Else Else
setValue = PropertiesSet._setProperty(pvObject, "Value", pvValue) Set vItem = pvObject
setValue = vItem.setProperty("Value", pvValue)
End If End If
End Function ' setValue End Function ' setValue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment