CompareMSExcelFiles.sct: Add "Compare headers and footers" checkbox to settings dialo...

diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index a358592..73677db 100644 (file)
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -161,6 +161,17 @@ Function writeTextsInShapes(fo, sht)
        On Error GoTo 0
 End Function
 
+Function writeHeadersAndFooters(fo, sht)
+       On Error Resume Next
+       fo.WriteLine "LeftHeader: " & sht.PageSetup.LeftHeader
+       fo.WriteLine "CenterHeader: " & sht.PageSetup.CenterHeader
+       fo.WriteLine "RightHeader: " & sht.PageSetup.RightHeader
+       fo.WriteLine "LeftFooter: " & sht.PageSetup.LeftFooter
+       fo.WriteLine "CenterFooter: " & sht.PageSetup.CenterFooter
+       fo.WriteLine "RightFooter: " & sht.PageSetup.RightFooter
+       On Error GoTo 0
+End Function
+
 Function getModuleExtension(cmp)
        Select Case cmp.Type
        Case 2
@@ -369,6 +380,11 @@ Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
                        writeTextsInShapes fo, sht
                        fo.WriteLine ""
                End If
+               If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
+                       fo.WriteLine "[" & sht.Name & ".HeadersAndFooters]"
+                       writeHeadersAndFooters fo, sht
+                       fo.WriteLine ""
+               End If
        Next
 
        If regRead(RegKeyPath & "CompareVBAMacros", True) Then
@@ -461,6 +477,12 @@ Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
                        fo.Close
                End If
 
+               If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
+                       Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & sht.Name & "_HeadersAndFooters.txt"), True, True)
+                       writeHeadersAndFooters fo, sht
+                       fo.Close
+               End If
+
                If regRead(RegKeyPath & "CompareWorksheetsAsImage", True) Then
                        saveSheetAsImage sht, fso.BuildPath(folderDst, "(" & No & ")" & sht.Name)
                End If
@@ -553,6 +575,7 @@ End Sub
         txtImageHeight.value = regRead(REGKEY_PATH + "ImageHeight", 3000);
         chkCompareFormulas.checked = regRead(REGKEY_PATH + "CompareFormulas", false);
         chkCompareTextsInShapes.checked = regRead(REGKEY_PATH + "CompareTextsInShapes", true);
+        chkCompareHeadersAndFooters.checked = regRead(REGKEY_PATH + "CompareHeadersAndFooters", true);
         chkCompareVBAMacros.checked = regRead(REGKEY_PATH + "CompareVBAMacros", true);
         chkUnpackToFolder_onclick();
         chkCompareWorksheetsAsImage_onclick();
@@ -597,6 +620,7 @@ End Sub
         regWrite(REGKEY_PATH + "ImageHeight", Number(txtImageHeight.value), "REG_DWORD");
         regWrite(REGKEY_PATH + "CompareFormulas", chkCompareFormulas.checked, "REG_DWORD");
         regWrite(REGKEY_PATH + "CompareTextsInShapes", chkCompareTextsInShapes.checked, "REG_DWORD");
+        regWrite(REGKEY_PATH + "CompareHeadersAndFooters", chkCompareHeadersAndFooters.checked, "REG_DWORD");
         regWrite(REGKEY_PATH + "CompareVBAMacros", chkCompareVBAMacros.checked, "REG_DWORD"); window.close();
       }
 
@@ -672,6 +696,11 @@ End Sub
           <label class="ja">\90}\8c`\93à\82Ì\83e\83L\83X\83g\82ð\94ä\8ar\82·\82é</label>
         </li>
         <li>
+          <input id="chkCompareHeadersAndFooters" type="checkbox" />
+          <label class="en">Compare headers and footers</label>
+          <label class="ja">\83w\83b\83_\81[\82Æ\83t\83b\83^\81[\82ð\94ä\8ar\82·\82é</label>
+        </li>
+        <li>
           <input id="chkCompareVBAMacros" type="checkbox" />
           <label class="en">Compare VBA macros</label>
           <label class="ja">VBA \83}\83N\83\8d\82ð\94ä\8ar\82·\82é</label>

diff --git a/Testing/Data/Office/excel.xls b/Testing/Data/Office/excel.xls
index 4173e14..c514a5c 100644 (file)
Binary files a/Testing/Data/Office/excel.xls and b/Testing/Data/Office/excel.xls differ