merge
This commit is contained in:
commit
718e373e87
@ -199,7 +199,7 @@ Public Class DocumentViewer
|
||||
RichEditControl1.Visible = True
|
||||
RichEditControl1.Dock = DockStyle.Fill
|
||||
|
||||
Case ".XLSX", ".XLS", "CSV"
|
||||
Case ".XLSX", ".XLS", ".CSV"
|
||||
SpreadsheetControl1.LoadDocument(FilePath, GetSpreadsheetFormat(oExtension))
|
||||
|
||||
Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
|
||||
@ -254,7 +254,7 @@ Public Class DocumentViewer
|
||||
RichEditControl1.Visible = True
|
||||
RichEditControl1.Dock = DockStyle.Fill
|
||||
|
||||
Case ".XLSX", ".XLS", "CSV"
|
||||
Case ".XLSX", ".XLS", ".CSV"
|
||||
SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
|
||||
|
||||
Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
|
||||
@ -285,9 +285,9 @@ Public Class DocumentViewer
|
||||
Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
|
||||
|
||||
Select Case Extension.ToUpper
|
||||
Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
|
||||
Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
|
||||
Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
|
||||
Case ".XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
|
||||
Case ".XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
|
||||
Case ".CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
|
||||
End Select
|
||||
|
||||
Return oFormat
|
||||
|
||||
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.6.4.0")>
|
||||
<Assembly: AssemblyFileVersion("1.6.4.0")>
|
||||
<Assembly: AssemblyVersion("1.6.5.0")>
|
||||
<Assembly: AssemblyFileVersion("1.6.5.0")>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user