admin/Slnkxlsx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#89391 SLNKXLSX 1.03 voor unicode ondersteuning title en author

Browse Source 
svn path=/Slnkxlsx/trunk/; revision=71128
This commit is contained in:
Jos Groot Lipman
2025-12-03 12:16:23 +00:00
parent 4ef4597279
commit 8b36f5f56c
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SLNKXLSX/SLNKWorkbook.cpp
View File

@@ -108,7 +108,9 @@ STDMETHODIMP CWorkbook::set_property(BSTR name, BSTR value)
return invalid();
CString nm(name);
CString v(value);
// Let op: Die string moet echt UTF-8 encoded zijn!
COLE2T v(value, CP_UTF8);
nm.MakeLower();
if (nm == "title")
m_doc_properties.title = lxw_strdup(v);

2
SLNKXLSX/SLNKXLSXVersion.h
View File

@@ -1,6 +1,6 @@
// Zorg dat versies alfabetisch altijd op elkaar volgen!
#define SLNK_MAJOR_VERSION 1
#define SLNK_MINOR_VERSION 02
#define SLNK_MINOR_VERSION 03
#define SLNK_BUILD_VERSION 0
// Define resource strings

22
Testing/excel.js
View File

@@ -7,8 +7,8 @@ var oExcel = new ActiveXObject("SLNKXLSX.Excel");
var oWb = oExcel.workbook_new("./hello_world.xlsx");
var oWs = oWb.add_worksheet("Sheet1");
oWb.set_property("author", "Jos Groot Lipman");
oWb.set_property("title", "De titel");
oWb.set_property("author", "Jos Groot Lipman is ok<6F>"); // met accenten
oWb.set_property("title", "D<EFBFBD> titel");
oWb.set_property("comments", "Created with Facilitor v{0}");
oWs.write_string(0, 0, "Tekst met Euro <20>", 1);
@@ -19,6 +19,8 @@ oWs.write_string(0, 3, "Datum", 1);
oWs.write_string(0, 4, "DatumTijd", 1);
oWs.write_string(0, 5, "Tijd", 1);
oWs.write_string(0, 6, "Datum 2", 1);
oWs.write_string(0, 7, "Datum in 1966", 1);
oWs.write_string(0, 8, "Datum in 2024", 1);
oWs.write_string(1, 0, "Een tekst");
oWs.write_number(1, 1, 5678);
@@ -27,6 +29,18 @@ oWs.write_unixtime(1, 3, new Date().getTime() / 1000, 0); // zonder tijdzone?
oWs.write_unixtime(1, 4, new Date().getTime() / 1000, 1);
oWs.write_unixtime(1, 5, new Date().getTime() / 1000, 2);
oWs.write_vardate(1, 6, new Date().getVarDate(), 1); // met tijdzone
oWs.write_vardate(2, 6, new Date().getVarDate(), 0); // date only
oWs.write_vardate(3, 6, new Date().getVarDate(), 2); // time only
var jos = new Date('July 28, 1966')
WScript.Echo(jos.getVarDate())
oWs.write_vardate(1, 7, jos.getVarDate(), 0);
oWs.write_unixtime(2, 7, jos.getTime() / 1000, 0);
var jos = new Date('July 28, 2024')
oWs.write_vardate(1, 8, jos.getVarDate(), 0);
oWs.write_unixtime(2, 8, jos.getTime() / 1000, 0);
var jos = new Date('July 28, 2121')
oWs.write_vardate(1, 9, jos.getVarDate(), 0);
oWs.write_unixtime(2, 9, jos.getTime() / 1000, 0);
var len = oWs.write_string(3, 0, "29-11-2023 16:24"); // 157 moeten we ombouwen naar 15?
WScript.Echo("Lengte: " + len);
@@ -41,6 +55,10 @@ oWs.set_column_width(2, len / 10, 1);
//var oWs = oWb.add_worksheet("Sheet2");
oWs.insert_image(6, 0, "fa-coffee 16x16.png");
oWs.write_number(5, 1, 100)
oWs.write_number(6, 1, 200)
oWs.write_formula(7, 1, "SUM(B6:B7)")
oWs.write_string(65536, 0, "Deze cell moet ook beschrijfbaar zijn");