diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-12-29 18:48:46 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-12-30 10:34:54 +0100 |
| commit | 240b3ccaec684da6231d41309bd3aa79f139b055 (patch) | |
| tree | a30f31049a8d67b41a0b7cf850fa2d83b1f98649 /wizards | |
| parent | 00315ee52b09cb64de268f762809c2418716f49e (diff) | |
Fix case for "ByVal", "Variant", "UCase"
Change-Id: I136d292cd535d4208457ef91a7773fc7ac00d5c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127716
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/access2base/Control.xba | 4 | ||||
| -rw-r--r-- | wizards/source/access2base/DataDef.xba | 6 | ||||
| -rw-r--r-- | wizards/source/access2base/Database.xba | 4 | ||||
| -rw-r--r-- | wizards/source/access2base/DoCmd.xba | 4 | ||||
| -rw-r--r-- | wizards/source/access2base/Recordset.xba | 4 | ||||
| -rw-r--r-- | wizards/source/access2base/Trace.xba | 4 | ||||
| -rw-r--r-- | wizards/source/access2base/Utils.xba | 10 | ||||
| -rw-r--r-- | wizards/source/euro/ConvertRun.xba | 4 | ||||
| -rw-r--r-- | wizards/source/formwizard/tools.xba | 8 | ||||
| -rw-r--r-- | wizards/source/scriptforge/SF_Dictionary.xba | 6 | ||||
| -rw-r--r-- | wizards/source/scriptforge/SF_FileSystem.xba | 4 | ||||
| -rw-r--r-- | wizards/source/scriptforge/SF_Services.xba | 4 | ||||
| -rw-r--r-- | wizards/source/scriptforge/SF_Utils.xba | 4 | ||||
| -rw-r--r-- | wizards/source/scriptforge/_CodingConventions.xba | 2 | ||||
| -rw-r--r-- | wizards/source/sfdatabases/SF_Database.xba | 4 | ||||
| -rw-r--r-- | wizards/source/sfdocuments/SF_Form.xba | 4 | ||||
| -rw-r--r-- | wizards/source/sfdocuments/SF_FormControl.xba | 4 | ||||
| -rw-r--r-- | wizards/source/tools/Strings.xba | 8 |
18 files changed, 44 insertions, 44 deletions
diff --git a/wizards/source/access2base/Control.xba b/wizards/source/access2base/Control.xba index e0f77b2e8f78..b22bb819b832 100644 --- a/wizards/source/access2base/Control.xba +++ b/wizards/source/access2base/Control.xba @@ -650,7 +650,7 @@ Property Get Text() As Variant Text = _PropertyGet("Text") End Property ' Text (get) -Public Function pText() As variant +Public Function pText() As Variant pText = _PropertyGet("Text") End Function ' pText (get) @@ -2498,4 +2498,4 @@ Error_Function: GoTo Exit_Function End Function ' _PropertySet V1.1.0 -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/DataDef.xba b/wizards/source/access2base/DataDef.xba index 214987ca1151..8cc6b9bb1359 100644 --- a/wizards/source/access2base/DataDef.xba +++ b/wizards/source/access2base/DataDef.xba @@ -95,7 +95,7 @@ REM ---------------------------------------------------------------------------- Public Function CreateField(ByVal Optional pvFieldName As Variant _ , ByVal optional pvType As Variant _ , ByVal optional pvSize As Variant _ - , ByVal optional pvAttributes As variant _ + , ByVal optional pvAttributes As Variant _ ) As Object 'Return a Field object Const cstThisSub = "TableDef.CreateField" @@ -262,7 +262,7 @@ Error_Function: End Function ' Execute V1.1.0 REM ----------------------------------------------------------------------------------------------------------------------- -Public Function Fields(ByVal Optional pvIndex As variant) As Object +Public Function Fields(ByVal Optional pvIndex As Variant) As Object If _ErrorHandler() Then On Local Error Goto Error_Function Dim cstThisSub As String @@ -595,4 +595,4 @@ Error_Function: GoTo Exit_Function End Function ' _PropertySet -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba index 685a6b39c3ca..5a5b1cf2b1f8 100644 --- a/wizards/source/access2base/Database.xba +++ b/wizards/source/access2base/Database.xba @@ -1372,7 +1372,7 @@ Private Function _OutputBooleanToHTML(ByVal pbBool As Boolean) As String End Function ' _OutputBooleanToHTML V1.4.0 REM ----------------------------------------------------------------------------------------------------------------------- -Private Function _OutputClassToHTML(ByVal pvArray As variant) As String +Private Function _OutputClassToHTML(ByVal pvArray As Variant) As String ' Formats classes attribute of <tr> and <td> tags If Not IsArray(pvArray) Then @@ -1886,4 +1886,4 @@ Const cstSingleQuote = "'" End Function ' ReplaceSquareBrackets V1.1.0 -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/DoCmd.xba b/wizards/source/access2base/DoCmd.xba index 089486a872fa..73d3855843ba 100644 --- a/wizards/source/access2base/DoCmd.xba +++ b/wizards/source/access2base/DoCmd.xba @@ -820,7 +820,7 @@ Error_Function: End Function ' GetHiddenAttribute V1.1.0 REM ----------------------------------------------------------------------------------------------------------------------- -Public Function GoToControl(Optional ByVal pvControlName As variant) As Boolean +Public Function GoToControl(Optional ByVal pvControlName As Variant) As Boolean ' Set the focus on the named control on the active form. ' Return False if the control does not exist or is disabled, @@ -2659,4 +2659,4 @@ Dim oShell As Object End Sub ' _ShellExecute V0.8.5 -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/Recordset.xba b/wizards/source/access2base/Recordset.xba index 8260a900eef2..eaa186fa6985 100644 --- a/wizards/source/access2base/Recordset.xba +++ b/wizards/source/access2base/Recordset.xba @@ -481,7 +481,7 @@ Error_RowDeleted: End Function ' Edit REM ----------------------------------------------------------------------------------------------------------------------- -Public Function Fields(ByVal Optional pvIndex As variant) As Object +Public Function Fields(ByVal Optional pvIndex As Variant) As Object If _ErrorHandler() Then On Local Error Goto Error_Function Const cstThisSub = "Recordset.Fields" @@ -1271,4 +1271,4 @@ Error_Function: GoTo Exit_Function End Function ' _PropertySet -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/Trace.xba b/wizards/source/access2base/Trace.xba index 990bb49d77c8..041bea53268f 100644 --- a/wizards/source/access2base/Trace.xba +++ b/wizards/source/access2base/Trace.xba @@ -234,7 +234,7 @@ Error_Sub: End Sub ' TraceLevel V0.9.5 REM ----------------------------------------------------------------------------------------------------------------------- -Public Sub TraceLog(Byval psTraceLevel As String _ +Public Sub TraceLog(ByVal psTraceLevel As String _ , ByVal psText As String _ , ByVal Optional pbMsgBox As Boolean _ ) @@ -435,4 +435,4 @@ Dim vTraces As Variant, i As Integer End Function ' TraceLevel -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/access2base/Utils.xba b/wizards/source/access2base/Utils.xba index abd48d018f9d..eb314ea276ec 100644 --- a/wizards/source/access2base/Utils.xba +++ b/wizards/source/access2base/Utils.xba @@ -91,7 +91,7 @@ End Function ' CalledSub V0.8.9 REM ----------------------------------------------------------------------------------------------------------------------- Public Function _CheckArgument(pvItem As Variant _ , ByVal piArgNr As Integer _ - , Byval pvType As Variant _ + , ByVal pvType As Variant _ , ByVal Optional pvValid As Variant _ , ByVal Optional pvError As Boolean _ ) As Variant @@ -212,7 +212,7 @@ End Function ' CStr V0.9.5 REM ----------------------------------------------------------------------------------------------------------------------- Public Function _CVar(ByRef psArg As String, ByVal Optional pbStrDate As Boolean) As Variant ' psArg is presumed an output of _CStr (stored in the meantime in a text file f.i.) -' _CVar returns the corresponding original variant variable or Null/Nothing if not possible +' _CVar returns the corresponding original Variant variable or Null/Nothing if not possible ' Return values may of types Array, Long, Double, Date, Boolean, String, Null or Empty ' pbStrDate = True keeps dates as strings @@ -795,7 +795,7 @@ Exit_False: End Function ' IsPseudo V1.1.0 REM ----------------------------------------------------------------------------------------------------------------------- -Private Function _IsScalar(ByVal pvArg As Variant, Byval pvType As Variant, ByVal Optional pvValid As Variant) As Boolean +Private Function _IsScalar(ByVal pvArg As Variant, ByVal pvType As Variant, ByVal Optional pvValid As Variant) As Boolean ' Check type of pvArg and value in allowed pvValid list _IsScalar = False @@ -875,7 +875,7 @@ End Function ' _PercentEncode V1.4.0 REM ----------------------------------------------------------------------------------------------------------------------- Public Function _ReadFileIntoArray(ByVal psFileName) As Variant -' Loads all lines of a text file into a variant array +' Loads all lines of a text file into a Variant array ' Any error reduces output to an empty array ' Input file name presumed in URL form @@ -1305,4 +1305,4 @@ Private Function _UTF8Encode(ByVal psChar As String) As String End Function ' _UTF8Encode V1.4.0 -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/euro/ConvertRun.xba b/wizards/source/euro/ConvertRun.xba index 5e4f06e01491..e91d12e7a81d 100644 --- a/wizards/source/euro/ConvertRun.xba +++ b/wizards/source/euro/ConvertRun.xba @@ -288,9 +288,9 @@ End Sub ' Returns 'True' or 'False' Function FieldInList(LocList(), MaxIndex as integer, ByVal LocField ) As Boolean Dim i as integer - LocField = Ucase(LocField) + LocField = UCase(LocField) For i = Lbound(LocList()) to MaxIndex - If Ucase(LocList(i)) = LocField then + If UCase(LocList(i)) = LocField then FieldInList = True Exit Function End if diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba index 35a2436e2cf7..881552717864 100644 --- a/wizards/source/formwizard/tools.xba +++ b/wizards/source/formwizard/tools.xba @@ -113,17 +113,17 @@ Dim NullValue End Function -Function TwipToCM(BYVAL nValue as long) as String +Function TwipToCM(ByVal nValue as long) as String TwipToCM = trim(str(nValue / 567)) + "cm" End function -Function TwipTo100telMM(BYVAL nValue as long) as long +Function TwipTo100telMM(ByVal nValue as long) as long TwipTo100telMM = nValue / 0.567 End function -Function TwipToPixel(BYVAL nValue as long) as long ' not an exact calculation +Function TwipToPixel(ByVal nValue as long) as long ' not an exact calculation TwipToPixel = nValue / 15 End function @@ -276,7 +276,7 @@ Dim oControl as Object End Sub -Function CalcUniqueContentName(BYVAL oContainer as Object, sBaseName as String) as String +Function CalcUniqueContentName(ByVal oContainer as Object, sBaseName as String) as String Dim nPostfix as Integer Dim sReturn as String diff --git a/wizards/source/scriptforge/SF_Dictionary.xba b/wizards/source/scriptforge/SF_Dictionary.xba index 9fb84de55418..fc92e24dd2ad 100644 --- a/wizards/source/scriptforge/SF_Dictionary.xba +++ b/wizards/source/scriptforge/SF_Dictionary.xba @@ -457,7 +457,7 @@ End Function ' ScriptForge.SF_Dictionary.GetProperty REM ----------------------------------------------------------------------------- Public Function ImportFromJson(Optional ByVal InputStr As Variant _ - , Optional Byval Overwrite As Variant _ + , Optional ByVal Overwrite As Variant _ ) As Boolean ''' Adds the content of a Json string into the current dictionary ''' JSON = JavaScript Object Notation: https://en.wikipedia.org/wiki/JSON @@ -544,7 +544,7 @@ End Function ' ScriptForge.SF_Dictionary.ImportFromJson REM ----------------------------------------------------------------------------- Public Function ImportFromPropertyValues(Optional ByVal PropertyValues As Variant _ - , Optional Byval Overwrite As Variant _ + , Optional ByVal Overwrite As Variant _ ) As Boolean ''' Adds the content of an array of PropertyValues into the current dictionary ''' Names contain Keys, Values contain Items @@ -952,4 +952,4 @@ Const cstSeparator = ", " End Function ' ScriptForge.SF_Dictionary._Repr REM ============================================ END OF SCRIPTFORGE.SF_DICTIONARY -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/scriptforge/SF_FileSystem.xba b/wizards/source/scriptforge/SF_FileSystem.xba index 4551caf4973e..3f38d141e5fd 100644 --- a/wizards/source/scriptforge/SF_FileSystem.xba +++ b/wizards/source/scriptforge/SF_FileSystem.xba @@ -1517,7 +1517,7 @@ Catch: End Function ' ScriptForge.SF_FileSystem.PickFile REM ----------------------------------------------------------------------------- -Public Function PickFolder(Optional ByVal DefaultFolder As variant _ +Public Function PickFolder(Optional ByVal DefaultFolder As Variant _ , Optional ByVal FreeText As Variant _ ) As String ''' Display a FolderPicker dialog box @@ -2085,4 +2085,4 @@ Dim sFolder As String ' Folder End Function ' ScriptForge.SF_FileSystem._SFInstallFolder REM ============================================ END OF SCRIPTFORGE.SF_FileSystem -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/scriptforge/SF_Services.xba b/wizards/source/scriptforge/SF_Services.xba index a2a96cb088c6..d77058cb3ba0 100644 --- a/wizards/source/scriptforge/SF_Services.xba +++ b/wizards/source/scriptforge/SF_Services.xba @@ -100,7 +100,7 @@ Dim vServicesList As Variant ' Output of RegisterScriptServices Dim vSplit As Variant ' Array to split argument in Dim sLibrary As String ' Library part of the argument Dim sService As String ' Service part of the argument -Dim vLibrary As variant ' Dictionary of libraries +Dim vLibrary As Variant ' Dictionary of libraries Dim vService As Variant ' An individual service object Const cstThisSub = "SF_Services.CreateScriptService" Const cstSubArgs = "Service, arg0[, arg1] ..." @@ -612,4 +612,4 @@ Catch: End Function ' ScriptForge.SF_Services._NewTimer REM ============================================== END OF SCRIPTFORGE.SF_SERVICES -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/scriptforge/SF_Utils.xba b/wizards/source/scriptforge/SF_Utils.xba index 2968209aafb3..8b8b8d7eea93 100644 --- a/wizards/source/scriptforge/SF_Utils.xba +++ b/wizards/source/scriptforge/SF_Utils.xba @@ -594,7 +594,7 @@ REM ---------------------------------------------------------------------------- Public Function _SetPropertyValue(ByVal pvPropertyValue As Variant _ , ByVal psName As String _ , ByRef pvValue As Variant _ - ) As variant + ) As Variant ''' Return the 1st argument (passed by reference), which is an array of property values ''' If the property psName exists, update it with pvValue, otherwise create it on top of the returned array @@ -986,4 +986,4 @@ Dim iType As Integer ' VarType of argument End Function ' ScriptForge.SF_Utils._VarTypeExt REM ================================================= END OF SCRIPTFORGE.SF_UTILS -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/scriptforge/_CodingConventions.xba b/wizards/source/scriptforge/_CodingConventions.xba index 71fb42c77201..913c8b254810 100644 --- a/wizards/source/scriptforge/_CodingConventions.xba +++ b/wizards/source/scriptforge/_CodingConventions.xba @@ -97,4 +97,4 @@ REM ============================================================================ ' * Comments about a code block should be left indented. ' If it concerns only the next line, no indent required (may also be put at the end of the line). ''' -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/sfdatabases/SF_Database.xba b/wizards/source/sfdatabases/SF_Database.xba index a03f90e6ee55..6d3aa99f6381 100644 --- a/wizards/source/sfdatabases/SF_Database.xba +++ b/wizards/source/sfdatabases/SF_Database.xba @@ -670,7 +670,7 @@ Private Function _GetColumnValue(ByRef poResultSet As Object _ ''' as long as its length does not exceed a maximum length. ''' Default = False: binary fields are not returned, only their length ''' Returns: -''' The variant value found in the column +''' The Variant value found in the column ''' Dates and times are returned as Basic dates ''' Null values are returned as Null ''' Errors or strange data types are returned as Null as well @@ -822,4 +822,4 @@ Private Function _Repr() As String End Function ' SFDatabases.SF_Database._Repr REM ============================================ END OF SFDATABASES.SF_DATABASE -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/sfdocuments/SF_Form.xba b/wizards/source/sfdocuments/SF_Form.xba index 93beee283c37..43e6bb513351 100644 --- a/wizards/source/sfdocuments/SF_Form.xba +++ b/wizards/source/sfdocuments/SF_Form.xba @@ -1325,7 +1325,7 @@ Private Function _PropertyGet(Optional ByVal psProperty As String) As Variant ''' psProperty: the name of the property Static oSession As Object ' Alias of SF_Session -Dim vBookmark As variant ' Form bookmark +Dim vBookmark As Variant ' Form bookmark Dim cstThisSub As String Const cstSubArgs = "" @@ -1531,4 +1531,4 @@ Dim sParent As String ' To recognize the parent End Function ' SFDocuments.SF_Form._Repr REM ============================================ END OF SFDOCUMENTS.SF_FORM -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/sfdocuments/SF_FormControl.xba b/wizards/source/sfdocuments/SF_FormControl.xba index ac120772e175..c0db1d6cf92b 100644 --- a/wizards/source/sfdocuments/SF_FormControl.xba +++ b/wizards/source/sfdocuments/SF_FormControl.xba @@ -1147,7 +1147,7 @@ Private Function _ListboxBound() As Boolean ''' If they are different, then there is a bound column Dim bListboxBound As Boolean ' Return value -Dim vValue() As variant ' Alias of the control model ValueItemList +Dim vValue() As Variant ' Alias of the control model ValueItemList Dim vString() As Variant ' Alias of the control model StringItemList Dim i As Long @@ -1885,4 +1885,4 @@ Private Function _Repr() As String End Function ' SFDocuments.SF_FormControl._Repr REM ============================================ END OF SFDOCUMENTS.SF_FORMCONTROL -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba index 4c2802f1a8cb..bb1593a20c5a 100644 --- a/wizards/source/tools/Strings.xba +++ b/wizards/source/tools/Strings.xba @@ -161,7 +161,7 @@ End Sub Function FieldInArray(LocArray(), MaxIndex as integer, LocField as String) As Boolean Dim i as integer For i = Lbound(LocArray()) to MaxIndex - If Ucase(LocArray(i)) = Ucase(LocField) Then + If UCase(LocArray(i)) = UCase(LocField) Then FieldInArray = True Exit Function End if @@ -189,7 +189,7 @@ End Function Function IndexInArray(SearchString as String, LocList()) as Integer Dim i as integer For i = Lbound(LocList(),1) to Ubound(LocList(),1) - If Ucase(LocList(i,0)) = Ucase(SearchString) Then + If UCase(LocList(i,0)) = UCase(SearchString) Then IndexInArray = i Exit Function End if @@ -224,7 +224,7 @@ Dim CurFieldString as String End If For i = Lbound(SearchList()) to MaxIndex CurFieldString = SearchList(i,SearchIndex) - If Ucase(CurFieldString) = Ucase(SearchString) Then + If UCase(CurFieldString) = UCase(SearchString) Then StringInMultiArray() = SearchList(i,ReturnIndex) Exit Function End if @@ -293,7 +293,7 @@ End Function Function FindSecondValue(SearchString as String, TwoDimList() as String ) as String Dim i as Integer For i = 0 To Ubound(TwoDimList,1) - If Ucase(SearchString) = Ucase(TwoDimList(i,0)) Then + If UCase(SearchString) = UCase(TwoDimList(i,0)) Then FindSecondValue = TwoDimList(i,1) Exit For End If |