更新

API.bas

@@ -198,14 +198,14 @@ Public Function pFootInXY(P, a, b)
     If a(1) = b(1) Then
         pFootInXY = Array(P(0), a(1), 0#): Exit Function
     End If
-    Dim aa, bb, c, d, x, y
+    Dim aa, bb, c, d, x, Y
     aa = (a(1) - b(1)) / (a(0) - b(0))
     bb = a(1) - aa * a(0)
     c = -(a(0) - b(0)) / (a(1) - b(1))
     d = P(1) - c * P(0)
     x = (d - bb) / (aa - c)
-    y = aa * x + bb
-    pFootInXY = Array(x, y, 0#)
+    Y = aa * x + bb
+    pFootInXY = Array(x, Y, 0#)
 End Function
 
 

Form/LinesForm.frm

@@ -16,6 +16,7 @@ Attribute VB_Exposed = False
 '// This is free and unencumbered software released into the public domain.
 '// For more information, please refer to  https://github.com/hongwenjun
 
+<<<<<<< HEAD
 '// 插件名称 VBA_UserForm
 Private Const TOOLNAME As String = "LYVBA"
 Private Const SECTION As String = "LinesForm"
@@ -45,6 +46,8 @@ Sub saveFormPos(bDoSave As Boolean)
   End If
 End Sub
 
+=======
+>>>>>>> 06150b8661ccde06bd8f1e2522c77ce48be72b83
 Private Sub MyPen_Click()
 On Error GoTo ErrorHandler
   API.BeginOpt
@@ -55,7 +58,11 @@ End Sub
 
 
 '// 左键右键Ctrl三键控制
+<<<<<<< HEAD
 Private Sub PenDrawLines_MouseDown(ByVal Button As Integer, ByVal Shift As Integer, ByVal x As Single, ByVal y As Single)
+=======
+Private Sub PenDrawLines_MouseDown(ByVal Button As Integer, ByVal Shift As Integer, ByVal x As Single, ByVal Y As Single)
+>>>>>>> 06150b8661ccde06bd8f1e2522c77ce48be72b83
 On Error GoTo ErrorHandler
   API.BeginOpt
   If Button = 2 Then