Mercurial > mxe-octave

annotate src/of-io-1-fixes.patch @ 4355:7f5714e37725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnupplot: use -std=gnu++11 option when compiling gnuplot for mingw * src/gnuplot add -std=gnu++11 to CXX
author John D
date Thu, 23 Feb 2017 14:08:40 -0500
parents a40ff07ce987
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4243
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
1 diff -ur io-2.4.5.orig/inst/private/__OCT_xlsx2oct__.m io-2.4.5/inst/private/__OCT_xlsx2oct__.m
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
2 --- orig/inst/private/__OCT_xlsx2oct__.m 2016-11-08 22:05:13.000000000 +0100
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
3 +++ src/inst/private/__OCT_xlsx2oct__.m 2016-11-12 21:43:52.076390219 +0100
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
4 @@ -196,7 +196,7 @@
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
5 vals = ctext(vals);
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
6 ids = cellfun (@isempty, vals);
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
7 if (any (ids))
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
8 - vals {find (ids)} = "";
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
9 + vals(ids) = {""};
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
10 endif
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
11 ## Cell addresses
a40ff07ce987 of-io: add patch file for error from 2.4.5 release of io package.
John D
parents:
diff changeset
12 valraws = cell2mat (regexp (rawdata, '<c r="(\w+)"(?: s="\d+")? t="s"><v(?:.*?)>\d+</v>', "tokens"));