2018/02/04(sun) RelaxTools-Addin Version 4.17.2(RustRemover)

◇新規機能・フォルダ指定でブックをマージする処理を追加。 ◇バグ修正・全角文字列存在チェックでUndoが効かない不具合を修正。 ◇機能改善・結合セルを含む選択範囲での処理高速化。・A1保存のチェック処理簡略化。高速化を図る。・アイコンをちょとちょこと変更。・文書校正が使い物にならないのでひそかに削除。
RelaxTools · Feb 3, 2018 · 3c4d32a · 3c4d32a
1 parent cfefe63
commit 3c4d32a
Show file tree

Hide file tree

Showing 46 changed files with 544 additions and 188 deletions.
diff --git a/RelaxTools.xlam b/RelaxTools.xlam
diff --git a/Source/RelaxTools.xlsm b/Source/RelaxTools.xlsm
diff --git a/Source/customUI/_rels/customUI.xml.rels b/Source/customUI/_rels/customUI.xml.rels
diff --git a/Source/customUI/customUI.xml b/Source/customUI/customUI.xml
diff --git a/Source/src/Class/SelectionAllFrameWork.cls b/Source/src/Class/SelectionAllFrameWork.cls
@@ -122,7 +122,7 @@ Public Sub Run()
     For Each r In Selection
 
         ''フィルタおよび非表示対策。
-        If r.Rows.Hidden Or r.Columns.Hidden Then
+        If r.Rows.Hidden Or r.Columns.Hidden Or r.MergeArea(1).Address <> r.Address Then
             'フィルタまたは非表示の行・列の処理は行わない。
             GoTo pass
         End If

diff --git a/Source/src/Class/SelectionColFramework.cls b/Source/src/Class/SelectionColFramework.cls
@@ -158,7 +158,7 @@ Public Sub Run()
 
             For i = 1 To lngRows
                 ''フィルタおよび非表示対策。
-                If rArea(i, lngCur).Rows.Hidden Or rArea(i, lngCur).Columns.Hidden Then
+                If rArea(i, lngCur).Rows.Hidden Or rArea(i, lngCur).Columns.Hidden Or r.MergeArea(1).Address <> r.Address Then
                 Else
                     If r Is Nothing Then
                         Set r = rArea(i, lngCur)

diff --git a/Source/src/Class/SelectionFrameWork.cls b/Source/src/Class/SelectionFrameWork.cls
@@ -198,7 +198,7 @@ Public Sub Run()
     For Each r In a
 
         ''フィルタおよび非表示対策。
-        If r.Rows.Hidden Or r.Columns.Hidden Then
+        If r.Rows.Hidden Or r.Columns.Hidden Or r.MergeArea(1).Address <> r.Address Then
             'フィルタまたは非表示の行・列の処理は行わない。
         Else
 

diff --git a/Source/src/Class/SelectionRowFrameWork.cls b/Source/src/Class/SelectionRowFrameWork.cls
@@ -159,7 +159,7 @@ Public Sub Run()
 
             For i = 1 To lngCols
                 ''フィルタおよび非表示対策。
-                If rArea(lngCur, i).Rows.Hidden Or rArea(lngCur, i).Columns.Hidden Then
+                If rArea(lngCur, i).Rows.Hidden Or rArea(lngCur, i).Columns.Hidden Or r.MergeArea(1).Address <> r.Address Then
                 Else
                     If r Is Nothing Then
                         Set r = rArea(lngCur, i)

diff --git a/Source/src/Form/frmColor.frm b/Source/src/Form/frmColor.frm
@@ -70,7 +70,7 @@ Public Function Start(ByRef lngColor As Long) As VbMsgBoxResult
 
     mResult = vbCancel
 
-    Me.Show vbModal
+    Me.show vbModal
 
     If mResult = vbOK Then
         lngColor = mColor

diff --git a/Source/src/Form/frmContextMenuAdd.frm b/Source/src/Form/frmContextMenuAdd.frm
@@ -90,7 +90,7 @@ Sub Start(ByVal Mode As Boolean)
         Me.txtCat.Text = frmContextMenu.lstMenu1.Text
     End If
 
-    Me.Show
+    Me.show
 
 End Sub
 

diff --git a/Source/src/Form/frmFavCategory.frm b/Source/src/Form/frmFavCategory.frm
@@ -108,7 +108,7 @@ Sub Start(ByVal lngMode As Long)
             Me.txtCat.Text = frmFavorite.lstCategory.Text
     End Select
 
-    Me.Show
+    Me.show
 
 End Sub
 

diff --git a/Source/src/Form/frmFavEdit.frm b/Source/src/Form/frmFavEdit.frm
@@ -75,7 +75,7 @@ Function Start(ByVal lngMode As Long, ByRef strFile As String) As VbMsgBoxResult
             txtFile.Text = strFile
     End Select
 
-    Me.Show
+    Me.show
 
     If mResult = vbOK Then
         strFile = txtFile.Text

diff --git a/Source/src/Form/frmFavorite.frm b/Source/src/Form/frmFavorite.frm
@@ -796,7 +796,7 @@ Public Sub execOpen(ByVal blnReadOnly As Boolean)
                     Else
                         On Error Resume Next
                         Err.Clear
-                        Workbooks.Open filename:=strBook, ReadOnly:=blnReadOnly
+                        Workbooks.Open filename:=strBook, ReadOnly:=blnReadOnly, UpdateLinks:=0, IgnoreReadOnlyRecommended:=True
                         If Err.Number <> 0 Then
                             MsgBox "ブックを開けませんでした。", vbOKOnly + vbExclamation, C_TITLE
                         End If

diff --git a/Source/src/Form/frmGitResult.frm b/Source/src/Form/frmGitResult.frm
@@ -49,7 +49,7 @@ Public Sub Start(ByVal strMsg As String)
     txtResult.SelStart = Len(txtResult.Text)
     txtResult.SelStart = 0
 
-    Me.Show
+    Me.show
 
 End Sub
 

diff --git a/Source/src/Form/frmGrammer.frm b/Source/src/Form/frmGrammer.frm
@@ -685,7 +685,7 @@ Private Sub lstResult_Change()
                         objShape.Shapes(1).Select False
                     Else
                         blnFlg = True
-                        Application.Goto setCellPos(objArt.TopLeftCell), True
+                        Application.GoTo setCellPos(objArt.TopLeftCell), True
                         objShape.Shapes(1).Select
                     End If
                     On Error GoTo 0
@@ -695,7 +695,7 @@ Private Sub lstResult_Change()
                         objShape.Select False
                     Else
                         blnFlg = True
-                        Application.Goto setCellPos(objShape.TopLeftCell), True
+                        Application.GoTo setCellPos(objShape.TopLeftCell), True
                         objShape.Select
                     End If
                     On Error GoTo 0
@@ -704,7 +704,7 @@ Private Sub lstResult_Change()
             End If
         Next
 
-        Me.Show
+        Me.show
 
     End If
 End Sub
@@ -866,7 +866,7 @@ Public Sub Start(ByVal lngTab As Long)
 
 '    schTab.value = lngTab
 
-    Me.Show
+    Me.show
 
 End Sub
 

diff --git a/Source/src/Form/frmGrep.frm b/Source/src/Form/frmGrep.frm
@@ -241,7 +241,7 @@ Private Sub cmdOk_Click()
 '        If Len(txtPassword.Text) <> 0 Then
             For Each pass In varPassword
                 Err.Clear
-                Set WB = XL.Workbooks.Open(filename:=varBook, ReadOnly:=True, IgnoreReadOnlyRecommended:=True, notify:=False, Password:=pass, local:=True)
+                Set WB = XL.Workbooks.Open(filename:=varBook, ReadOnly:=True, IgnoreReadOnlyRecommended:=True, UpdateLinks:=0, notify:=False, Password:=pass, local:=True)
                 If Err.Number = 0 Then
                     Exit For
                 End If

diff --git a/Source/src/Form/frmGrepMulti.frm b/Source/src/Form/frmGrepMulti.frm
@@ -248,7 +248,7 @@ Private Sub cmdOk_Click()
 '        If Len(txtPassword.Text) <> 0 Then
             For Each pass In varPassword
                 Err.Clear
-                Set WB = XL.Workbooks.Open(filename:=varBook, ReadOnly:=True, IgnoreReadOnlyRecommended:=True, notify:=False, Password:=pass, local:=True)
+                Set WB = XL.Workbooks.Open(filename:=varBook, ReadOnly:=True, UpdateLinks:=0, IgnoreReadOnlyRecommended:=True, notify:=False, Password:=pass, local:=True)
                 If Err.Number = 0 Then
                     Exit For
                 End If

diff --git a/Source/src/Form/frmGrid.frm b/Source/src/Form/frmGrid.frm
@@ -59,7 +59,7 @@ Public Function Start(ByRef lngHead As Long, ByRef lngCol As Long, ByRef lngHead
     txtCol.Text = lngCol
     chkHoganMode.Value = blnHoganMode
 
-    Me.Show vbModal
+    Me.show vbModal
 
     lngHead = Val(txtHead.Text)
     lngCol = Val(txtCol.Text)

diff --git a/Source/src/Form/frmImportKey.frm b/Source/src/Form/frmImportKey.frm
@@ -52,7 +52,7 @@ Function Start(ByVal strMsg As String) As VbMsgBoxResult
 
     txtMessage.SelStart = 0
 
-    Me.Show
+    Me.show
 
     Start = m
 

diff --git a/Source/src/Form/frmInputLength.frm b/Source/src/Form/frmInputLength.frm
@@ -49,7 +49,7 @@ Public Function Start(ByVal strTitle As String) As Long
 
     lblMessage.Caption = strTitle
 
-    Me.Show vbModal
+    Me.show vbModal
     If mResult = vbOK Then
         Start = Val(txtHead.Text)
     Else

diff --git a/Source/src/Form/frmInputStr.frm b/Source/src/Form/frmInputStr.frm
@@ -108,7 +108,7 @@ End Sub
 Public Function Start() As String
 
 
-    Me.Show vbModal
+    Me.show vbModal
     If mResult = vbOK Then
 
         Dim strBuf As String

diff --git a/Source/src/Form/frmMaxCount.frm b/Source/src/Form/frmMaxCount.frm
@@ -50,7 +50,7 @@ Public Sub Start(ByVal lngByte As Long, ByVal lngString As Long)
     Me.txtByte.Value = lngByte
     Me.txtString.Value = lngString
 
-    Me.Show
+    Me.show
 
 End Sub