diff --git a/Numbering-ExcelAddin.xlam b/Numbering-ExcelAddin.xlam index 60830a2..5ac011c 100644 Binary files a/Numbering-ExcelAddin.xlam and b/Numbering-ExcelAddin.xlam differ diff --git a/source/Model.bas b/source/Model.bas index 1114412..e34adf9 100644 --- a/source/Model.bas +++ b/source/Model.bas @@ -90,8 +90,8 @@ Public Sub initModel() ' リボン起動時に初期化 SELECT_SORT_ORDER = SORT_ORDER_ROW - COLLISION_NUM_STRING = "20px (標準)" - COLLISION = 20 + COLLISION_NUM_STRING = "0.50倍 (標準)" + COLLISION = 0.50 START_NUM = 1 IS_CHANGE_TEXT = TRUE IS_SELECT_FIGURE = TRUE diff --git a/source/View.bas b/source/View.bas index d00eb70..f491d7a 100644 --- a/source/View.bas +++ b/source/View.bas @@ -132,22 +132,26 @@ Sub onCollisionTextChange(ByRef control As IRibbonControl, ByRef text As String) COLLISION_NUM_STRING = text Select Case text - Case "0px" + Case "0倍 (非隣接)" COLLISION = 0 - Case "10px" - COLLISION = 10 - Case "20px (標準)" - COLLISION = 20 - Case "30px" - COLLISION = 30 + Case "0.25倍" + COLLISION = 0.25 + Case "0.50倍 (標準)" + COLLISION = 0.50 + Case "0.75倍" + COLLISION = 0.75 + Case "1.00倍" + COLLISION = 1.00 Case Else - Dim s As String - s = Replace(text, "px", "") - If IsNumeric(s) Then - COLLISION = CLng(s) + Dim strDbl As String + strDbl = Trim(text) + strDbl = Replace(strDbl, "倍", "") + strDbl = Trim(strDbl) + If IsNumeric(strDbl) Then + COLLISION = CDbl(strDbl) Else Dim message As String - message = "数値を入力してください。(単位: px), 現在の値=" & text + message = "数値を入力してください。(単位: 倍), 現在の値=" & text Call setMsgAndStatus(message) End If End Select diff --git a/source/customUI14.xml b/source/customUI14.xml index 8d0e748..909d882 100644 --- a/source/customUI14.xml +++ b/source/customUI14.xml @@ -28,13 +28,14 @@ - - - - + + + + +