修訂 | fffa6b90e616462ef161bdcfbc421aba4818b8b6 (tree) |
---|---|
時間 | 2018-02-04 22:35:10 |
作者 | Takashi Sawanaka <sdottaka@user...> |
Commiter | Takashi Sawanaka |
CompareMSExcelFiles.sct: Add "Compare headers and footers" checkbox to settings dialog. sf.net#2102
@@ -161,6 +161,17 @@ Function writeTextsInShapes(fo, sht) | ||
161 | 161 | On Error GoTo 0 |
162 | 162 | End Function |
163 | 163 | |
164 | +Function writeHeadersAndFooters(fo, sht) | |
165 | + On Error Resume Next | |
166 | + fo.WriteLine "LeftHeader: " & sht.PageSetup.LeftHeader | |
167 | + fo.WriteLine "CenterHeader: " & sht.PageSetup.CenterHeader | |
168 | + fo.WriteLine "RightHeader: " & sht.PageSetup.RightHeader | |
169 | + fo.WriteLine "LeftFooter: " & sht.PageSetup.LeftFooter | |
170 | + fo.WriteLine "CenterFooter: " & sht.PageSetup.CenterFooter | |
171 | + fo.WriteLine "RightFooter: " & sht.PageSetup.RightFooter | |
172 | + On Error GoTo 0 | |
173 | +End Function | |
174 | + | |
164 | 175 | Function getModuleExtension(cmp) |
165 | 176 | Select Case cmp.Type |
166 | 177 | Case 2 |
@@ -369,6 +380,11 @@ Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) | ||
369 | 380 | writeTextsInShapes fo, sht |
370 | 381 | fo.WriteLine "" |
371 | 382 | End If |
383 | + If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then | |
384 | + fo.WriteLine "[" & sht.Name & ".HeadersAndFooters]" | |
385 | + writeHeadersAndFooters fo, sht | |
386 | + fo.WriteLine "" | |
387 | + End If | |
372 | 388 | Next |
373 | 389 | |
374 | 390 | If regRead(RegKeyPath & "CompareVBAMacros", True) Then |
@@ -461,6 +477,12 @@ Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) | ||
461 | 477 | fo.Close |
462 | 478 | End If |
463 | 479 | |
480 | + If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then | |
481 | + Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & sht.Name & "_HeadersAndFooters.txt"), True, True) | |
482 | + writeHeadersAndFooters fo, sht | |
483 | + fo.Close | |
484 | + End If | |
485 | + | |
464 | 486 | If regRead(RegKeyPath & "CompareWorksheetsAsImage", True) Then |
465 | 487 | saveSheetAsImage sht, fso.BuildPath(folderDst, "(" & No & ")" & sht.Name) |
466 | 488 | End If |
@@ -553,6 +575,7 @@ End Sub | ||
553 | 575 | txtImageHeight.value = regRead(REGKEY_PATH + "ImageHeight", 3000); |
554 | 576 | chkCompareFormulas.checked = regRead(REGKEY_PATH + "CompareFormulas", false); |
555 | 577 | chkCompareTextsInShapes.checked = regRead(REGKEY_PATH + "CompareTextsInShapes", true); |
578 | + chkCompareHeadersAndFooters.checked = regRead(REGKEY_PATH + "CompareHeadersAndFooters", true); | |
556 | 579 | chkCompareVBAMacros.checked = regRead(REGKEY_PATH + "CompareVBAMacros", true); |
557 | 580 | chkUnpackToFolder_onclick(); |
558 | 581 | chkCompareWorksheetsAsImage_onclick(); |
@@ -597,6 +620,7 @@ End Sub | ||
597 | 620 | regWrite(REGKEY_PATH + "ImageHeight", Number(txtImageHeight.value), "REG_DWORD"); |
598 | 621 | regWrite(REGKEY_PATH + "CompareFormulas", chkCompareFormulas.checked, "REG_DWORD"); |
599 | 622 | regWrite(REGKEY_PATH + "CompareTextsInShapes", chkCompareTextsInShapes.checked, "REG_DWORD"); |
623 | + regWrite(REGKEY_PATH + "CompareHeadersAndFooters", chkCompareHeadersAndFooters.checked, "REG_DWORD"); | |
600 | 624 | regWrite(REGKEY_PATH + "CompareVBAMacros", chkCompareVBAMacros.checked, "REG_DWORD"); window.close(); |
601 | 625 | } |
602 | 626 |
@@ -672,6 +696,11 @@ End Sub | ||
672 | 696 | <label class="ja">図形内のテキストを比較する</label> |
673 | 697 | </li> |
674 | 698 | <li> |
699 | + <input id="chkCompareHeadersAndFooters" type="checkbox" /> | |
700 | + <label class="en">Compare headers and footers</label> | |
701 | + <label class="ja">ヘッダーとフッターを比較する</label> | |
702 | + </li> | |
703 | + <li> | |
675 | 704 | <input id="chkCompareVBAMacros" type="checkbox" /> |
676 | 705 | <label class="en">Compare VBA macros</label> |
677 | 706 | <label class="ja">VBA マクロを比較する</label> |