[Libreoffice-commits] core.git: wizards/source

Matthew J . Francis Tue, 24 Mar 2015 23:41:39 -0700

 wizards/source/euro/Common.xba            |    2 +-
 wizards/source/euro/ConvertRun.xba        |    2 +-
 wizards/source/euro/Writer.xba            |    2 +-
 wizards/source/template/Autotext.xba      |    2 +-
 wizards/source/tools/Listbox.xba          |    4 ++--
 wizards/source/tools/Strings.xba          |   12 ++++++------
 wizards/source/tools/UCB.xba              |    2 +-
 wizards/source/tutorials/TutorialOpen.xba |    2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)


New commits:
commit ca07d5bef335b220139b858a5b54aa62983a66e1
Author: Matthew J. Francis <mjay.fran...@gmail.com>
Date:   Wed Mar 25 13:01:17 2015 +0800

    tdf#68547 TurkÄ±sh "Ä±" Ä±s specÄ±al
    
    Capital "i" is "Ä°"
    Small "I" is "Ä±"
    Therefore, any BASIC we ship had better be clean of case-insensitive 
function
    name comparisons (or at least those involving "i"s), because they will not
    work when the system locale is Turkish.
    
    Change-Id: Ibf3a35a55b6b1ba384731dfa92caf24b51245530
    Reviewed-on: https://gerrit.libreoffice.org/14995
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba
index 94a8b198b..550042e 100644
--- a/wizards/source/euro/Common.xba
+++ b/wizards/source/euro/Common.xba
@@ -159,7 +159,7 @@ Dim oFormatofObject() as Object
                CheckFormatType = False
                Exit Function
        End If
-       If FieldinArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then
+       If FieldInArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then
                &apos; If the Currencysymbol of the object is the one needed, 
then check the Currency extension
                sFormatCurrExt = oFormatofObject.CurrencyExtension
 
diff --git a/wizards/source/euro/ConvertRun.xba 
b/wizards/source/euro/ConvertRun.xba
index 61c50fc..caf28ef 100644
--- a/wizards/source/euro/ConvertRun.xba
+++ b/wizards/source/euro/ConvertRun.xba
@@ -286,7 +286,7 @@ End Sub
 
 &apos; Checks if a Field (LocField) is already defined in an Array
 &apos; Returns &apos;True&apos; or &apos;False&apos;
-Function FieldinList(LocList(), MaxIndex as integer, ByVal LocField ) As 
Boolean
+Function FieldInList(LocList(), MaxIndex as integer, ByVal LocField ) As 
Boolean
 Dim i as integer
        LocField = Ucase(LocField)
        For i = Lbound(LocList()) to MaxIndex
diff --git a/wizards/source/euro/Writer.xba b/wizards/source/euro/Writer.xba
index fa2b024..d747b46 100644
--- a/wizards/source/euro/Writer.xba
+++ b/wizards/source/euro/Writer.xba
@@ -74,7 +74,7 @@ Dim MaxIndex as Integer
                                        End If
                                ElseIf 
oTextField.TextFieldMaster.PropertySetInfo.HasPropertyByName(&quot;Value&quot;) 
Then
                                        CurInstanceName = 
oTextField.TextFieldMaster.InstanceName
-                                       If Not FieldinArray(InstanceNames(), 
MaxIndex, CurInstanceName) Then
+                                       If Not FieldInArray(InstanceNames(), 
MaxIndex, CurInstanceName) Then
                                                
oTextField.TextFieldMaster.Content = 
CStr(Round(oTextField.TextFieldMaster.Value/CurrFactor,2))
                                                InstanceNames(MaxIndex) = 
CurInstanceName
                                                MaxIndex = MaxIndex + 1
diff --git a/wizards/source/template/Autotext.xba 
b/wizards/source/template/Autotext.xba
index 5e41dc3..f99a54f 100644
--- a/wizards/source/template/Autotext.xba
+++ b/wizards/source/template/Autotext.xba
@@ -125,7 +125,7 @@ Sub CreateUserDatafield(oCursor, sFoundContent as String)
        oUserfield = 
oDocAuto.CreateInstance(&quot;com.sun.star.text.TextField.ExtendedUser&quot;)
        sFoundList() = ArrayoutofString(sFoundContent,&quot;:&quot;,MaxIndex)
        UserInfo = UCase(LTrim(sFoundList(1)))
-       UserIndex = IndexinArray(UserInfo, UserfieldDatatype())
+       UserIndex = IndexInArray(UserInfo, UserfieldDatatype())
        If UserIndex &lt;&gt; -1 Then
                oUserField.UserDatatype = UserIndex
                oCursor.Text.InsertTextContent(oCursor,oUserField,True)
diff --git a/wizards/source/tools/Listbox.xba b/wizards/source/tools/Listbox.xba
index 2ac741c..2f4e48b 100644
--- a/wizards/source/tools/Listbox.xba
+++ b/wizards/source/tools/Listbox.xba
@@ -172,10 +172,10 @@ Dim iOldSourceSelect as Integer
                m = 0
                For n = 0 To MaxOriginalIndex
                        SearchString = OriginalList(n)
-                       If IndexinArray(SearchString, SelList()) &lt;&gt; -1 
Then
+                       If IndexInArray(SearchString, SelList()) &lt;&gt; -1 
Then
                                NewSourceList(m) =  SearchString
                                m = m + 1
-                       ElseIf IndexinArray(SearchString, SourceList()) 
&lt;&gt; -1 Then
+                       ElseIf IndexInArray(SearchString, SourceList()) 
&lt;&gt; -1 Then
                                NewSourceList(m) =  SearchString
                                m = m + 1
                        End If
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index f91b8f4..d05555f 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -158,7 +158,7 @@ End Sub
 
 &apos; Checks if a Field (LocField) is already defined in an Array
 &apos; Returns &apos;True&apos; or &apos;False&apos;
-Function FieldinArray(LocArray(), MaxIndex as integer, LocField as String) As 
Boolean
+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
@@ -172,7 +172,7 @@ End Function
 
 &apos; Checks if a Field (LocField) is already defined in an Array
 &apos; Returns &apos;True&apos; or &apos;False&apos;
-Function FieldinList(LocField, BigList()) As Boolean
+Function FieldInList(LocField, BigList()) As Boolean
 Dim i as integer
        For i = Lbound(BigList()) to Ubound(BigList())
                If LocField = BigList(i) Then
@@ -186,15 +186,15 @@ End Function
 
 &apos; Retrieves the Index of the delivered String &apos;SearchString&apos; in
 &apos; the Array LocList()&apos;
-Function IndexinArray(SearchString as String, LocList()) as Integer
+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
-                       IndexinArray = i
+                       IndexInArray = i
                        Exit Function
                End if
        Next
-       IndexinArray = -1
+       IndexInArray = -1
 End Function
 
 
@@ -356,7 +356,7 @@ Dim LocFileName as String
 End Function
 
 
-Function CountCharsinString(BigString, LocChar as String, ByVal StartPos as 
Integer) as Integer
+Function CountCharsInString(BigString, LocChar as String, ByVal StartPos as 
Integer) as Integer
 Dim LocCount%, LocPos%
        LocCount = 0
        Do
diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba
index ed1ae1c..73d849c 100644
--- a/wizards/source/tools/UCB.xba
+++ b/wizards/source/tools/UCB.xba
@@ -89,7 +89,7 @@ Dim sFileArray(StartUbound,1) as String
                                                If RealFileContent &lt;&gt; 
&quot;&quot; Then
                                                        &apos; Retrieve the 
Index in the Array, where a Filename is positioned
                                                        If Not 
IsMissing(sFileContent()) Then
-                                                               If 
(FieldinArray(sFileContent(), Ubound(sFileContent), RealFileContent)) Then
+                                                               If 
(FieldInArray(sFileContent(), Ubound(sFileContent), RealFileContent)) Then
                                                                        &apos; 
The extension of the current file passes the filter and is therefore admitted 
to the
                                                                        &apos; 
fileList
                                                                        If Not 
IsMissing(sExtension) Then
diff --git a/wizards/source/tutorials/TutorialOpen.xba 
b/wizards/source/tutorials/TutorialOpen.xba
index 3511215..5b6001c 100644
--- a/wizards/source/tutorials/TutorialOpen.xba
+++ b/wizards/source/tutorials/TutorialOpen.xba
@@ -54,7 +54,7 @@ Sub Init
                        oDocInfo.Read(completPath)
                        sDocTitle = oDocInfo.Title
                        if(not isNull(sDocTitle) And len(sDocTitle) &gt; 0) Then
-                               oListbox.additem(sDocTitle,0)
+                               oListbox.addItem(sDocTitle,0)
                                tempFiles(tempCount) = completPath
                                tempCount = tempCount + 1
                        End If

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

Reply via email to