remaining pending changes from #688

R/xl_open.R

@@ -81,6 +81,8 @@ xl_open.default <- function(x, interactive = NA) {
       shell.exec(file) # nolint
     },
     Darwin = {
+      # system2('/Applications/LibreOffice.app/Contents/MacOS/soffice', shQuote(file), wait = FALSE)
+      # system2('open', paste0("-a numbers", shQuote(file)))
       system2('open', shQuote(file))
     },
     stop("Operating system not handled: ", toString(userSystem))

src/Makevars

@@ -1 +1 @@
-PKG_CPPFLAGS = -I. -I../inst/include/pugixml
+PKG_CPPFLAGS = -I. -I../inst/include/pugixml

src/helper_functions.cpp

@@ -349,10 +349,13 @@ void wide_to_long(
   Rcpp::CharacterVector zz_r     = Rcpp::as<Rcpp::CharacterVector>(zz["r"]);
 
   for (auto i = 0; i < m; ++i) {
+    Rcpp::checkUserInterrupt();
+
     Rcpp::CharacterVector cvec = Rcpp::as<Rcpp::CharacterVector>(z[i]);
 
     auto startrow = start_row;
     for (auto j = 0; j < n; ++j) {
+      Rcpp::checkUserInterrupt();
 
       int8_t vtyp = (int8_t)vtyps[i];
       // if colname is provided, the first row is always a character

src/load_workbook.cpp

@@ -213,6 +213,8 @@ void loadvals(Rcpp::Environment sheet_data, XPtrXML doc) {
 
   auto itr_rows = 0;
   for (auto worksheet: ws.children("row")) {
+    Rcpp::checkUserInterrupt();
+
     /* ---------------------------------------------------------------------- */
     /* read cval, and ctyp -------------------------------------------------- */
     /* ---------------------------------------------------------------------- */
@@ -222,6 +224,7 @@ void loadvals(Rcpp::Environment sheet_data, XPtrXML doc) {
 
     auto itr_cols = 0;
     for (auto col : worksheet.children("c")) {
+      Rcpp::checkUserInterrupt();
 
       // contains all values of a col
       xml_col single_xml_col;