cleanup for defined name

JanMarvin · Aug 22, 2023 · 5e0cc04 · 5e0cc04
1 parent 84698cd
commit 5e0cc04
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/R/wb_load.R b/R/wb_load.R
@@ -1431,10 +1431,9 @@ wb_load <- function(
 
           val <- sprintf("[%s]%s", xti$ext_id[sel][i], sheetName)
 
-
-          if (any(sel2 <- grepl("\\s", val)))
+          # non ascii or whitespace
+          if (any(sel2 <- grepl("[^A-Za-z0-9]", val)))
             val[sel2] <- shQuote(val[sel2], type = "sh")
-          # val <- shQuote(val, type = "sh")
 
           if (length(val)) xti$sheets[sel][i] <- val
         }
@@ -1446,6 +1445,7 @@ wb_load <- function(
       if (nrow(xti)) {
 
         if (length(wb$workbook$definedNames)) {
+
           wb$workbook$definedNames <-
             stringi::stri_replace_all_fixed(
               wb$workbook$definedNames,

diff --git a/src/xlsb.cpp b/src/xlsb.cpp
@@ -1591,6 +1591,12 @@ int workbook_bin(std::string filePath, std::string outPath, bool debug) {
           std::string unusedstring2 = XLNullableWideString(bin, swapit);
         }
 
+        if (fields->fBuiltin) {
+          // add the builtin xl name namespace
+          if (name.find("_xlnm.") == -1)
+            name = "_xlnm." + name;
+        }
+
         std::string defNam = "<definedName name=\"" + name;
 
         if (comment.size() > 0)

diff --git a/src/xlsb_funs.h b/src/xlsb_funs.h
@@ -1302,12 +1302,9 @@ std::string CellParsedFormula(std::istream& sas, bool swapit, bool debug, int co
     case PtgArray2:
     case PtgArray3:
     {
-      int pre = ptgextra.size();
       RgbExtra typ = PtgExtraArray;
       ptgextra.push_back(typ);
-      if (ptgextra.size() <= pre) {
-        Rcpp::stop("hmm");
-      }
+
       // ptg_extra_array = true;
       uint16_t unused2 = 0;
       uint32_t unused1 = 0, unused3 = 0, unused4 = 0;