summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas S├Ąger <villeroy@t-online.de>2017-03-26 23:34:35 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-03-27 06:57:26 +0000
commit7fb7b091e963d8c45abf1db1202a88f2e188e9b0 (patch)
tree287de1d4dd147153de690a3261526e2417f4ce77
parenta403671af80be1e1563eea013d155e6a0635f0f0 (diff)
tdf#106529: fix closing parentheses of bundled macros
Change-Id: I43b6d4f97cb3b1cd1426e6aa7e13550d94cb7c51 Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/35726 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit ad4857211bcc39ccd4c84c670bfab1b937f65089) Reviewed-on: https://gerrit.libreoffice.org/35741
-rw-r--r--wizards/source/depot/Currency.xba4
-rw-r--r--wizards/source/depot/Internet.xba4
-rw-r--r--wizards/source/formwizard/DBMeta.xba6
-rw-r--r--wizards/source/formwizard/FormWizard.xba6
-rw-r--r--wizards/source/formwizard/Language.xba14
5 files changed, 17 insertions, 17 deletions
diff --git a/wizards/source/depot/Currency.xba b/wizards/source/depot/Currency.xba
index 5a428d757246..d728424d3214 100644
--- a/wizards/source/depot/Currency.xba
+++ b/wizards/source/depot/Currency.xba
@@ -89,7 +89,7 @@ Dim bIsDocCountry as Boolean
End If
sCurStockIDLabel = sMarket(Index,5)
sCurExtension = sMarket(Index,8)
- iValueCol = Val(sMarket(Index,10)
+ iValueCol = Val(sMarket(Index,10))
If Instr(sCurExtension,&quot;;&quot;) &lt;&gt; 0 Then
&apos; Take the german extension as the stock place is Frankfurt
sCurExtension = &quot;407&quot;
@@ -192,4 +192,4 @@ Function CheckFormatType(oStyle as Object)
Dim oFormatofObject as Object
oFormatofObject = oDocFormats.getByKey(oStyle.NumberFormat)
CheckFormatType = INT(oFormatOfObject.Type) AND com.sun.star.util.NumberFormat.CURRENCY
-End Function</script:module> \ No newline at end of file
+End Function</script:module>
diff --git a/wizards/source/depot/Internet.xba b/wizards/source/depot/Internet.xba
index b4bcf579b808..333bcf98af89 100644
--- a/wizards/source/depot/Internet.xba
+++ b/wizards/source/depot/Internet.xba
@@ -223,7 +223,7 @@ Dim iCellValue as Long
If iCellValue &gt; 0 Then
oCell.SetValue(oLinkSheet.GetCellByPosition(0,i).Value)
Else
- oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String)
+ oCell.SetValue(StringToDate(oLinkSheet.GetCellByPosition(0,i).String))
End If
oCell = oSheet.GetCellbyPosition(SBVALUECOLUMN,iCurRow)
oCell.SetValue(oLinkSheet.GetCellByPosition(4,i).Value)
@@ -353,4 +353,4 @@ Dim bLeaveLoop as Boolean
oDateCell.Annotation.SetString(NoteText)
End If
End Sub
-</script:module> \ No newline at end of file
+</script:module>
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba
index 68759966daf9..b0fa20b7a901 100644
--- a/wizards/source/formwizard/DBMeta.xba
+++ b/wizards/source/formwizard/DBMeta.xba
@@ -305,8 +305,8 @@ Dim MaxQueryIndex as Integer
Dim MaxIndex as Integer
Dim i as Integer
Dim a as Integer
- MaxTableIndex = Ubound(TableNames()
- MaxQueryIndex = Ubound(QueryNames()
+ MaxTableIndex = Ubound(TableNames())
+ MaxQueryIndex = Ubound(QueryNames())
MaxIndex = MaxTableIndex + MaxQueryIndex + 1
If MaxIndex &gt; -1 Then
Dim LocCommandTypes(MaxIndex) as Integer
@@ -344,4 +344,4 @@ Function AssignFieldLength(FieldLength as Long) as Integer
AssignFieldLength() = FieldLength
End If
End Function
-</script:module> \ No newline at end of file
+</script:module>
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index ffc2c4267e52..873ce4b22dea 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -153,11 +153,11 @@ Dim LocList() as String
DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItem(sContent, True)
Else
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)
ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then
- SelIndex = IndexInArray(sContent, TableNames()
- DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True)
+ SelIndex = IndexInArray(sContent, TableNames())
+ DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True))
End If
End If
CurCommandType = CommandType
diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba
index 40a0e5893ac0..a175a7d2a46b 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -64,7 +64,7 @@ Sub LoadLanguage ()
sMsgErrTitleSuggestedExist = GetResText(RID_COMMON + 10)
sMsgErrTitleAsTableExist = GetResText(RID_COMMON + 10)
sMsgErrTitleSyntaxError = GetResText(RID_COMMON + 11)
- sMsgNoConnection = GetResText(RID_COMMON + 14
+ sMsgNoConnection = GetResText(RID_COMMON + 14)
sMsgProgressText = GetResText(RID_FORM + 2)
sMsgCreatedForm = GetResText(RID_FORM + 26)
sMsgErrNameToLong = GetResText (RID_FORM + 27)
@@ -129,12 +129,12 @@ Dim slblFields as String
.optAlign2.Label = GetResText(RID_FORM + 34)
.optAlign0.State = 1
- //FIXME: Remove this unused FNameAddOn through the file
+ REM//FIXME: Remove this unused FNameAddOn through the file
FNameAddOn = &quot;&quot;
IDArray = Array(36, 37, 40, 38, 39)
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.Model.ImageURL = FormPath &amp; &quot;Arrange_&quot; &amp; i &amp; FNameAddOn &amp; &quot;.gif&quot;
cmdButton.Model.HelpText = ButtonHelpText
@@ -156,10 +156,10 @@ Dim slblFields as String
&apos; .cmdArrange5.HelpText = GetResText(RID_FORM + 39)
sWriterFilterName = GetResText(RID_FORM + 70)
End With
- 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;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;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;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;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;))