cleanup

Author: JanMarvin

R/class-workbook-wrappers.R

@@ -1891,6 +1891,7 @@ wb_get_tables <- function(wb, sheet = current_sheet()) {
 #' @param wb A workbook object
 #' @param sheet A name or index of a worksheet
 #' @param table Name of table to remove. See [wb_get_tables()]
+#' @param remove_data Removes the data as well
 #' @return character vector of table names on the specified sheet
 #' @examples
 #'
@@ -1915,9 +1916,9 @@ wb_get_tables <- function(wb, sheet = current_sheet()) {
 #' wb$remove_tables(sheet = 1, table = "iris")
 #' wb$add_data_table(sheet = 1, x = iris, tableName = "iris", startCol = 1)
 #' @export
-wb_remove_tables <- function(wb, sheet = current_sheet(), table) {
+wb_remove_tables <- function(wb, sheet = current_sheet(), table, remove_data = TRUE) {
   assert_workbook(wb)
-  wb$clone()$remove_tables(sheet = sheet, table = table)
+  wb$clone()$remove_tables(sheet = sheet, table = table, remove_data = remove_data)
 }
 
 

R/class-workbook.R

@@ -5027,8 +5027,9 @@ wbWorkbook <- R6::R6Class(
     #' @description remove tables
     #' @param sheet sheet
     #' @param table table
+    #' @param remove_data removes the data as well
     #' @returns The `wbWorkbook` object
-    remove_tables = function(sheet = current_sheet(), table) {
+    remove_tables = function(sheet = current_sheet(), table, remove_data = TRUE) {
       if (length(table) != 1) {
         stop("table argument must be length 1")
       }
@@ -5066,7 +5067,9 @@ wbWorkbook <- R6::R6Class(
       attr(self$worksheets[[sheet]]$tableParts, "tableName") <- worksheet_table_names[-to_remove]
 
       ## now delete data
-      # self$clean_sheet(sheet = sheet, dims = refs)
+      if (remove_data)
+        self$clean_sheet(sheet = sheet, dims = refs)
+
       invisible(self)
     },
 

R/get-named-regions.R

@@ -127,9 +127,5 @@ wb_get_named_regions <- function(x, tables = FALSE) {
 
   }
 
-  if (NROW(z) == 0) {
-    z <- NULL
-  }
-
   z
 }