Преглед изворни кода

带密码文档开启-添加安全检查防止异常

liyijie пре 1 година
родитељ
комит
87e1c8e04f

+ 6 - 2
PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -1064,9 +1064,13 @@ namespace PDF_Master.ViewModels
                 }
 
                 //获取页面设置等信息
-                PDFViewer = pdfview;
-                oldPageIndex = pdfview.CurrentIndex;
+                PDFViewer = pdfview;
                 PageCount = PDFViewer.Document.PageCount;
+                //避免加密文档,刚进入文档时抛异常
+                if (PageCount > 0)
+                {
+                    oldPageIndex = pdfview.CurrentIndex;
+                }
                 GetModeView(PDFViewer.ModeView);
                 //设置下拉框选中项
                 SetZoomIndex();

+ 5 - 1
PDF Office/ViewModels/PropertyPanel/ViewModular/PageContentViewModel.cs

@@ -327,7 +327,11 @@ namespace PDF_Master.ViewModels.PropertyPanel.ViewModular
                 if (PDFViewer != null)
                 {
                     PageCount = PDFViewer.Document.PageCount;
-                    CurrentPage = PDFViewer.CurrentIndex + 1;
+                    //避免加密文档,刚进入文档时抛异常
+                    if (PageCount > 0)
+                    {
+                        CurrentPage = PDFViewer.CurrentIndex + 1;
+                    }
                     CurrentZoom = PDFViewer.ZoomFactor * 100;
                     this.PDFViewer.InfoChanged += PDFViewer_InfoChanged;
                     PDFViewer.SetMouseMode(MouseModes.PanTool);