소스 검색

DLL更新-新文件权限

liuaoran 2 년 전
부모
커밋
a07341d928
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      PDF Office/Helper/SecurityHelper.cs
  2. 3 3
      PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs
  3. BIN
      PDF Office/x64/ComPDFKit.dll

+ 1 - 1
PDF Office/Helper/SecurityHelper.cs

@@ -108,7 +108,7 @@ namespace PDF_Office.Helper
             VerifyPasswordResult verifyPasswordResult = new VerifyPasswordResult();
             if ((!document.IsLocked) &&
                 ((enumPasswordKind == EnumPasswordKind.StatusOpenPassword) ||
-                (enumPasswordKind == EnumPasswordKind.StatusPermissionsPassword) && CheckHaveAllPermissions(document)))
+                (enumPasswordKind == EnumPasswordKind.StatusPermissionsPassword) && CheckHaveAllPermissions(document))||string.IsNullOrEmpty(document.FilePath))
             {
                 verifyPasswordResult.IsDiscryptied = true;
                 verifyPasswordResult.Password = null;

+ 3 - 3
PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs

@@ -203,10 +203,10 @@ namespace PDF_Office.ViewModels.Tools
         private void OpenSetPasswordDialog()
         { 
             VerifyPasswordResult result = SecurityHelper.VerifyPasswordByPasswordKind(PDFViewer.Document, EnumPasswordKind.StatusPermissionsPassword, dialogs);
-            if (result.IsDiscryptied)
-            {
 
-                if (result.Password != null || !viewContentViewModel.SecurityInfo.IsPasswordChanged)
+            if (result.IsDiscryptied)
+            { 
+                if ((result.Password != null || !viewContentViewModel.SecurityInfo.IsPasswordChanged)&&!string.IsNullOrEmpty(PDFViewer.Document.FilePath))
                 {
                     string filePath = PDFViewer.Document.FilePath;
                     PDFViewer.CloseDocument();

BIN
PDF Office/x64/ComPDFKit.dll