jj

Controls.DocumentViewer/DocumentViewer.vb

@@ -470,6 +470,8 @@ Public Class DocumentViewer
             Dim oFileInfo = New FileInfo(FilePath)
             Dim oExtension As String = oFileInfo.Extension.ToUpper
 
+            lbFileNotLoaded.Visible = False
+
             RichEditControl1.Visible = False
             RichEditControl1.Dock = DockStyle.None
 
@@ -504,7 +506,11 @@ Public Class DocumentViewer
                     GdViewer.ForceTemporaryMode = True
                     GdViewer.AnnotationDropShadow = True
 
-                    GdViewer.DisplayFromFile(FilePath)
+                    If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then
+                        Dim oFileName = IO.Path.GetFileName(FilePath)
+                        lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
+                        lbFileNotLoaded.Visible = True
+                    End If
 
             End Select
 
@@ -686,7 +692,10 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
-        _Search.SearchAll(txtSearch.EditValue.ToString)
+        If Not String.IsNullOrEmpty(txtSearch.EditValue) Then
+            _Search.SearchAll(txtSearch.EditValue?.ToString)
+
+        End If
     End Sub
 
     Private Sub btnPrevHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnPrevHighlight.ItemClick