[write] cleanup

NEWS.md

@@ -10,7 +10,7 @@
 
 ## Breaking changes
 
-* Updating to themse. This includes updates to the default style `'Office Theme'`:
+* Updating to themes. This includes updates to the default style `'Office Theme'`:
   * This includes switching to the new default font `'Aptos Narrow'`
   * A new style `'Office 2013 - 2022 Theme'` was added
 

inst/WORDLIST

@@ -1,4 +1,5 @@
 ARGB
+Aptos
 Arial
 ArrowsGray
 CHARSET

src/RcppExports.cpp

@@ -78,13 +78,13 @@ BEGIN_RCPP
 END_RCPP
 }
 // dims_to_df
-SEXP dims_to_df(Rcpp::IntegerVector rows, std::vector<std::string> cols, bool fill);
+SEXP dims_to_df(Rcpp::IntegerVector rows, Rcpp::CharacterVector cols, bool fill);
 RcppExport SEXP _openxlsx2_dims_to_df(SEXP rowsSEXP, SEXP colsSEXP, SEXP fillSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< Rcpp::IntegerVector >::type rows(rowsSEXP);
-    Rcpp::traits::input_parameter< std::vector<std::string> >::type cols(colsSEXP);
+    Rcpp::traits::input_parameter< Rcpp::CharacterVector >::type cols(colsSEXP);
     Rcpp::traits::input_parameter< bool >::type fill(fillSEXP);
     rcpp_result_gen = Rcpp::wrap(dims_to_df(rows, cols, fill));
     return rcpp_result_gen;

src/helper_functions.cpp

@@ -145,7 +145,7 @@ uint32_t uint_col_to_int(std::string& a) {
 }
 
 // [[Rcpp::export]]
-Rcpp::IntegerVector col_to_int(Rcpp::CharacterVector x ) {
+Rcpp::IntegerVector col_to_int(Rcpp::CharacterVector x) {
 
   // This function converts the Excel column letter to an integer
 
@@ -239,7 +239,7 @@ SEXP copy(SEXP x) {
 
 // provide a basic rbindlist for lists of named characters
 // [[Rcpp::export]]
-SEXP dims_to_df(Rcpp::IntegerVector rows, std::vector<std::string> cols, bool fill) {
+SEXP dims_to_df(Rcpp::IntegerVector rows, Rcpp::CharacterVector cols, bool fill) {
 
   size_t kk = cols.size();
   size_t nn = rows.size();
@@ -257,8 +257,9 @@ SEXP dims_to_df(Rcpp::IntegerVector rows, std::vector<std::string> cols, bool fi
   if (fill) {
     for (size_t i = 0; i < kk; ++i) {
       Rcpp::CharacterVector cvec = Rcpp::as<Rcpp::CharacterVector>(df[i]);
+      std::string coli = Rcpp::as<std::string>(cols[i]);
       for (size_t j = 0; j < nn; ++j) {
-        cvec[j] = cols[i] + std::to_string(rows[j]);
+        cvec[j] = coli + std::to_string(rows[j]);
       }
     }
   }
@@ -361,6 +362,11 @@ void wide_to_long(
   Rcpp::CharacterVector zz_typ   = Rcpp::as<Rcpp::CharacterVector>(zz["typ"]);
   Rcpp::CharacterVector zz_r     = Rcpp::as<Rcpp::CharacterVector>(zz["r"]);
 
+  if (inline_strings)
+    na_strings = txt_to_is(na_strings, 0, 1, 1);
+  else
+    na_strings = txt_to_si(na_strings, 0, 1, 1);
+
   for (auto i = 0; i < m; ++i) {
     Rcpp::checkUserInterrupt();
 
@@ -465,17 +471,16 @@ void wide_to_long(
             // inlineStr or s
             if (inline_strings) {
               cell.c_t = "inlineStr";
-              cell.is  = txt_to_is(na_strings, 0, 1, 1);
+              cell.is  = na_strings;
             } else {
               cell.c_t = "s";
-              cell.v   = txt_to_si(na_strings, 0, 1, 1);
+              cell.v   = na_strings;
             }
 
           }
         }
       }
 
-
       if (cell.v.compare("NaN") == 0) {
         cell.v   = "#VALUE!";
         cell.c_t = "e";