Merge branches 'develop_PDFReaderProNew' and 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift

@@ -88,7 +88,7 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
                 self.converter = CPDFConverterWord.init(url: URL(fileURLWithPath: operateFile?.filePath ?? ""), password: operateFile?.password)
                 self.converter!.delegate = self
                 let options = CPDFConvertWordOptions()
-                options.layoutOptions = self.isAllInOneSheet ? .retainPageLayout : .retainFlowingText
+                options.layoutOptions = self.operateFile?.advanceWordParameter.isRetainLayout ?? false ? .retainPageLayout : .retainFlowingText
                 options.isContainAnnotations = true
                 options.isContainImages = true
                 self.converter!.convert(toFilePath: operateFile!.outputFilePath, pageIndexs: operateFile?.currentConvertParameter?.pagesArray, options: options)