Kaydet (Commit) ad485721 authored tarafından Andreas Säger's avatar Andreas Säger Kaydeden (comit) Mike Kaganski

tdf#106529: fix closing parentheses of bundled macros

Change-Id: I43b6d4f97cb3b1cd1426e6aa7e13550d94cb7c51
Signed-off-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/35726Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 23282b47
...@@ -89,7 +89,7 @@ Dim bIsDocCountry as Boolean ...@@ -89,7 +89,7 @@ Dim bIsDocCountry as Boolean
End If End If
sCurStockIDLabel = sMarket(Index,5) sCurStockIDLabel = sMarket(Index,5)
sCurExtension = sMarket(Index,8) sCurExtension = sMarket(Index,8)
iValueCol = Val(sMarket(Index,10) iValueCol = Val(sMarket(Index,10))
If Instr(sCurExtension,&quot;;&quot;) &lt;&gt; 0 Then If Instr(sCurExtension,&quot;;&quot;) &lt;&gt; 0 Then
&apos; Take the german extension as the stock place is Frankfurt &apos; Take the german extension as the stock place is Frankfurt
sCurExtension = &quot;407&quot; sCurExtension = &quot;407&quot;
...@@ -192,4 +192,4 @@ Function CheckFormatType(oStyle as Object) ...@@ -192,4 +192,4 @@ Function CheckFormatType(oStyle as Object)
Dim oFormatofObject as Object Dim oFormatofObject as Object
oFormatofObject = oDocFormats.getByKey(oStyle.NumberFormat) oFormatofObject = oDocFormats.getByKey(oStyle.NumberFormat)
CheckFormatType = INT(oFormatOfObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY CheckFormatType = INT(oFormatOfObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY
End Function</script:module> End Function</script:module>
\ No newline at end of file
...@@ -223,7 +223,7 @@ Dim iCellValue as Long ...@@ -223,7 +223,7 @@ Dim iCellValue as Long
If iCellValue &gt; 0 Then If iCellValue &gt; 0 Then
oCell.SetValue(oLinkSheet.GetCellByPosition(0,i).Value) oCell.SetValue(oLinkSheet.GetCellByPosition(0,i).Value)
Else Else
oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String) oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String))
End If End If
oCell = oSheet.GetCellbyPosition(SBVALUECOLUMN,iCurRow) oCell = oSheet.GetCellbyPosition(SBVALUECOLUMN,iCurRow)
oCell.SetValue(oLinkSheet.GetCellByPosition(4,i).Value) oCell.SetValue(oLinkSheet.GetCellByPosition(4,i).Value)
...@@ -353,4 +353,4 @@ Dim bLeaveLoop as Boolean ...@@ -353,4 +353,4 @@ Dim bLeaveLoop as Boolean
oDateCell.Annotation.SetString(NoteText) oDateCell.Annotation.SetString(NoteText)
End If End If
End Sub End Sub
</script:module> </script:module>
\ No newline at end of file
...@@ -305,8 +305,8 @@ Dim MaxQueryIndex as Integer ...@@ -305,8 +305,8 @@ Dim MaxQueryIndex as Integer
Dim MaxIndex as Integer Dim MaxIndex as Integer
Dim i as Integer Dim i as Integer
Dim a as Integer Dim a as Integer
MaxTableIndex = Ubound(TableNames() MaxTableIndex = Ubound(TableNames())
MaxQueryIndex = Ubound(QueryNames() MaxQueryIndex = Ubound(QueryNames())
MaxIndex = MaxTableIndex + MaxQueryIndex + 1 MaxIndex = MaxTableIndex + MaxQueryIndex + 1
If MaxIndex &gt; -1 Then If MaxIndex &gt; -1 Then
Dim LocCommandTypes(MaxIndex) as Integer Dim LocCommandTypes(MaxIndex) as Integer
...@@ -344,4 +344,4 @@ Function AssignFieldLength(FieldLength as Long) as Integer ...@@ -344,4 +344,4 @@ Function AssignFieldLength(FieldLength as Long) as Integer
AssignFieldLength() = FieldLength AssignFieldLength() = FieldLength
End If End If
End Function End Function
</script:module> </script:module>
\ No newline at end of file
...@@ -151,11 +151,11 @@ Dim LocList() as String ...@@ -151,11 +151,11 @@ Dim LocList() as String
DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItem(sContent, True) DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItem(sContent, True)
Else Else
If CommandType = com.sun.star.sdb.CommandType.QUERY Then If CommandType = com.sun.star.sdb.CommandType.QUERY Then
SelIndex = IndexInArray(sContent, QueryNames() SelIndex = IndexInArray(sContent, QueryNames())
DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(SelIndex, True) DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(SelIndex, True)
ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then
SelIndex = IndexInArray(sContent, TableNames() SelIndex = IndexInArray(sContent, TableNames())
DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True) DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True))
End If End If
End If End If
CurCommandType = CommandType CurCommandType = CommandType
......
...@@ -64,7 +64,7 @@ Sub LoadLanguage () ...@@ -64,7 +64,7 @@ Sub LoadLanguage ()
sMsgErrTitleSuggestedExist = GetResText(RID_COMMON + 10) sMsgErrTitleSuggestedExist = GetResText(RID_COMMON + 10)
sMsgErrTitleAsTableExist = GetResText(RID_COMMON + 10) sMsgErrTitleAsTableExist = GetResText(RID_COMMON + 10)
sMsgErrTitleSyntaxError = GetResText(RID_COMMON + 11) sMsgErrTitleSyntaxError = GetResText(RID_COMMON + 11)
sMsgNoConnection = GetResText(RID_COMMON + 14 sMsgNoConnection = GetResText(RID_COMMON + 14)
sMsgProgressText = GetResText(RID_FORM + 2) sMsgProgressText = GetResText(RID_FORM + 2)
sMsgCreatedForm = GetResText(RID_FORM + 26) sMsgCreatedForm = GetResText(RID_FORM + 26)
sMsgErrNameToLong = GetResText (RID_FORM + 27) sMsgErrNameToLong = GetResText (RID_FORM + 27)
...@@ -129,12 +129,12 @@ Dim slblFields as String ...@@ -129,12 +129,12 @@ Dim slblFields as String
.optAlign2.Label = GetResText(RID_FORM + 34) .optAlign2.Label = GetResText(RID_FORM + 34)
.optAlign0.State = 1 .optAlign0.State = 1
//FIXME: Remove this unused FNameAddOn through the file REM//FIXME: Remove this unused FNameAddOn through the file
FNameAddOn = &quot;&quot; FNameAddOn = &quot;&quot;
IDArray = Array(36, 37, 40, 38, 39) IDArray = Array(36, 37, 40, 38, 39)
For i = 1 To 5 For i = 1 To 5
ButtonHelpText = GetResText(RID_FORM + IDArray(i-1) ButtonHelpText = GetResText(RID_FORM + IDArray(i-1))
cmdButton = DlgFormDB.getControl(&quot;cmdArrange&quot; &amp; i) cmdButton = DlgFormDB.getControl(&quot;cmdArrange&quot; &amp; i)
cmdButton.Model.ImageURL = FormPath &amp; &quot;Arrange_&quot; &amp; i &amp; FNameAddOn &amp; &quot;.gif&quot; cmdButton.Model.ImageURL = FormPath &amp; &quot;Arrange_&quot; &amp; i &amp; FNameAddOn &amp; &quot;.gif&quot;
cmdButton.Model.HelpText = ButtonHelpText cmdButton.Model.HelpText = ButtonHelpText
...@@ -156,10 +156,10 @@ Dim slblFields as String ...@@ -156,10 +156,10 @@ Dim slblFields as String
&apos; .cmdArrange5.HelpText = GetResText(RID_FORM + 39) &apos; .cmdArrange5.HelpText = GetResText(RID_FORM + 39)
sWriterFilterName = GetResText(RID_FORM + 70) sWriterFilterName = GetResText(RID_FORM + 70)
End With End With
DlgFormDB.GetControl(&quot;cmdMoveSelected&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 39) DlgFormDB.GetControl(&quot;cmdMoveSelected&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 39))
DlgFormDB.GetControl(&quot;cmdRemoveSelected&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 40) DlgFormDB.GetControl(&quot;cmdRemoveSelected&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 40))
DlgFormDB.GetControl(&quot;cmdMoveAll&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 41) DlgFormDB.GetControl(&quot;cmdMoveAll&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 41))
DlgFormDB.GetControl(&quot;cmdRemoveAll&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 42) DlgFormDB.GetControl(&quot;cmdRemoveAll&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, GetResText(RID_COMMON + 42))
DlgFormDB.getControl(&quot;lstFields&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, DeleteStr(slblFields, &quot;~&quot;)) DlgFormDB.getControl(&quot;lstFields&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, DeleteStr(slblFields, &quot;~&quot;))
DlgFormDB.getControl(&quot;lstSelFields&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, DeleteStr(slblSelFields, &quot;~&quot;)) DlgFormDB.getControl(&quot;lstSelFields&quot;).getPeer().setProperty(&quot;AccessibleName&quot;, DeleteStr(slblSelFields, &quot;~&quot;))
......
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