|
|
@@ -236,7 +236,7 @@ namespace OTSMeasureApp
|
|
|
m_xe.Create();
|
|
|
Microsoft.Office.Interop.Excel.Worksheet ws = m_xe.GetSheet("Sheet1");
|
|
|
m_xe.m_ws = ws;
|
|
|
- string str_ExcelFilePath = a_filePath + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
|
|
|
+ string str_ExcelFilePath = a_filePath + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx";
|
|
|
m_xe.m_ws.Shapes.AddPicture(a_ImgFilePath[0], Microsoft.Office.Core.MsoTriState.msoFalse, Microsoft.Office.Core.MsoTriState.msoTrue, 0, 0, 400, 300);
|
|
|
m_xe.m_ws.Shapes.AddPicture(a_ImgFilePath[1], Microsoft.Office.Core.MsoTriState.msoFalse, Microsoft.Office.Core.MsoTriState.msoTrue, 0, 320, 400, 100);
|
|
|
if (str_ExcelFilePath.IndexOf(":") < 0)
|
cxs