This commit is contained in:
Brecht Sanders 2020-06-18 12:20:13 +02:00
parent 2f891a23ff
commit 489279e514
10 changed files with 39 additions and 40 deletions

View File

@ -18,7 +18,7 @@
<time.h>
<wchar.h>
1521232544 source:\\server\users\brecht\sources\cpp\xlsxio\examples\example_xlsxio_read.c
1521236144 source:\\server\users\brecht\sources\cpp\xlsxio\examples\example_xlsxio_read.c
<stdlib.h>
<stdio.h>
<string.h>
@ -31,7 +31,7 @@
<fcntl.h>
"xlsxio_read.h"
1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
<stdlib.h>
<stdint.h>
<time.h>

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
"xlsxio_read.h"
@ -14,22 +14,22 @@
<unistd.h>
<zip.h>
1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
<wchar.h>
1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
<stdint.h>
<expat.h>
1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
<stdlib.h>
<stdint.h>
<time.h>
<wchar.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
<stdlib.h>

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
"xlsxio_read.h"
@ -14,22 +14,22 @@
<unistd.h>
<zip.h>
1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
<wchar.h>
1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
<stdint.h>
<expat.h>
1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
<stdlib.h>
<stdint.h>
<time.h>
<wchar.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
<stdlib.h>

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
"xlsxio_read.h"
@ -14,22 +14,22 @@
<unistd.h>
<zip.h>
1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
<wchar.h>
1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
<stdint.h>
<expat.h>
1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
<stdlib.h>
<stdint.h>
<time.h>
<wchar.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
<stdlib.h>

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
1592475236 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
"xlsxio_read.h"
@ -14,22 +14,22 @@
<unistd.h>
<zip.h>
1521230938 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
1521234538 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_private.h
<wchar.h>
1522317819 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
1522321419 \\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.h
<stdint.h>
<expat.h>
1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
1585050781 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
<stdlib.h>
<stdint.h>
<time.h>
<wchar.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
1522321402 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
"xlsxio_private.h"
"xlsxio_read_sharedstrings.h"
<stdlib.h>

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
1584727926 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
"xlsxio_write.h"
"xlsxio_version.h"
<stdlib.h>
@ -15,10 +15,10 @@
<windows.h>
<pthread.h>
1583781545 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
1583785145 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
<stdlib.h>
<stdint.h>
<time.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
1584727926 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
"xlsxio_write.h"
"xlsxio_version.h"
<stdlib.h>
@ -15,10 +15,10 @@
<windows.h>
<pthread.h>
1583781545 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
1583785145 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
<stdlib.h>
<stdint.h>
<time.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
1584727926 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
"xlsxio_write.h"
"xlsxio_version.h"
<stdlib.h>
@ -15,10 +15,10 @@
<windows.h>
<pthread.h>
1583781545 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
1583785145 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
<stdlib.h>
<stdint.h>
<time.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h

View File

@ -1,5 +1,5 @@
# depslib dependency file v1.0
1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
1584727926 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
"xlsxio_write.h"
"xlsxio_version.h"
<stdlib.h>
@ -15,10 +15,10 @@
<windows.h>
<pthread.h>
1583781545 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
1583785145 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_write.h
<stdlib.h>
<stdint.h>
<time.h>
1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
1585051485 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h

View File

@ -1158,14 +1158,13 @@ void data_sheet_expat_callback_find_cell_end (void* callbackdata, const XML_Char
if (XML_Char_icmp_ins(name, X("c")) == 0) {
//determine value
if (data->celldata) {
const XML_Char* s = NULL;
data->celldata[data->celldatalen] = 0;
if (data->cell_string_type == shared_string) {
//get shared string
XML_Char* p = NULL;
long num = XML_Char_strtol(data->celldata, &p, 10);
if (!p || (p != data->celldata && *p == 0)) {
s = sharedstringlist_get(data->sharedstrings, num);
const XML_Char* s = sharedstringlist_get(data->sharedstrings, num);
free(data->celldata);
data->celldata = (s ? XML_Char_dup(s) : NULL);
}