diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2016-11-30 14:04:06 +0100 |
|---|---|---|
| committer | Jean-Pierre Ledure <jp@ledure.be> | 2017-01-12 11:40:49 +0100 |
| commit | 53d261f2ff92d3da5655f729b433a36b4ea2733c (patch) | |
| tree | e96298ae1a58ba0a5791ad43fd1fcd743487081b /wizards | |
| parent | 076084a71758fcdc2eca6099d3ec8bd262e7e46b (diff) | |
Access2Base - Avoid use of outdated routines
in getObject, getValue and setValue functions
Change-Id: I98ff54bf62cfb34218d1fdb43fb37ba21846b068
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/access2base/PropertiesGet.xba | 7 | ||||
| -rw-r--r-- | wizards/source/access2base/PropertiesSet.xba | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/wizards/source/access2base/PropertiesGet.xba b/wizards/source/access2base/PropertiesGet.xba index 273617ca9ab8..7522fe94439d 100644 --- a/wizards/source/access2base/PropertiesGet.xba +++ b/wizards/source/access2base/PropertiesGet.xba @@ -461,7 +461,7 @@ Dim oDoc As Object Case OBJFORM, OBJSUBFORM, OBJCONTROL, OBJDIALOG vCurrentObject = vCurrentObject.Controls(sComponents(iCurrentIndex)) End Select - If sCurrentProperty <> "" Then vCurrentObject = PropertiesGet._getProperty(vCurrentObject, sCurrentProperty) + If sCurrentProperty <> "" Then vCurrentObject = vCurrentObject.getProperty(sCurrentProperty) Next iCurrentIndex Set getObject = vCurrentObject @@ -714,10 +714,11 @@ Dim vItem As Variant, sProperty As String Set vItem = getObject(pvObject) sProperty = Utils._FinalProperty(pvObject) 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") Else - getValue = PropertiesGet._getProperty(pvObject, "Value") + Set vItem = pvObject + getValue = vItem.getProperty("Value") End If End Function ' getValue diff --git a/wizards/source/access2base/PropertiesSet.xba b/wizards/source/access2base/PropertiesSet.xba index cb480686842e..db72b5f3d710 100644 --- a/wizards/source/access2base/PropertiesSet.xba +++ b/wizards/source/access2base/PropertiesSet.xba @@ -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 VarType(pvObject) = vbString Then Utils._SetCalledSub("setValue") - vItem = getObject(pvObject) + Set vItem = getObject(pvObject) sProperty = Utils._FinalProperty(pvObject) If sProperty = "" Then sProperty = "Value" - setValue = PropertiesSet._setProperty(vItem, sProperty, pvValue) + setValue = vItem.setProperty(sProperty, pvValue) Utils._ResetCalledSub("setValue") Else - setValue = PropertiesSet._setProperty(pvObject, "Value", pvValue) + Set vItem = pvObject + setValue = vItem.setProperty("Value", pvValue) End If End Function ' setValue |