Merge pull request #289 from jmbarbone/consistent-options

makes `options()` setting consistent

NEWS.md

@@ -20,6 +20,10 @@
 * `setStyles()` accepts `halign="justify"`
 ([#305](https://github.com/ycphs/openxlsx/issues/305))
 
+## Improvements
+
+* `options()` are more consistently set in functions (see: [#289](https://github.com/ychps/openxlsx/issues/262))
+
 # openxlsx 4.2.4
 
 ## Fixes

R/conditional_formatting.R

@@ -294,9 +294,8 @@ conditionalFormatting <-
            style = NULL,
            type = "expression",
            ...) {
-    od <- getOption("OutDec")
-    options("OutDec" = ".")
-    on.exit(expr = options("OutDec" = od), add = TRUE)
+    op <- get_set_options()
+    on.exit(options(op), add = TRUE)
 
     type <- tolower(type)
     params <- list(...)

R/helperFunctions.R

@@ -84,9 +84,8 @@
 #' }
 #'
 makeHyperlinkString <- function(sheet, row = 1, col = 1, text = NULL, file = NULL) {
-  od <- getOption("OutDec")
-  options("OutDec" = ".")
-  on.exit(expr = options("OutDec" = od), add = TRUE)
+  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.")

R/openXL.R

@@ -32,9 +32,8 @@
 #' writeData(wb, "Cars", x, startCol = 2, startRow = 3, rowNames = TRUE)
 #' # openXL(wb)
 openXL <- function(file = NULL) {
-  od <- getOption("OutDec")
-  options("OutDec" = ".")
-  on.exit(expr = options("OutDec" = od), add = TRUE)
+  op <- get_set_options()
+  on.exit(options(op), add = TRUE)
 
   if (is.null(file)) stop("A file has to be specified.")
 

R/utils.R

@@ -37,16 +37,14 @@ do_call_params <- function(fun, params, ..., .map = FALSE) {
 }
 
 # sets temporary options
-# returns the current options to decrease line use
+# option() returns the original values
 get_set_options <- function() {
-  op <- options()
   options(
     # increase scipen to avoid writing in scientific
     scipen = 200,
     OutDec = ".",
     digits = 22
   )
-  op
 }