mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access2Base - Avoid use of outdated routines

Browse Source 
in getObject, getValue and setValue functions

Change-Id: I98ff54bf62cfb34218d1fdb43fb37ba21846b068
This commit is contained in:
Jean-Pierre Ledure
2016-11-30 14:04:06 +01:00
parent 076084a717
commit 53d261f2ff
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wizards/source/access2base/PropertiesGet.xba
View File

@@ -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

7
wizards/source/access2base/PropertiesSet.xba
View File

@@ -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