Skip to content

Commit 45e661a

Browse files
tduguidtduguid
tduguid
authored and
tduguid
committed
Removed the Call statement from procedures
1 parent 3403107 commit 45e661a

File tree

5 files changed

+20
-62
lines changed

5 files changed

+20
-62
lines changed

‎VB/ScriptHelp.vbproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,6 @@
230230
-->
231231
<ItemGroup>
232232
<AppDesigner Include="My Project\" />
233-
<Compile Include="Forms\frmSettings.designer.vb">
234-
<DependentUpon>frmSettings.vb</DependentUpon>
235-
</Compile>
236-
<Compile Include="Forms\frmSettings.vb">
237-
<SubType>Form</SubType>
238-
</Compile>
239233
<Compile Include="My Project\Resources.Designer.vb">
240234
<AutoGen>True</AutoGen>
241235
<DesignTime>True</DesignTime>
@@ -291,9 +285,6 @@
291285
<DependentUpon>ThisAddIn.Designer.xml</DependentUpon>
292286
</Compile>
293287
<Compile Include="My Project\AssemblyInfo.vb" />
294-
<EmbeddedResource Include="Forms\frmSettings.resx">
295-
<DependentUpon>frmSettings.vb</DependentUpon>
296-
</EmbeddedResource>
297288
<EmbeddedResource Include="My Project\Resources.resx">
298289
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
299290
<CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -400,7 +391,7 @@
400391
<ProjectExtensions>
401392
<VisualStudio>
402393
<FlavorProperties GUID="{BAA0C2D2-18E2-41B9-852F-F413020CAA33}">
403-
<ProjectProperties HostName="Excel" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Excel" Language="vb" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\15.0\Excel\InstallRoot\Path#excel.exe" DebugInfoCommandLine="/x " AddItemTemplatesGuid="{DCFE8D25-4715-4C33-9EAB-A34A9EBC9544}" />
394+
<ProjectProperties HostName="Excel" HostPackage="{29A7B9D7-A7F1-4328-8EF0-6B2D1A56B2C1}" OfficeVersion="15.0" VstxVersion="4.0" ApplicationType="Excel" Language="vb" TemplatesPath="VSTOTemplates" DebugInfoExeName="#Software\Microsoft\Office\16.0\Excel\InstallRoot\Path#excel.exe" DebugInfoCommandLine="/x " AddItemTemplatesGuid="{DCFE8D25-4715-4C33-9EAB-A34A9EBC9544}" />
404395
<Host Name="Excel" PublishedHash="69C324AB27932AA2FBF2B7EA72250886FF164DE6" IconIndex="0">
405396
<HostItem Name="ThisAddIn" Code="ThisAddIn.vb" CanonicalName="AddIn" PublishedHash="501F60F3B8BAF1916C7D50AECC5342A51A6B73BE" CanActivate="false" IconIndex="1" Blueprint="ThisAddIn.Designer.xml" GeneratedCode="ThisAddIn.Designer.vb" />
406397
</Host>

‎VB/Scripts/Form.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Namespace Scripts
2121
currentForm.Icon = Icon.FromHandle(bmp.GetHicon)
2222

2323
Catch ex As Exception
24-
Call ErrorHandler.DisplayMessage(ex)
24+
ErrorHandler.DisplayMessage(ex)
2525
Exit Try
2626

2727
End Try
@@ -66,7 +66,7 @@ Namespace Scripts
6666
End If
6767
Next
6868
Catch ex As Exception
69-
Call ErrorHandler.DisplayMessage(ex)
69+
ErrorHandler.DisplayMessage(ex)
7070
End Try
7171
End If
7272
End Sub

‎VB/Scripts/Ribbon.vb‎

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Namespace Scripts
2828
Public Shared myTableData As TableData
2929
Public Shared myTaskPaneTableData As Microsoft.Office.Tools.CustomTaskPane
3030

31-
'Public NotInheritable Class AppVariables
3231
Public Class AppVariables
3332
Private Sub New()
3433
End Sub
@@ -148,7 +147,7 @@ Namespace Scripts
148147
End Select
149148

150149
Catch ex As Exception
151-
Call ErrorHandler.DisplayMessage(ex)
150+
ErrorHandler.DisplayMessage(ex)
152151
Return Nothing
153152

154153
End Try
@@ -176,7 +175,7 @@ Namespace Scripts
176175
End Select
177176

178177
Catch ex As Exception
179-
Call ErrorHandler.DisplayMessage(ex)
178+
ErrorHandler.DisplayMessage(ex)
180179
Return String.Empty
181180

182181
End Try
@@ -216,30 +215,23 @@ Namespace Scripts
216215
End Function
217216

218217
Public Sub GetSelectedItemID(ByVal Control As Office.IRibbonControl, ByRef itemID As Object)
219-
'--------------------------------------------------------------------------------------------------------------------
220-
' to assign text to controls on the ribbon from the xml file
221-
'--------------------------------------------------------------------------------------------------------------------
222218
Try
223219
Select Case Control.Id.ToString
224220
Case Is = "drpQueryType"
225-
itemID = "UPDATE" 'My.Settings.TSQL_QUERY_TYPE
226-
'itemID = Range(My.Settings.TSQL_QUERY_TYPE).Value2
221+
itemID = "UPDATE"
227222
Case Else
228223
itemID = String.Empty
229224
End Select
230225

231226
Catch ex As Exception
232-
Call ErrorHandler.DisplayMessage(ex)
227+
ErrorHandler.DisplayMessage(ex)
233228
itemID = String.Empty
234229

235230
End Try
236231

237232
End Sub
238233

239234
Public Function GetCount(ByVal Control As Office.IRibbonControl) As Integer
240-
'--------------------------------------------------------------------------------------------------------------------
241-
' to assign how many items for the control
242-
'--------------------------------------------------------------------------------------------------------------------
243235
Try
244236
Select Case Control.Id.ToString
245237
Case Is = "drpQueryType"
@@ -249,17 +241,14 @@ Namespace Scripts
249241
End Select
250242

251243
Catch ex As Exception
252-
Call ErrorHandler.DisplayMessage(ex)
244+
ErrorHandler.DisplayMessage(ex)
253245
Return 0
254246

255247
End Try
256248

257249
End Function
258250

259251
Public Function GetLabel(ByVal Control As Office.IRibbonControl, Index As Integer) As String
260-
'--------------------------------------------------------------------------------------------------------------------
261-
' to assign text to control items index
262-
'--------------------------------------------------------------------------------------------------------------------
263252
Try
264253
Select Case Control.Id.ToString
265254
Case Is = "drpQueryType"
@@ -276,7 +265,7 @@ Namespace Scripts
276265
End Select
277266

278267
Catch ex As Exception
279-
Call ErrorHandler.DisplayMessage(ex)
268+
ErrorHandler.DisplayMessage(ex)
280269
Return String.Empty
281270

282271
End Try
@@ -358,7 +347,7 @@ Namespace Scripts
358347
End Select
359348

360349
Catch ex As Exception
361-
Call ErrorHandler.DisplayMessage(ex)
350+
ErrorHandler.DisplayMessage(ex)
362351

363352
End Try
364353

@@ -433,7 +422,7 @@ Namespace Scripts
433422
End Select
434423

435424
Catch ex As Exception
436-
Call ErrorHandler.DisplayMessage(ex)
425+
ErrorHandler.DisplayMessage(ex)
437426
Return False
438427

439428
End Try
@@ -445,7 +434,7 @@ Namespace Scripts
445434
Return True
446435

447436
Catch ex As Exception
448-
Call ErrorHandler.DisplayMessage(ex)
437+
ErrorHandler.DisplayMessage(ex)
449438
Return False
450439

451440
End Try
@@ -806,19 +795,6 @@ Namespace Scripts
806795

807796
End Sub
808797

809-
'Public Sub OpenSettings2()
810-
' Try
811-
' Dim FormSettings As New frmSettings
812-
' FormSettings.ShowDialog()
813-
' ribbon.Invalidate()
814-
815-
' Catch ex As Exception
816-
' Call ErrorHandler.DisplayMessage(ex)
817-
818-
' End Try
819-
820-
'End Sub
821-
822798
Public Sub OpenSettings()
823799
Try
824800
If myTaskPaneSettings IsNot Nothing Then
@@ -895,7 +871,7 @@ Namespace Scripts
895871
End If
896872

897873
Catch ex As Exception
898-
Call ErrorHandler.DisplayMessage(ex)
874+
ErrorHandler.DisplayMessage(ex)
899875
Return String.Empty
900876

901877
End Try
@@ -964,17 +940,14 @@ Namespace Scripts
964940
Return Formatted(col, fmt)
965941

966942
Catch ex As Exception
967-
Call ErrorHandler.DisplayMessage(ex)
943+
ErrorHandler.DisplayMessage(ex)
968944
Return String.Empty
969945

970946
End Try
971947

972948
End Function
973949

974950
Friend Shared Function Formatted(ByVal col As Excel.ListColumn, fmt As String) As String
975-
'--------------------------------------------------------------------------------------------------------------------
976-
' Purpose: Generate a formula reference with optional text formatting
977-
'--------------------------------------------------------------------------------------------------------------------
978951
Try
979952
Formatted = "[" & col.Name & "]"
980953
If (fmt = "") Then
@@ -983,7 +956,7 @@ Namespace Scripts
983956
Return "TEXT(" & Formatted & ",""" & fmt & """)"
984957

985958
Catch ex As Exception
986-
Call ErrorHandler.DisplayMessage(ex)
959+
ErrorHandler.DisplayMessage(ex)
987960
Return String.Empty
988961

989962
End Try
@@ -1024,7 +997,7 @@ Namespace Scripts
1024997
End If
1025998

1026999
Catch ex As Exception
1027-
Call ErrorHandler.DisplayMessage(ex)
1000+
ErrorHandler.DisplayMessage(ex)
10281001
Return 0
10291002

10301003
End Try
@@ -1036,7 +1009,7 @@ Namespace Scripts
10361009
Return col(key)
10371010

10381011
Catch ex As Exception
1039-
'Call ErrorMsg(ex)
1012+
' ErrorMsg(ex)
10401013
Return Nothing
10411014

10421015
End Try
@@ -1061,7 +1034,7 @@ Namespace Scripts
10611034
Return tbl.ListColumns(colNum)
10621035

10631036
Catch ex As Exception
1064-
Call ErrorHandler.DisplayMessage(ex)
1037+
ErrorHandler.DisplayMessage(ex)
10651038
Return Nothing
10661039
Exit Try
10671040

@@ -1088,17 +1061,14 @@ Namespace Scripts
10881061
Return Nothing
10891062

10901063
Catch ex As Exception
1091-
Call ErrorHandler.DisplayMessage(ex)
1064+
ErrorHandler.DisplayMessage(ex)
10921065
Return Nothing
10931066

10941067
End Try
10951068

10961069
End Function
10971070

10981071
Public Sub OpenFile(ByVal FilePath As String)
1099-
'--------------------------------------------------------------------------------------------------------------------
1100-
' Purpose: open a file from the source list
1101-
'--------------------------------------------------------------------------------------------------------------------
11021072
Try
11031073
Dim pStart As New System.Diagnostics.Process
11041074
If FilePath = String.Empty Then Exit Try
@@ -1110,10 +1080,7 @@ Namespace Scripts
11101080
Exit Try
11111081

11121082
Catch ex As Exception
1113-
Call ErrorHandler.DisplayMessage(ex)
1114-
1115-
'Finally
1116-
' pStart = Nothing
1083+
ErrorHandler.DisplayMessage(ex)
11171084

11181085
End Try
11191086

‎VBA/ScriptHelp.xlam‎

482 Bytes
Binary file not shown.

‎VBA/ScriptHelp.xlsm‎

480 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)