20260515指摘対応8

src/sh/tuk/module/Common_Button.bas

@@ -137,9 +137,9 @@ Private Sub DO_CSV_Import(ws As Excel.Worksheet)
     End If
 
     ' === Step 4: Clear all data rows before import ===
+    Call ClearDataRows(ws)
     Application.ScreenUpdating = False
     Application.EnableEvents = False
-    Call ClearDataRows(ws)
 
     ' === Step 5: Write CSV data to worksheet ===
     Dim colLetters As Variant: colLetters = cfg("HeaderColumns")
@@ -194,11 +194,16 @@ Private Sub Do_Validation(ws As Excel.Worksheet)
         Application.Run "M1.ValidateWarn", ws, lastDataRow
     End If
 
-    Do_Fit ws
+    GoTo FinallyExit
     Exit Sub
 
 ErrorHandler:
     HandleError "Do_Validation"
+    GoTo FinallyExit
+
+FinallyExit:
+    Do_Fit ws
+    ClearFormatsBelowLastDataRow ws
 End Sub
 
 ' ============================================================
@@ -258,9 +263,11 @@ Private Sub DO_CSV_Export(ws As Excel.Worksheet)
     
     Dim colLetters As Variant: colLetters = sheetConf("HeaderColumns")
     Dim r As Long
+    Dim colIndex As Long
     For r = startRow To lastDataRow
         For colIdx = 0 To expectedColumnCount - 1
-            outputArr(dataRow, colIdx + 1) = CleanCSVField(ws.Cells(r, Columns(colLetters(colIdx))).Column).Value)
+            colIndex = Columns(colLetters(colIdx)).Column
+            outputArr(dataRow, colIdx + 1) = CleanCSVField(ws.Cells(r, colIndex).Value)
         Next colIdx
         dataRow = dataRow + 1
     Next r