jj: don't assign first_control/last_control

This commit is contained in:
Jonathan Jenne 2018-04-04 11:50:10 +02:00
parent 86363d46a0
commit 31cb0da1d7
2 changed files with 8 additions and 5 deletions

View File

@ -709,7 +709,7 @@ Partial Class frmValidator
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.PdfFilePrintBarItem1, Me.PdfPreviousPageBarItem1, Me.PdfNextPageBarItem1, Me.PdfFindTextBarItem1, Me.PdfZoomOutBarItem1, Me.PdfZoomInBarItem1, Me.PdfExactZoomListBarSubItem1, Me.PdfZoom10CheckItem1, Me.PdfZoom25CheckItem1, Me.PdfZoom50CheckItem1, Me.PdfZoom75CheckItem1, Me.PdfZoom100CheckItem1, Me.PdfZoom125CheckItem1, Me.PdfZoom150CheckItem1, Me.PdfZoom200CheckItem1, Me.PdfZoom400CheckItem1, Me.PdfZoom500CheckItem1, Me.PdfSetActualSizeZoomModeCheckItem1, Me.PdfSetPageLevelZoomModeCheckItem1, Me.PdfSetFitWidthZoomModeCheckItem1, Me.PdfSetFitVisibleZoomModeCheckItem1})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 25
Me.RibbonControl1.MaxItemId = 26
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.PdfRibbonPage1})
Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010

View File

@ -457,7 +457,8 @@ Public Class frmValidator
(SERVER=DEDICATED)
(SERVICE_NAME={row.Item("DATENBANK")})
)
);User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
)
);User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
"""
Else
csBuilder.DataSource = row.Item("SERVER")
@ -685,10 +686,12 @@ Public Class frmValidator
ctrl = ClassControlCreator.CreateExistingLine(dr, False)
End Select
If first_control Is Nothing Then
first_control = ctrl
If TypeOf ctrl IsNot Label Then
If first_control Is Nothing Then
first_control = ctrl
End If
last_control = ctrl
End If
last_control = ctrl
pnldesigner.Controls.Add(ctrl)