Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo
This commit is contained in:
@@ -1 +1 @@
|
||||
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -78,8 +78,7 @@
|
||||
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Reference Include="DigitalData.Controls.DocumentViewer">
|
||||
<HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.GUIs.Common">
|
||||
|
||||
23
GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
generated
23
GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
generated
@@ -22,18 +22,10 @@ Partial Class frmDocViewPure
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()> _
|
||||
Private Sub InitializeComponent()
|
||||
Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'SpreadsheetControl1
|
||||
'
|
||||
Me.SpreadsheetControl1.Location = New System.Drawing.Point(349, 187)
|
||||
Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
|
||||
Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200)
|
||||
Me.SpreadsheetControl1.TabIndex = 0
|
||||
Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
|
||||
'
|
||||
'Button1
|
||||
'
|
||||
Me.Button1.Location = New System.Drawing.Point(546, 25)
|
||||
@@ -43,19 +35,26 @@ Partial Class frmDocViewPure
|
||||
Me.Button1.Text = "unload"
|
||||
Me.Button1.UseVisualStyleBackColor = True
|
||||
'
|
||||
'DocumentViewer1
|
||||
'
|
||||
Me.DocumentViewer1.FileLoaded = False
|
||||
Me.DocumentViewer1.Location = New System.Drawing.Point(12, 54)
|
||||
Me.DocumentViewer1.Name = "DocumentViewer1"
|
||||
Me.DocumentViewer1.Size = New System.Drawing.Size(661, 386)
|
||||
Me.DocumentViewer1.TabIndex = 2
|
||||
'
|
||||
'frmDocViewPure
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(800, 450)
|
||||
Me.Controls.Add(Me.DocumentViewer1)
|
||||
Me.Controls.Add(Me.Button1)
|
||||
Me.Controls.Add(Me.SpreadsheetControl1)
|
||||
Me.Name = "frmDocViewPure"
|
||||
Me.Text = "frmDocViewPure"
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
|
||||
Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
|
||||
Friend WithEvents Button1 As Button
|
||||
Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
|
||||
End Class
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
Public Class frmDocViewPure
|
||||
Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
SpreadsheetControl1.LoadDocument("E:\35MB.xlsx")
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -10,7 +9,7 @@ Public Class frmDocViewPure
|
||||
'SpreadsheetControl1.Document.Dispose()
|
||||
'SpreadsheetControl1.Dispose()
|
||||
'SpreadsheetControl1 = Nothing
|
||||
SpreadsheetControl1.CreateNewDocument()
|
||||
' SpreadsheetControl1.CreateNewDocument()
|
||||
GC.Collect()
|
||||
End Sub
|
||||
End Class
|
||||
Reference in New Issue
Block a user