Merge pull request #210 from JanMarvin/176-options

176 options
JanMarvin · May 30, 2022 · bba1ec3 · bba1ec3
2 parents 7b2091d + e507a82
commit bba1ec3
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 76 deletions.
diff --git a/R/class-workbook.R b/R/class-workbook.R
@@ -1722,9 +1722,6 @@ wbWorkbook <- R6::R6Class(
     #' @param fontName fontName
     #' @return The `wbWorkbook` object
     set_base_font = function(fontSize = 11, fontColour = "black", fontName = "Calibri") {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       if (fontSize < 0) stop("Invalid fontSize")
       fontColour <- validateColour(fontColour)
 
@@ -1786,9 +1783,6 @@ wbWorkbook <- R6::R6Class(
     #' @param heights heights
     #' @return The `wbWorkbook` object, invisibly
     set_row_heights = function(sheet, rows, heights) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
       # TODO move to wbWorksheet method
       # TODO consider reworking rowHeights
@@ -1834,11 +1828,7 @@ wbWorkbook <- R6::R6Class(
     #' @param rows rows
     #' @return The `wbWorkbook` object, invisibly
     remove_row_heights = function(sheet, rows) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
-
       customRows <- as.integer(names(self$rowHeights[[sheet]]))
       removeInds <- which(customRows %in% rows)
 
@@ -1870,9 +1860,6 @@ wbWorkbook <- R6::R6Class(
     #' @param levels levels
     #' @return The `wbWorkbook` object, invisibly
     group_cols = function(sheet, cols, collapsed = FALSE, levels = NULL) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       if (length(collapsed) > length(cols)) {
@@ -1939,9 +1926,6 @@ wbWorkbook <- R6::R6Class(
     #' @param cols = cols
     #' @returns The `wbWorkbook` object
     ungroup_cols = function(sheet, cols) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       # check if any rows are selected
@@ -1979,8 +1963,6 @@ wbWorkbook <- R6::R6Class(
     #' @return The `wbWorkbook` object, invisibly
     remove_col_widths = function(sheet, cols) {
       sheet <- wb_validate_sheet(self, sheet)
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
 
       if (!is.numeric(cols)) {
         cols <- col2int(cols)
@@ -2122,9 +2104,6 @@ wbWorkbook <- R6::R6Class(
     #' @param levels levels
     #' @return The `wbWorkbook` object, invisibly
     group_rows = function(sheet, rows, collapsed = FALSE, levels = NULL) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       if (length(collapsed) > length(rows)) {
@@ -2186,9 +2165,6 @@ wbWorkbook <- R6::R6Class(
     #' @param rows rows
     #' @return The `wbWorkbook` object
     ungroup_rows = function(sheet, rows) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       # check if any rows are selected
@@ -2433,9 +2409,6 @@ wbWorkbook <- R6::R6Class(
       showInputMsg = TRUE,
       showErrorMsg = TRUE
     ) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       ## rows and cols
       if (!is.numeric(cols)) {
         cols <- col2int(cols)
@@ -2952,8 +2925,6 @@ wbWorkbook <- R6::R6Class(
       firstCol = FALSE
     ) {
       # TODO rename to setFreezePanes?
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
 
       # fine to do the validation before the actual check to prevent other errors
       sheet <- wb_validate_sheet(self, sheet)
@@ -3061,9 +3032,6 @@ wbWorkbook <- R6::R6Class(
       units     = "in",
       dpi       = 300
     ) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       if (!file.exists(file)) {
         stop("File does not exist.")
       }
@@ -3214,9 +3182,6 @@ wbWorkbook <- R6::R6Class(
       units     = "in",
       dpi       = 300
     ) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       if (is.null(dev.list()[[1]])) {
         warning("No plot to insert.")
         return(self)
@@ -3695,9 +3660,6 @@ wbWorkbook <- R6::R6Class(
     ) {
       sheet <- wb_validate_sheet(self, sheet)
 
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       if (!is.null(header) && length(header) != 3) {
         stop("header must have length 3 where elements correspond to positions: left, center, right.")
       }
@@ -3835,8 +3797,6 @@ wbWorkbook <- R6::R6Class(
     #' @param cols cols
     #' @returns The `wbWorkbook` object
     add_filter = function(sheet, rows, cols) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
       sheet <- wb_validate_sheet(self, sheet)
 
       if (length(rows) != 1) {
@@ -3871,9 +3831,6 @@ wbWorkbook <- R6::R6Class(
     #' @param show show
     #' @returns The `wbWorkbook` object
     grid_lines = function(sheet, show = FALSE) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       if (!is.logical(show)) {
@@ -3911,9 +3868,6 @@ wbWorkbook <- R6::R6Class(
       localSheetId = NULL,
       overwrite = FALSE
     ) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       sheet <- wb_validate_sheet(self, sheet)
 
       if (!is.numeric(rows)) {
@@ -4033,9 +3987,6 @@ wbWorkbook <- R6::R6Class(
     #' @param sheet sheet
     #' @returns The `wbWorkbook` object
     set_sheet_visibility = function(sheet, value) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
-
       if (length(value) != length(sheet)) {
         stop("`value` and `sheet` must be the same length")
       }
@@ -4081,8 +4032,6 @@ wbWorkbook <- R6::R6Class(
     #' @param col col
     #' @returns The `wbWorkbook` object
     add_page_break = function(sheet, row = NULL, col = NULL) {
-      op <- openxlsx2_options()
-      on.exit(options(op), add = TRUE)
       sheet <- wb_validate_sheet(self, sheet)
       self$worksheets[[sheet]]$add_page_break(row = row, col = col)
       self

diff --git a/R/conditional_formatting.R b/R/conditional_formatting.R
@@ -251,7 +251,7 @@
 #'                       rule = "OR($A1=1,$A1=3,$A1=5,$A1=7)"
 #' )
 #'
-wb_conditional_formatting <- 
+wb_conditional_formatting <-
   function(wb,
            sheet,
            cols,
@@ -260,8 +260,6 @@ wb_conditional_formatting <-
            style = NULL,
            type = "expression",
            ...) {
-    op <- openxlsx2_options()
-    on.exit(options(op), add = TRUE)
 
     type <- tolower(type)
     params <- list(...)

diff --git a/R/converters.R b/R/converters.R
@@ -9,9 +9,6 @@
 #' @examples
 #' int2col(1:10)
 int2col <- function(x) {
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
-
   if (!is.numeric(x)) {
     stop("x must be numeric.")
   }
@@ -60,8 +57,6 @@ get_cell_refs <- function(cellCoords) {
   if (!all(vapply(cellCoords, is_integer_ish, NA))) {
     stop("cellCoords must only contain integers", call. = FALSE)
   }
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
 
   l <- int2col(unlist(cellCoords[, 2]))
   paste0(l, cellCoords[, 1])

diff --git a/R/dates.R b/R/dates.R
@@ -52,9 +52,6 @@ convert_date <- function(x, origin = "1900-01-01", ...) {
 #' convert_datetime(x, tz = "Australia/Perth")
 #' convert_datetime(x, tz = "UTC")
 convert_datetime <- function(x, origin = "1900-01-01", ...) {
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
-
   x <- as.numeric(x)
   date <- convert_date(x, origin)
 

diff --git a/R/helperFunctions.R b/R/helperFunctions.R
@@ -86,9 +86,6 @@
 #' }
 #'
 create_hyperlink <- function(sheet, row = 1, col = 1, text = NULL, file = NULL) {
-  # op <- get_set_options()
-  # on.exit(options(op), add = TRUE)
-
   if (missing(sheet)) {
     if (!missing(row) || !missing(col)) warning("Option for col and/or row found, but no sheet was provided.")
 
@@ -211,7 +208,7 @@ illegalcharsreplace <- c("&amp;", "&quot;", "&apos;", "&lt;", "&gt;", "", "", ""
 #' converts & to &amp;
 #' @param v some xml string
 #' @keywords internal
-#' @noRd 
+#' @noRd
 replaceIllegalCharacters <- function(v) {
   v <- as.character(v)
 
@@ -223,7 +220,7 @@ replaceIllegalCharacters <- function(v) {
 #' converts &amp; to &
 #' @param v some xml string
 #' @keywords internal
-#' @noRd 
+#' @noRd
 replaceXMLEntities <- function(v) {
   v <- gsub("&amp;", "&", v, fixed = TRUE)
   v <- gsub("&quot;", '"', v, fixed = TRUE)

diff --git a/R/names.R b/R/names.R
@@ -23,8 +23,6 @@ names.wbWorkbook <- function(x) {
 #' @param value a character vector the same length as `x`
 #' @export
 `names<-.wbWorkbook` <- function(x, value) {
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
 
   if (any(duplicated(tolower(value)))) {
     stop("Worksheet names must be unique.")

diff --git a/R/utils.R b/R/utils.R
@@ -53,8 +53,6 @@ temp_xlsx <- function(name = "temp_xlsx", macros = FALSE) {
 }
 
 openxlsx2_options <- function() {
-  # op <- openxlsx2_options()
-  # on.exit(options(op), add = TRUE)
   options(
     # increase scipen to avoid writing in scientific
     scipen = 200,

diff --git a/R/wb_styles.R b/R/wb_styles.R
@@ -790,8 +790,6 @@ create_dxfs_style <- function(
     text_italic    = NULL,
     text_underline = NULL # "true" or "double"
 ) {
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
 
   if (is.null(text_bold)) text_bold = ""
   if (is.null(text_strike)) text_strike = ""

diff --git a/R/write.R b/R/write.R
@@ -605,6 +605,9 @@ write_data_table <- function(
     data_table = FALSE
 ) {
 
+  op <- openxlsx2_options()
+  on.exit(op, add = TRUE)
+
   ## Input validating
   assert_workbook(wb)
   assert_class(colNames, "logical")
@@ -625,9 +628,6 @@ write_data_table <- function(
 
   if (wb$isChartSheet[[sheet]]) stop("Cannot write to chart sheet.")
 
-  op <- openxlsx2_options()
-  on.exit(options(op), add = TRUE)
-
   ## All input conversions/validations
   if (!is.null(xy)) {
     if (length(xy) != 2) {