AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Documentviewer DoLoadFile Punkt bei XLSX fehlte

Browse Source
This commit is contained in:
SchreiberM 2022-01-18 15:59:33 +01:00
parent 9d51074991
commit b0f79c3f3a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controls.DocumentViewer/DocumentViewer.vb
View File

@ -199,7 +199,7 @@ Public Class DocumentViewer
RichEditControl1.Visible = True RichEditControl1.Visible = True
RichEditControl1.Dock = DockStyle.Fill RichEditControl1.Dock = DockStyle.Fill
Case ".XLSX", ".XLS", "CSV" Case ".XLSX", ".XLS", ".CSV"
SpreadsheetControl1.LoadDocument(FilePath, GetSpreadsheetFormat(oExtension)) SpreadsheetControl1.LoadDocument(FilePath, GetSpreadsheetFormat(oExtension))
Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@ -254,7 +254,7 @@ Public Class DocumentViewer
RichEditControl1.Visible = True RichEditControl1.Visible = True
RichEditControl1.Dock = DockStyle.Fill RichEditControl1.Dock = DockStyle.Fill
Case ".XLSX", ".XLS", "CSV" Case ".XLSX", ".XLS", ".CSV"
SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension)) SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@ -285,9 +285,9 @@ Public Class DocumentViewer
Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
Select Case Extension.ToUpper Select Case Extension.ToUpper
Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx Case ".XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls Case ".XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv Case ".CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
End Select End Select
Return oFormat Return oFormat

4
Controls.DocumentViewer/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.4.0")> <Assembly: AssemblyVersion("1.6.5.0")>
<Assembly: AssemblyFileVersion("1.6.4.0")> <Assembly: AssemblyFileVersion("1.6.5.0")>

5
Controls.DocumentViewer/My Project/licenses.licx
View File

@ -0,0 +1,5 @@
DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a