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

Prepare 4.2.6 #479

Merged
merged 7 commits into from
Jul 23, 2024
Merged
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
94 changes: 0 additions & 94 deletions .github/workflows/revdep.yaml

This file was deleted.

10 changes: 9 additions & 1 deletion .lintr
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,13 @@ linters: linters_with_defaults(
spaces_inside_linter = NULL, #
spaces_left_parentheses_linter = NULL, #
object_length_linter = NULL, #
assignment_linter = NULL # just one case
assignment_linter = NULL, # just one case
vector_logic_linter = NULL, # many
indentation_linter = NULL, # many
quotes_linter = NULL,
T_and_F_symbol_linter = NULL,
seq_linter = NULL,
trailing_blank_lines_linter = NULL,
paren_body_linter = NULL,
semicolon_linter = NULL
)
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Type: Package
Package: openxlsx
Title: Read, Write and Edit xlsx Files
Version: 4.2.5.9002
Date: 2024-07-17
Version: 4.2.6
Date: 2024-07-20
Authors@R:
c(person(given = "Philipp",
family = "Schauberger",
role = c("aut", "cre"),
role = "aut",
email = "[email protected]"),
person(given = "Alexander",
family = "Walker",
Expand All @@ -20,7 +20,7 @@ Authors@R:
role = "ctb"),
person(given = "Jan Marvin",
family = "Garbuszus",
role = "ctb",
role = c("ctb", "cre"),
email = "[email protected]"),
person(given = "Jordan Mark",
family = "Barbone",
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# openxlsx (development version)
# openxlsx 4.2.6

* Fix external links ([#410](https://github.com/ycphs/openxlsx/pull/410))
* Do not add unneccessary sheetPr node ([#409](https://github.com/ycphs/openxlsx/pull/409))
* Add support for `namedRegion`s having dots and other special characters ([#338](https://github.com/ycphs/openxlsx/issues/338)).
* Add type blanks and not blanks to conditional formatting ([#311](https://github.com/ycphs/openxlsx/pull/311))

Expand Down
2 changes: 1 addition & 1 deletion R/loadWorkbook.R
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ loadWorkbook <- function(file, xlsxFile = NULL, isUnzipped = FALSE) {


wb$comments[[i]] <- lapply(seq_along(comments), function(j) {
comment_list <- list(
list(
"ref" = refs[j],
"author" = authors[j],
"comment" = comments[[j]],
Expand Down
3 changes: 1 addition & 2 deletions R/wrappers.R
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ addWorksheet <- function(wb,
}

if (!inherits(wb, "Workbook")) {
stop("wb must be a Workbook", call. = FALSE)
stop("wb must be a Workbok", call. = FALSE)
}

# Set NULL defaults
Expand Down Expand Up @@ -1848,7 +1848,6 @@ deleteDataColumn <- function(wb, sheet, col) {
forms <- stringi::stri_split(xx, regex = "\\b(?=[A-Z]+\\d+)")

x[has_formula] <- sapply(forms, function(form) {
cols_to_decrease <- form[-1]
cols <- openxlsx::col2int(stringi::stri_extract(form[-1], regex = "^[A-Z]+"))
repl <- ifelse(cols == col, "#REF!",
ifelse(cols > col,
Expand Down
Loading
Loading