From 0e4645f9bffac8e1b3d947449cbe8a732ffa5ade Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 18 Apr 2018 11:42:22 +0000 Subject: [PATCH] fpspreadsheet: Check (and fix) compilation of all demo projects (changed handling of include files in fpc 3.0.4) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6317 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../db_import_export/db_export_import.lpi | 11 ++++++----- .../examples/other/demo_expression_parser.lpi | 11 ++++++----- .../examples/other/demo_formula_func.lpi | 13 ++++++++++--- .../examples/other/demo_recursive_calc.lpi | 11 ++++++----- .../examples/other/demo_search.lpi | 14 ++++++-------- .../examples/other/demo_sorting.lpi | 11 ++++++----- .../examples/other/demo_virtualmode_read.lpi | 11 ++++++----- .../examples/other/demo_virtualmode_write.lpi | 11 ++++++----- .../examples/other/demo_write_colors.lpi | 11 ++++++----- .../examples/other/demo_write_formatting.lpi | 14 ++++++-------- .../examples/other/demo_write_formatting.pas | 11 +++++++---- .../examples/other/demo_write_formula.lpi | 13 ++++++++++--- .../other/demo_write_headerfooter_images.lpi | 12 ++++++++++-- .../examples/other/demo_write_images.lpi | 12 ++++++++++-- .../examples/read_write/csvdemo/csvread.lpi | 12 ++++++++++-- .../examples/read_write/csvdemo/csvwrite.lpi | 12 ++++++++++-- .../read_write/excel2demo/excel2read.lpi | 12 ++++++++++-- .../read_write/excel5demo/excel5read.lpi | 12 ++++++++++-- .../read_write/excel5demo/excel5write.lpi | 12 ++++++++++-- .../read_write/excel8demo/excel8read.lpi | 13 ++++++++++--- .../read_write/excel8demo/excel8write.lpi | 18 +++++++++++------- .../read_write/excel8demo/excel8write.lpr | 2 +- .../read_write/excelxmldemo/excelxmlwrite.lpi | 12 ++++++++++-- .../examples/read_write/htmldemo/htmlread.lpi | 12 ++++++++++-- .../read_write/htmldemo/htmlwrite.lpi | 12 ++++++++++-- .../read_write/htmldemo/htmlwrite.lpr | 2 +- .../read_write/ooxmldemo/ooxmlread.lpi | 12 ++++++++++-- .../read_write/ooxmldemo/ooxmlwrite.lpi | 12 ++++++++++-- .../read_write/ooxmldemo/ooxmlwrite.lpr | 2 +- .../ooxml_decrypt_and_read.lpi | 12 ++++++++++-- .../ooxml_decrypt_and_read.pas | 4 ++-- .../ooxmldemo_crypto/protected_workbook.xlsx | Bin 12800 -> 9745 bytes .../read_write/opendocdemo/opendocwrite.lpi | 12 ++++++++++-- .../wikitabledemo/wikitableread.lpi | 13 ++++++++++--- .../wikitabledemo/wikitablewrite.lpi | 12 ++++++++++-- .../wikitabledemo/wikitablewrite.lpr | 2 +- .../fpspreadsheet/source/common/xlsxml.pas | 4 ++-- .../source/laz_fpspreadsheet.lpk | 1 + .../fpspreadsheet/tests/spreadtestgui.lpi | 2 +- 39 files changed, 272 insertions(+), 113 deletions(-) diff --git a/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi b/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi index 693d5e1f4..e0482d46d 100644 --- a/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi +++ b/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi @@ -1,7 +1,7 @@ - + @@ -20,9 +20,10 @@ - - - + + + + @@ -53,7 +54,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi index 24d6d9037..8ddc3d104 100644 --- a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi +++ b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -51,7 +52,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_formula_func.lpi b/components/fpspreadsheet/examples/other/demo_formula_func.lpi index fbe7d3cc3..016c92587 100644 --- a/components/fpspreadsheet/examples/other/demo_formula_func.lpi +++ b/components/fpspreadsheet/examples/other/demo_formula_func.lpi @@ -1,7 +1,7 @@ - + @@ -25,9 +25,16 @@ - + + + + + + + + @@ -52,7 +59,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi index 072159087..2fa480ee8 100644 --- a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi +++ b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -47,7 +48,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_search.lpi b/components/fpspreadsheet/examples/other/demo_search.lpi index a1335b3be..6bcfaf077 100644 --- a/components/fpspreadsheet/examples/other/demo_search.lpi +++ b/components/fpspreadsheet/examples/other/demo_search.lpi @@ -1,7 +1,7 @@ - + @@ -24,17 +24,15 @@ - - - + + + + - + - - - diff --git a/components/fpspreadsheet/examples/other/demo_sorting.lpi b/components/fpspreadsheet/examples/other/demo_sorting.lpi index 10b3ea03c..7aae88787 100644 --- a/components/fpspreadsheet/examples/other/demo_sorting.lpi +++ b/components/fpspreadsheet/examples/other/demo_sorting.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -47,7 +48,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi index 87732ea49..9b261c458 100644 --- a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi +++ b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -47,7 +48,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi index 031ce82c5..d9a956219 100644 --- a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi +++ b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -47,7 +48,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_write_colors.lpi b/components/fpspreadsheet/examples/other/demo_write_colors.lpi index a77936cbb..daef1710f 100644 --- a/components/fpspreadsheet/examples/other/demo_write_colors.lpi +++ b/components/fpspreadsheet/examples/other/demo_write_colors.lpi @@ -1,7 +1,7 @@ - + @@ -24,9 +24,10 @@ - - - + + + + @@ -47,7 +48,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi index e29c37cff..2d1fb10e6 100644 --- a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi +++ b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi @@ -1,7 +1,7 @@ - + @@ -26,17 +26,15 @@ - - - + + + + - + - - - diff --git a/components/fpspreadsheet/examples/other/demo_write_formatting.pas b/components/fpspreadsheet/examples/other/demo_write_formatting.pas index a3e909fdf..9c98473e7 100644 --- a/components/fpspreadsheet/examples/other/demo_write_formatting.pas +++ b/components/fpspreadsheet/examples/other/demo_write_formatting.pas @@ -138,7 +138,8 @@ begin end; const - TestFile='test3.odt'; + TestFileODS='test3.ods'; + TestFileXLS='test.xls'; {$R *.res} @@ -153,9 +154,11 @@ begin WriteSecondWorksheet(); // Save the spreadsheet to a file -// MyWorkbook.WriteToFile(MyDir + 'test3.xls', sfExcel8, False); - MyWorkbook.WriteToFile(MyDir + TestFile, sfOpenDocument, False); + MyWorkbook.WriteToFile(MyDir + TestFileXLS, sfExcel8, true); + MyWorkbook.WriteToFile(MyDir + TestFileODS, sfOpenDocument, true); MyWorkbook.Free; - writeln('Finished. Please open "'+TestFile+'" in your spreadsheet program.'); + + WriteLn('Finished. Please open "'+TestFileXLS+'" and "' + TestFileODS + '" in your spreadsheet program.'); + ReadLn; end. diff --git a/components/fpspreadsheet/examples/other/demo_write_formula.lpi b/components/fpspreadsheet/examples/other/demo_write_formula.lpi index b598c7212..46fe9a92d 100644 --- a/components/fpspreadsheet/examples/other/demo_write_formula.lpi +++ b/components/fpspreadsheet/examples/other/demo_write_formula.lpi @@ -1,7 +1,7 @@ - + @@ -49,9 +49,16 @@ - + + + + + + + + @@ -71,7 +78,7 @@ - + diff --git a/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi b/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi index e739dd098..ac29775f3 100644 --- a/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi +++ b/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/other/demo_write_images.lpi b/components/fpspreadsheet/examples/other/demo_write_images.lpi index 07a8d5088..1a758f758 100644 --- a/components/fpspreadsheet/examples/other/demo_write_images.lpi +++ b/components/fpspreadsheet/examples/other/demo_write_images.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi index f6fb36808..02306a3df 100644 --- a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi +++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi index 71f748cea..180d6826c 100644 --- a/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi +++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -50,6 +57,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi index 488465008..3848509eb 100644 --- a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi +++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi index 1379ce2b2..b56a30055 100644 --- a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi +++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi index 2fe0b95c1..a98dbc52c 100644 --- a/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi +++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi index 2e95e1e51..77b40c03b 100644 --- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi +++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi @@ -1,7 +1,7 @@ - + @@ -22,9 +22,16 @@ - + + + + + + + + @@ -45,7 +52,7 @@ - + diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi index d6f8aafa3..e7624f939 100644 --- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi +++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi @@ -1,7 +1,7 @@ - + @@ -23,24 +23,27 @@ - + + + + + + + + - + - - - - @@ -50,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr index 6ff79e30a..c8ab69160 100644 --- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr +++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr @@ -10,7 +10,7 @@ program excel8write; {$mode delphi}{$H+} uses - Classes, SysUtils, fpspreadsheet, fpsRPN, xlsbiff8, fpsTypes, fpsCell; + Classes, SysUtils, fpstypes, fpspreadsheet, fpsRPN, xlsbiff8, fpsCell; const Str_First = 'First'; diff --git a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi index 99df1e788..adcec4500 100644 --- a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi +++ b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi index b2a5cbc8f..996843954 100644 --- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi +++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi index ea0bcc908..492acd881 100644 --- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi +++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr index c25b4463e..9118936cf 100644 --- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr +++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr @@ -165,7 +165,7 @@ begin inc(row); // Save the spreadsheet to a file - MyWorkbook.WriteToFile(MyDir + 'test.html', sfHTML); + MyWorkbook.WriteToFile(MyDir + 'test.html', sfHTML, true); finally MyWorkbook.Free; diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi index c088c44ad..0b3839f5b 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi index 11824f89a..cfc43f33b 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr index ddf872f2f..a0618e5b9 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr @@ -108,7 +108,7 @@ begin MyWorksheet.WriteNumber(8, 6, 1.66666667, nfFraction, '# ?/?'); // Save the spreadsheet to a file - MyWorkbook.WriteToFile(MyDir + 'test.xlsx', sfOOXML); + MyWorkbook.WriteToFile(MyDir + 'test.xlsx', sfOOXML, true); MyWorkbook.Free; end. diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi index 500d24220..9969b2d3a 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -52,6 +59,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas index d932d0937..5b82c0b47 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas @@ -16,7 +16,7 @@ program ooxml_decrypt_and_read; {$mode delphi}{$H+} uses - Classes, SysUtils, LazUTF8, fpstypes, fpspreadsheet, laz_fpspreadsheet, + Classes, SysUtils, LazUTF8, fpstypes, fpspreadsheet, //laz_fpspreadsheet, xlsxooxml_crypto; var @@ -27,7 +27,7 @@ var cell: PCell; i: Integer; password: String; - Prot_enc: Integer = 1; // 0 - protected, 1 - encrypted workbook + Prot_enc: Integer = 0; // 0 - protected, 1 - encrypted workbook begin MyDir := ExtractFilePath(ParamStr(0)); diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx index fa66a2fc18b9137e14af5776cc2a645519c6fa27..6a5136e44ff73767096dd7443686659477bb029d 100644 GIT binary patch literal 9745 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 literal 12800 zcmeHr1yo(h*5<`E!QI^+{>4Eg{FD%JdlR2M+HCCCD#3Ni&+?185>Q2$3n4P>F8@}c}6 zjfeIl0eDFXErEdiCIv|H0H6+X`61a7ZbLHFIAa`l7% zc8nIVM>jyCEno$w-*)`PGA0NX=BNC>x_{`@ioeePGk-(P0gYEEpm_kQBWV0X>%Wcv zzhfGz<^LQK25hVZcpo$dodG{|23Y~ozz&l9;g8U`um$`Q>Z9y`8Yxi!`3a!-PZQL~ zpzquK%Apfb0{BOHfeRR;{v%&OV`f9&^vdjEf1-+!0D^Q-=$wujyo|BQah z2Q8iaK|UgI-n#)g#u4zkfA;PHm4*E;=pX8BPe$pTF*)O+Fn;%)# z{KxH&5~K#?b#dSffM!|?fQtk9Qyt)vKl}rFOLPYEJv0-$0H+4@UjdXa* zIIUCviIALlO;H2TVda4lk|6KcjDo>{TWoM*$R@dBv`k&s4Nw6|P9QH&ZGM(Tx zW<;2ps0%m)3B^-!TbjWx(gpql>aEKlm5R&MaIrnLH@!OxzS!8R;Aai+HI|h%ht&c* zU!1~oSrz}T|9k0U6|9<`V^TzZgjezdz@D-HoW%5pWRcbXe60-i3(aAuMhDtd=3`TRi01F9UN}t zS1^5ev|Y+Y=e(P|cGGa5NS3#cbnY$`+%S%#he;l5TBJUL=ZyjPO(MuX=3%sT8FN`0m&S`H7A2wvW? z4(=BGUijsML|&HbJhOFq8^me6+4D2XH`)<<(w6?ax1rv|kMg?mgxiwSFM^IzFD>Kd zvU}arj#D?_C_b^93BKImjsHUVMbp!(hR1XufZN8n_>xY)eI-6+)UqMM@vSlp4X1Cj zs{vuUxE!-s^Kntp*Sr$-*WH7(`F9Tbu-kdDY)8_l)Rgvz^Lf(8_PW??{nX#S_j;=s zEy@`sRzgB(m%}uTOF|eWX$L*cq?J<=91wL|e5e^Fk1Sp|&a-;N&L1;~8bVgl`V|7E zlZavM(DBOCJ%{1cglxcO`O-X~ZH@Uxi6KwH$bQ-mRPw`*%Mn&3l#; zl$07;^$1~A&xlg!UaculO-hd3jN1BYBmNtnkteZpG#sDZEvEV-%5pC;N`;LAWpC?9 zKJDp{H%;}I)_fQ-IQFOmd-m>(>x~&2ysY&Q>ClP3*&@f(?@ff0O2{U*rBowxI}Tf{ zp74T!sMgkDDo23t6J-vlq1Dx~QApwN+wL?xz&Shm@I_*SsBYmYJMR;$NU~3l;B7@j zmQM7K%#ui>8*c-~+(y(ARA+kA`qM8MZ*rAZ(OT|`9F|jP89K_`%-!4M5D;?S+cErq zciv!8JPvB)Dz>e8CD$CU0C#^_F7u}8Qd0p&J_Ld>*fNdZQ$ENTmh1Hd?K!4pUlzL>woEUMltbB&Y#1{`?y0qQ+~C(z{5A?_7n3a<@5>2MJCty06cIqd~Yb z75tnLo4;(<6-7>1!25vY zo3{G6lm$EqshhHvwOKFIXYrzxDnxfB>s^vyO#|wq(LIM$!ZS96BnOjx*0?vPZQVOZaL*6Rz|^M3=0a^=e4XJs+{Vun zb%;`h<6IsNf$i3=l01ok+T*)=+__AnqROPY`t@d}io)4<`QRaiA#LD}L>$vBYTePqki*zY_EyrlR>0T%W zblBl6p~Idg#1n)wxP|VVWo54ODz$eTunPT{_LwpEpHC2)lR8p%9lQF?=a$$eGp{tR zcxMzd21@pepD4WC6(F{Ex{=b)9`}xp2M#B4AVk{AoqB#V zbDEH;n2!h_Q^{N+mDrj!i&BG<-|EQQf5c@E;rK()h`NJ^H~UfvF_CbjD6;I8AhWd} zA(;XX-LQ@U0>>wY1Prqbf7;Nyi9V%OE1RcU)Vrizi1S?+x42l@_jq~U)gCGHIpe{H zc}+Bz;5}|+P!+PzglsU&4IBG~NK1YTT6qCalJ@k(%D65F>)S>vN1jg)t% z0(8|l&jNfdrs)we;2COEM$xa3>nOI}?7Vkx$lXb#rVPpPjjx*w`^lxm_=`;PqUv9v z1}J5eT)dYQ(TzS~M7`zZ+nALOYURV&l_!4Bv){32y^_B)PKcX~=dJOE9Jc>fRe;Tl zPbx=Qo70x*d*1cnBViaa;S+W@X_)g}7L##bt0`fGclkq&R_aCJ6q=adoX;*@Xh|x$ zbae8f80@Dprwd9VLu!v--}{ho*`mPsT#Y?O%#<9pm+&j^v)Vm`9fnWHwLUe$V;I|} z)2H5!LX*>PZfV2?>XatcHs))G?4@NmAc$MK{+J7Ni3WFVS7}CgRO!xkEa>us35{Af ztp_3pgJ0P4IdW-*bxmJbacbV+s^uuyL6(DVLEf4yuz}317Gns?>N@RQg!GLRmS+lb z_ZE59*}R+cl^m_&A9tFe4v&*{R+OA=jpsll0|g7POB&moJ_zx$VJmO6etyF+s78@` zw&0^5(PG=EXL&hOQ(2y$Ez~y(s<`1E_ zkbfWa4;-=gNH!U zOsgSf1#*vzd@Ya~1d(%_1H~zz97~eBO`mRfn6?mV_tbtR8Y121 zqVr|OuhuCYee-29~KO{99tS(;L#B`ZcHe zTyTY*jox`aqZ{BpFCMlC%N)!saI!r59u> z(9BG`jwsN$x+9#h#%zy$dMy3TX(otJ?WM>e1twIf8^p3Lu_K8rDTsG|`i<$`gq@7I4v(&&8)diK zYu-D`1SYxi0fr4js1k>(q%WA>XF zGFY5q7FWKwgI1wI5*fvLZ`N3qt$l|hc@v#_~=-9iEdvMw`}*f>df~C zJqyo2N^{NNe_X~uGp54moS^pYUS!4D6-hitAD`z}Z*|u((qX~P_RK2vtD&~~-2=L_ z$DZt#&sg_ZmsLGznRxiu;s!`O^ouT+B%|9gn@!0jeC|K&iPT4{DQdHp@v`gZpfOZd zVPm1j;6_pywMJ1^_B33tJt-3auMfrnM~8+G@9sqb7=v#=Dtru<5J`1KL0b~lCFdHY zog8zhX+U@2WT3cA}^WN^BfJ(~%3 zSU);eafh~{3!mubAYZN~|0h}M_4!*CNBJ%9W-3OK{@kGA-Io2cDT?ox>Huksiyb+=0&_2 zMDC%v-icnc7bBf7WGaK%U+wm`Q6M3~Zxphfc!h0T%7ZiCqVbLdt!y>AsZ#N4Kh8u- z>>FY1GZxD>W#Xx|!w8*YGL7B6F6*U)kX`+5ILZ2(LWlk}RPhRUW1ib;82LvhcGwK^ z8s}{I{OBg9Fb=mG zP1Nx@sq|V`QBdaKw6C7da=q$tf8oP2xDFL1(;&;bjorXF_BDXl@ zd7{Qt;KNF9r*b&VVMy=OoO6lbU3H1LhIZK^IAMbxn-wL$1=kK?!lg5hSD- z*LL=K{B8D&E}2;>25Vk|$mo;fCG$Lvh)+npFH##={=Gy;Sr74o^~!TtU(UsWB^*X2@Tj_excH z*|4|x8!rSgihjV|kvgoKPg6r-dm~`)U2jt6JHf8;H2H=0vX?4KhozHOc7g%gc<%g~ zGL0;qioD6G=GW-lw66A?dqT4;nu)S^oB^Yt?0i_+muO7_kv+Q}@y3<-FY(Us$(#I4 zDq!zd;H5-_#S~Da_6DAMdg5$@pAz}^Hxh>BA!p#mp!o0(zLn^(&s7TAPd61Y+U~eC zki$OU+O!Y>=OE34w8NB1jo-h7`LOVcMIg#Fcr=0Jz}Xv>YIHP+7YW72$52joe?C`S z;$fr7au?3)1NynzDMF;ttPJP0!;hs)gD!?V2_r3i^0{cDdxtiwD5+o6nZ@NJRqC3a z|Nj49|LJuj1~yBRM5g%FJ06`81cwhj6(}yes@W-pYFbO)=+~R3%(l*YFM7&eQRWd{ zR;7>Fh3iit6(Sj6zruMn<#PGOf-T64!LxtgQPopl$W}%}=B|>%rn~ZSH>U^xsywRL z@^^5ZfUx|jN779C{iGNBvr8~BJ8|Dm?Y)!-x8uLp1%YSc21erT6txB1$1ZUQz4bpG zxKWk+zDRJ#Hww`#9MC(s(j=tO3j0_XxKd*7AveiVP_H=9AGrDsaqYoDA-irWnY*0& zRh<4wbHqEio|H$k{;kie7Vm-#zp~a}`-#|wfEib;yCqxx_|wCe<$) zheLSOh{GewqreDuW+m!Bus|7TL)q7}unOfwv89u{cUYvmtN9A<;}cV|245?itdBLR z!>G?YL!UPK^d}V@>7xzdYhyN#?qp_m3?-pNKGbqobW-Zi9g(sdnkmtbHZpLvABklZH(fpAz)`M=#s^B!aD!VE?i}$c{ zC?(DN&KT6@@uQO=&#bgK_FxqxqgkAztI%NlE80|f7Ri}%sUNW%vn1Q>Lc}+(FSVMu z>e~WzJ3p7+Q|ZHG_MAlxk5Z;@=5`4XnaclxfW!13w?m=CF28D z(Wo237`Ue9*>{#7NIQ=?^cM^+uVScSIJ4!F zc@@NW!}zlNy7Qv9kh-@kihApkM{)Etagb0pFWm5vt z7UiHbY;V4URXLu(Idz*P%njkkZQ=5cva_`+4bd2djtl%q!G>D2VP$(4F=z1VLqeT9 zyrj+@Q6j5}xYGLzAqJYN$q_?@qA%oN{E$tIhu)I;u2ejw=}A++8o;-d($*;VK=NV4 zD|cX)lVi^hTjr0dYOj?PX;)k1A$Gztx@ZA^BOHiL7X|y(^ZN$UJ`?N?JjtbcHc3?_ z^`JMcv>VwDGyWlRbUytV;|mywKi1+2?gfYrh3nhiO8A_k~ezmulK)ove-Vg zw%AA3r{5OwP+t$>ITjuGA|ft?Jpf0}4e2Qf`iSEooc-QJ5*DwH;X6b_%k)LxExi1T zSy|;PuRyHh>4y5L$8Yag10fuS1{<4F`s|r7H7)+M-d1}zgnP4|CG?oX0R^2XdI<-{ zYfT;g^4u?l7DfD=r#WHysVz}cXA8X85p6`Ty1H;xU?`*zvnTx#{kjr@9i3rJ@q&c0^5mCdMK55O;gj zK5mbUOK!mAksUkgZbEnpfl*+4f*jZhGXutfG`;vy0!Q=+e!ZawYqO)?2fpV?3FpI$ zJxLfZbK6A?f~+_N0_CS>zsBKj`4>LDD5@SgxB4C~pVjvCaP6VA^hzhkv=ju7wqzED zORW)2=iXpnZjsM&mALv-2}Dw##T*XxXHT@U9AIQ1W%-U%A;cI~QyJX%+Ar#J*Llr9 zl5K5ARSe&?W!vgGqn@}?n)KcOKvg<=&6 - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi index e8774d6d4..a0f52edd0 100644 --- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi +++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi @@ -1,7 +1,7 @@ - + @@ -22,9 +22,16 @@ - + + + + + + + + @@ -45,7 +52,7 @@ - + diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi index ecc2d58e9..0be953f15 100644 --- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi +++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi @@ -1,7 +1,7 @@ - + @@ -23,9 +23,16 @@ - + + + + + + + + @@ -46,6 +53,7 @@ + diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr index 9f121f66a..e3e282a7b 100644 --- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr +++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr @@ -164,7 +164,7 @@ begin inc(row); // Save the spreadsheet to a file - MyWorkbook.WriteToFile(MyDir + 'test.wikitable_wikimedia', sfWikitable_wikimedia); + MyWorkbook.WriteToFile(MyDir + 'test.wikitable_wikimedia', sfWikitable_wikimedia, true); MyWorkbook.Free; end. diff --git a/components/fpspreadsheet/source/common/xlsxml.pas b/components/fpspreadsheet/source/common/xlsxml.pas index ca578d50c..2c1aa8f89 100644 --- a/components/fpspreadsheet/source/common/xlsxml.pas +++ b/components/fpspreadsheet/source/common/xlsxml.pas @@ -874,8 +874,8 @@ begin // Protection protectStr := Format(INDENT3 + '%s' + LF + INDENT3 + '%s' + LF, [ - AWorksheet.IsProtected and (spObjects in AWorksheet.Protection), - AWorksheet.IsProtected {and [spScenarios in AWorksheet.Protection])} + StrUtils.IfThen(AWorksheet.IsProtected and (spObjects in AWorksheet.Protection), '1', '0'), + StrUtils.IfThen(AWorksheet.IsProtected {and [spScenarios in AWorksheet.Protection])}, '1', '0') ]); // Put it all together... diff --git a/components/fpspreadsheet/source/laz_fpspreadsheet.lpk b/components/fpspreadsheet/source/laz_fpspreadsheet.lpk index 2e038b85a..9630cf84c 100644 --- a/components/fpspreadsheet/source/laz_fpspreadsheet.lpk +++ b/components/fpspreadsheet/source/laz_fpspreadsheet.lpk @@ -8,6 +8,7 @@ + diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi index 6bf720977..1d3c3cc85 100644 --- a/components/fpspreadsheet/tests/spreadtestgui.lpi +++ b/components/fpspreadsheet/tests/spreadtestgui.lpi @@ -161,7 +161,7 @@ - +