fix for issue ycphs#68

preparation for patch release on cran
kainhofer · May 7, 2020 · 8df3dfe · 8df3dfe
1 parent 146b938
commit 8df3dfe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: openxlsx
 Title: Read, Write and Edit xlsx Files
-Version: 4.1.5
-Date: 2020-05-06
+Version: 4.1.5.1
+Date: 2020-05-07
 Language: en-US
 Authors@R: 
     c(person(given = "Philipp",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# openxlsx 4.1.5.1
+
+*  fixed issue [#68](https://github.com/ycphs/openxlsx/issues/68])
+
+
 # openxlsx 4.1.5
 
 *  include tests for cloneWorksheet

diff --git a/R/wrappers.R b/R/wrappers.R
@@ -940,7 +940,8 @@ createStyle <- function(fontName = NULL,
     if (numFmt %in% validNumFmt) {
       style$numFmt <- numFmtMapping[[numFmt[[1]]]]
     } else {
-      style$numFmt <- list("numFmtId" = 9999, formatCode = numFmt) ## Custom numFmt
+
+      style$numFmt <- list("numFmtId" = 165, formatCode = numFmt) ## Custom numFmt
     }
   }
 
@@ -1004,7 +1005,16 @@ addStyle <- function(wb, sheet, style, rows, cols, gridExpand = FALSE, stack = F
   od <- getOption("OutDec")
   options("OutDec" = ".")
   on.exit(expr = options("OutDec" = od), add = TRUE)
-
+
+
+
+
+  if(!is.null(style$numFmt)&length(wb$styleObjects)>0){
+  if(style$numFmt$numFmtId==165){
+    maxnumFmtId<-max(c(sapply(wb$styleObjects, function(i) as.integer(i$style$numFmt$numFmtId)),9999))
+    style$numFmt$numFmtId<-maxnumFmtId+1
+  }
+  }
   sheet <- wb$validateSheet(sheet)
 
   if (!"Workbook" %in% class(wb)) {