UPDATE: add xlsx toc export.

angela-1 · Sep 20, 2019 · dc59f99 · dc59f99
1 parent 60ba73f
commit dc59f99
Show file tree

Hide file tree

Showing 12 changed files with 247 additions and 105 deletions.
diff --git a/pearblossom/DocxToc.cs b/pearblossom/DocxToc.cs
@@ -26,21 +26,13 @@ public DocxToc(string filepath)
             ParseToc();
         }
 
-        protected override string GetTocName()
-        {
-            int ind = _src_file.LastIndexOf('\\');
-            string toc_name = System.IO.Path.GetFileNameWithoutExtension(_src_file);
-            string toc_filepath = _src_file.Substring(0, ind + 1) + toc_name + "_toc.docx";
-            return toc_filepath;
-        }
-
         public override string Output()
         {
             Application word = new ApplicationClass
             {
                 Visible = false
             };
-            Microsoft.Office.Interop.Word.Document doc = word.Documents.Add();
+            Document doc = word.Documents.Add();
 
             doc.PageSetup.TopMargin = word.CentimetersToPoints(3.7F);
             doc.PageSetup.BottomMargin = word.CentimetersToPoints(3.5F);
@@ -75,7 +67,7 @@ public override string Output()
                 Leader: WdTabLeader.wdTabLeaderDots);
 
             //将wordDoc文档对象的内容保存为DOCX文档
-            string dst_filepath = GetTocName();
+            string dst_filepath = GetTocName("docx");
             doc.SaveAs2(dst_filepath);
 
             doc.Close();

diff --git a/pearblossom/Form1.Designer.cs b/pearblossom/Form1.Designer.cs
diff --git a/pearblossom/Form1.cs b/pearblossom/Form1.cs
@@ -16,13 +16,7 @@ limitations under the License.
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace pearblossom
@@ -140,6 +134,19 @@ private void TxtToolStripMenuItem_Click(object sender, EventArgs e)
 
 
 
+        private void XlsxToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (srcFile != "")
+            {
+                XlsxToc docxToc = new XlsxToc(srcFile);
+                docxToc.Output();
+                ShowStatus("导出目录成功");
+            }
+            else
+            {
+                ShowStatus("请选择文件");
+            }
+        }
 
 
         private void ToolStripStatusLabel3_Click(object sender, EventArgs e)
@@ -245,5 +252,7 @@ private void ToTxtToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Convert(files, "txt");
         }
+
+
     }
 }
diff --git a/pearblossom/Form1.resx b/pearblossom/Form1.resx
@@ -124,85 +124,85 @@
   <data name="openToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="getTocToolStripDropDownButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
-        TXpmnwAAAABJRU5ErkJggg==
+        xEEg6ZHOyGcE4iCQ9Ehn5DMCcRBIeqQz8hmBOAgkPdIZ+YxAHASSHumMfEYgDgJJj3RGPiMQhy7y96WH
+        xPo7XWbv2euB+h3kFekhsf5Ol+plez0wLvIl6SGx/m5tlA/t9YAeZSekh8T6u/WlwWP2emCyPLNnXM6t
+        SQ+K9W96Qa3aq4EtbXwliyWyIv/YXgts0YV6WnxYrHdbG2ZP2WsBV7WoLksPjPVneqS+s9cBN9JFdlx6
+        aKxHWxo8bK8DJOOR+kB8cCz9lfnb9hrgZiYnB3tXF7NL4gNkyU6X6qL5aqa9BriVajE/8E+p/pAeJEtv
+        usyvXJ8f3GePH03Un4vurz/d+l56oCyd6WH27WR4ZJ89dvjShXpHerAsgRXqDXvM2AnzlY1xob4UHzLr
+        3Orfb3yWxJ/bEZv1Yf6o+UrHSqn+lB48i3fj4exv4zJ/vSpmj9rjREhrw+xYNVLzeqReqz8ifV5/KnaB
+        RbT6XaLeq/UHtFNEAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAdGZm/geu+2ui
+        Dlc+HAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="pageNumberToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

diff --git a/pearblossom/Form3.Designer.cs b/pearblossom/Form3.Designer.cs