diff --git a/R/class-workbook-wrappers.R b/R/class-workbook-wrappers.R index 648c6d02d..677340c95 100644 --- a/R/class-workbook-wrappers.R +++ b/R/class-workbook-wrappers.R @@ -3074,7 +3074,7 @@ wb_add_ignore_error <- function( #' @param topLeftCell Cell: the cell shown in the top left corner / or top right with rightToLeft #' @param view View: "normal", "pageBreakPreview" or "pageLayout" #' @param windowProtection Logical: if TRUE the panes are protected -#' @param workbookViewId Interger: Pointing to some other view inside the workbook +#' @param workbookViewId integer: Pointing to some other view inside the workbook #' @param zoomScale,zoomScaleNormal,zoomScalePageLayoutView,zoomScaleSheetLayoutView Integer: the zoom scale should be between 10 and 400. These are values for current, normal etc. #' @examples #' wb <- wb_workbook()$add_worksheet() diff --git a/R/utils.R b/R/utils.R index 4280b527f..85a24812c 100644 --- a/R/utils.R +++ b/R/utils.R @@ -177,7 +177,7 @@ random_string <- function(n = 1, length = 16, pattern = "[A-Za-z0-9]", keep_seed #' and column vector. Exported for user convenience. #' @name dims_helper #' @param x a dimension object "A1" or "A1:A1" -#' @param as_integer optional if the output should be returned as interger +#' @param as_integer optional if the output should be returned as integer #' @examples #' dims_to_rowcol("A1:J10") #' @export diff --git a/inst/WORDLIST b/inst/WORDLIST index 76efca35e..5df6aad3d 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -18,7 +18,6 @@ FFFFFF Github Gnumeric GrossProfit -Interger JIS JOHAB LastModifiedBy @@ -35,6 +34,7 @@ STDEV STDEVP SalesPrice SalesQuantity +Savon Schauberger Sparklines SuperA @@ -57,7 +57,14 @@ bool calc calcChain calculatedColumn +cellStyle +cellStyleXf +cellStyles +cellStylesXf cellWatches +cellstyle +cellstyleXf +cellstylexf charset chartShapes chartsheet @@ -100,6 +107,7 @@ databar datatable datetime datetimes +de defaultGridColor defaultPivotStyle defaultTableStyle @@ -137,6 +145,7 @@ firstSheet firstTotalCell fitToHeight fitToWidth +fmt fontColor fontName fontSize @@ -217,6 +226,7 @@ pivotRecords pivotTables posix posixt +pre printGridLines printOptions printTitleCols diff --git a/man/dims_helper.Rd b/man/dims_helper.Rd index 0410f8ae9..b6461dc11 100644 --- a/man/dims_helper.Rd +++ b/man/dims_helper.Rd @@ -13,7 +13,7 @@ rowcol_to_dims(row, col) \arguments{ \item{x}{a dimension object "A1" or "A1:A1"} -\item{as_integer}{optional if the output should be returned as interger} +\item{as_integer}{optional if the output should be returned as integer} \item{row}{a numeric vector of rows} diff --git a/man/wb_set_sheetview.Rd b/man/wb_set_sheetview.Rd index bd6e2a0a1..f7996f162 100644 --- a/man/wb_set_sheetview.Rd +++ b/man/wb_set_sheetview.Rd @@ -59,7 +59,7 @@ wb_set_sheetview( \item{windowProtection}{Logical: if TRUE the panes are protected} -\item{workbookViewId}{Interger: Pointing to some other view inside the workbook} +\item{workbookViewId}{integer: Pointing to some other view inside the workbook} \item{zoomScale, zoomScaleNormal, zoomScalePageLayoutView, zoomScaleSheetLayoutView}{Integer: the zoom scale should be between 10 and 400. These are values for current, normal etc.} } diff --git a/src/pugi.cpp b/src/pugi.cpp index e7368b3bb..e233e3373 100644 --- a/src/pugi.cpp +++ b/src/pugi.cpp @@ -20,7 +20,7 @@ SEXP readXMLPtr(std::string path, bool isfile, bool escapes, bool declaration, b } if (!result) { - Rcpp::stop("xml import unsuccessfull"); + Rcpp::stop("xml import unsuccessful"); } XPtrXML ptr(doc, true); @@ -56,7 +56,7 @@ SEXP readXML(std::string path, bool isfile, bool escapes, bool declaration, bool } if (!result) { - Rcpp::stop("xml import unsuccessfull"); + Rcpp::stop("xml import unsuccessful"); } std::ostringstream oss; diff --git a/src/strings_xml.cpp b/src/strings_xml.cpp index 035bfc0ca..564b32cae 100644 --- a/src/strings_xml.cpp +++ b/src/strings_xml.cpp @@ -50,7 +50,7 @@ SEXP xml_to_txt(Rcpp::CharacterVector vec, std::string type) { pugi::xml_parse_result result = doc.load_string(tmp.c_str(), pugi::parse_default | pugi::parse_ws_pcdata | pugi::parse_escapes); if (!result) { - Rcpp::stop(type.c_str(), " xml import unsuccessfull"); + Rcpp::stop(type.c_str(), " xml import unsuccessful"); } for (auto is : doc.children(type.c_str()))