Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #454 #457

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VignetteBuilder: knitr
Suggests:
knitr,
testthat
RoxygenNote: 6.0.1.9000
RoxygenNote: 6.1.1
Collate:
'CommentClass.R'
'HyperlinkClass.R'
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ importFrom(utils,download.file)
importFrom(utils,head)
importFrom(utils,menu)
importFrom(utils,unzip)
importFrom(zip,zip)
importFrom(zip,zipr)
useDynLib(openxlsx, .registration=TRUE)
2 changes: 1 addition & 1 deletion R/WorkbookClass.R
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ Workbook$methods(saveWorkbook = function(){
## zip it
setwd(dir = tmpDir)
cl <- ifelse(!is.null(getOption("openxlsx.compresssionLevel")), getOption("openxlsx.compresssionLevel"), getOption("openxlsx.compresssionevel", 6))
zip::zip(zipfile = tmpFile, files = list.files(tmpDir, full.names = FALSE, recursive = TRUE, include.dirs = FALSE, all.files=TRUE), compression_level = cl)
zip::zipr(zipfile = tmpFile, files = list.files(tmpDir, full.names = FALSE, recursive = TRUE, include.dirs = FALSE, all.files=TRUE), compression_level = cl)

## reset styles - maintain any changes to base font
baseFont <- styles$fonts[[1]]
Expand Down
2 changes: 1 addition & 1 deletion R/openxlsx.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' @import grDevices
#' @import stats
#' @importFrom Rcpp sourceCpp
#' @importFrom zip zip
#' @importFrom zip zipr
#' @importFrom utils download.file head menu unzip
#'
#' @seealso
Expand Down
3 changes: 2 additions & 1 deletion man/addStyle.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions man/addWorksheet.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/createWorkbook.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions man/insertPlot.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion man/makeHyperlinkString.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/pageSetup.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions man/read.xlsx.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions man/readWorkbook.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.