From eb4dbd80e501834951cc94a23347896cd16c6fa2 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 15 Sep 2014 21:27:57 +0000
Subject: [PATCH] fpspreadsheet: Modify demos to write compiled units to the
 common directory "lib" within the examples folder as far as possible.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3570 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/db_import_export/db_export_import.lpi  |  3 +--
 .../examples/excel2demo/excel2read.lpi              |  2 +-
 .../examples/excel2demo/excel2write.lpi             |  2 +-
 .../examples/excel5demo/excel5read.lpi              |  2 +-
 .../examples/excel5demo/excel5write.lpi             |  2 +-
 .../examples/excel8demo/excel8read.lpi              |  2 +-
 .../examples/excel8demo/excel8read.lpr              |  2 +-
 .../examples/excel8demo/excel8write.lpi             |  2 +-
 .../fpspreadsheet/examples/fpschart/fpschart.lpi    | 13 ++++++++-----
 .../fpspreadsheet/examples/fpschart/fpschart.lpr    |  3 ++-
 .../examples/fpsgrid_no_install/fpsgrid.lpi         |  2 +-
 .../fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi  |  2 +-
 .../fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi |  2 +-
 .../examples/opendocdemo/opendocread.lpi            |  5 ++---
 .../examples/opendocdemo/opendocread.lpr            |  3 +--
 .../examples/opendocdemo/opendocwrite.lpi           |  9 ++++++---
 .../examples/opendocdemo/opendocwrite.lpr           |  3 +--
 .../examples/other/demo_expression_parser.lpi       |  2 +-
 .../examples/other/demo_formula_func.lpi            |  2 +-
 .../examples/other/demo_recursive_calc.lpi          |  2 +-
 .../examples/other/demo_virtualmode_read.lpi        |  2 +-
 .../examples/other/demo_virtualmode_write.lpi       |  2 +-
 .../examples/other/demo_write_formatting.lpi        |  2 +-
 .../examples/other/demo_write_formula.lpi           |  2 +-
 .../examples/wikitabledemo/wikitableread.lpi        |  7 ++++++-
 .../examples/wikitabledemo/wikitableread.lpr        |  6 +++---
 .../examples/wikitabledemo/wikitablewrite.lpi       |  9 ++++++---
 .../examples/wikitabledemo/wikitablewrite.lpr       |  3 +--
 28 files changed, 54 insertions(+), 44 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 f364ff07f..42b4a8748 100644
--- a/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi
+++ b/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi
@@ -46,7 +46,6 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -59,7 +58,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi b/components/fpspreadsheet/examples/excel2demo/excel2read.lpi
index 7e6fa76f2..f485c578e 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi
+++ b/components/fpspreadsheet/examples/excel2demo/excel2read.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi b/components/fpspreadsheet/examples/excel2demo/excel2write.lpi
index 85d2183eb..885343b55 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi
+++ b/components/fpspreadsheet/examples/excel2demo/excel2write.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi b/components/fpspreadsheet/examples/excel5demo/excel5read.lpi
index 41edc14e8..66434812e 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi
+++ b/components/fpspreadsheet/examples/excel5demo/excel5read.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi b/components/fpspreadsheet/examples/excel5demo/excel5write.lpi
index a98d85c43..3bcb12a40 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi
+++ b/components/fpspreadsheet/examples/excel5demo/excel5write.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi b/components/fpspreadsheet/examples/excel8demo/excel8read.lpi
index 3dd5974f3..efc9f3ca5 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi
+++ b/components/fpspreadsheet/examples/excel8demo/excel8read.lpi
@@ -50,7 +50,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr b/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
index 41ec0f596..290bbb0f9 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
+++ b/components/fpspreadsheet/examples/excel8demo/excel8read.lpr
@@ -36,7 +36,7 @@ begin
 
   // Create the spreadsheet
   MyWorkbook := TsWorkbook.Create;
-  MyWorkbook.ReadFormulas := true;
+  MyWorkbook.Options := MyWorkbook.Options + [boReadFormulas];
 
   MyWorkbook.ReadFromFile(InputFilename, sfExcel8);
 
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi b/components/fpspreadsheet/examples/excel8demo/excel8write.lpi
index 8ebe4184e..3e604a548 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi
+++ b/components/fpspreadsheet/examples/excel8demo/excel8write.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/fpschart/fpschart.lpi b/components/fpspreadsheet/examples/fpschart/fpschart.lpi
index 543c006b6..f7e0b7d64 100644
--- a/components/fpspreadsheet/examples/fpschart/fpschart.lpi
+++ b/components/fpspreadsheet/examples/fpschart/fpschart.lpi
@@ -29,17 +29,20 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="3">
+    <RequiredPackages Count="4">
       <Item1>
-        <PackageName Value="TAChartLazarusPkg"/>
-        <MinVersion Major="1" Valid="True"/>
+        <PackageName Value="laz_fpspreadsheet"/>
       </Item1>
       <Item2>
-        <PackageName Value="laz_fpspreadsheet_visual"/>
+        <PackageName Value="TAChartLazarusPkg"/>
+        <MinVersion Major="1" Valid="True"/>
       </Item2>
       <Item3>
-        <PackageName Value="LCL"/>
+        <PackageName Value="laz_fpspreadsheet_visual"/>
       </Item3>
+      <Item4>
+        <PackageName Value="LCL"/>
+      </Item4>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/components/fpspreadsheet/examples/fpschart/fpschart.lpr b/components/fpspreadsheet/examples/fpschart/fpschart.lpr
index 37e458925..dd8f8cf5c 100644
--- a/components/fpspreadsheet/examples/fpschart/fpschart.lpr
+++ b/components/fpspreadsheet/examples/fpschart/fpschart.lpr
@@ -7,7 +7,8 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, tachartlazaruspkg, mainform, laz_fpspreadsheet_visual;
+  Forms, tachartlazaruspkg, mainform, laz_fpspreadsheet_visual,
+  laz_fpspreadsheet;
 
 {$R *.res}
 
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi b/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
index 861abc496..6e832d164 100644
--- a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
@@ -83,7 +83,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
index d970e3ad0..d18c50839 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
+++ b/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
@@ -55,7 +55,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
index 676406870..807bd6713 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
@@ -50,7 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
index 2b383bdaf..85a6f863c 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
@@ -32,7 +32,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="laz_fpspreadsheet"/>
+        <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
     <Units Count="1">
@@ -50,8 +50,7 @@
     </Target>
     <SearchPaths>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
-      <SrcPath Value=".."/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
index eb4af43fd..89b673173 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
@@ -11,8 +11,7 @@ program opendocread;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, fpspreadsheet, fpsallformats,
-  laz_fpspreadsheet;
+  Classes, SysUtils, fpspreadsheet, fpsallformats;
 
 var
   MyWorkbook: TsWorkbook;
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
index 49ad37280..8bd769207 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
@@ -32,7 +32,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="laz_fpspreadsheet"/>
+        <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
     <Units Count="1">
@@ -45,9 +45,12 @@
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="opendocwrite"/>
+    </Target>
     <SearchPaths>
-      <OtherUnitFiles Value=".."/>
-      <SrcPath Value=".."/>
+      <OtherUnitFiles Value="..\.."/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
index cd5b83481..1fa50146e 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
+++ b/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
@@ -10,8 +10,7 @@ program opendocwrite;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, fpspreadsheet, fpsallformats,
-  laz_fpspreadsheet;
+  Classes, SysUtils, fpspreadsheet, fpsallformats;
 
 var
   MyWorkbook: TsWorkbook;
diff --git a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
index c824526b3..23a7af816 100644
--- a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
+++ b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
@@ -58,7 +58,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
   </CompilerOptions>
   <Debugging>
diff --git a/components/fpspreadsheet/examples/other/demo_formula_func.lpi b/components/fpspreadsheet/examples/other/demo_formula_func.lpi
index 613b1a53d..6af531c5f 100644
--- a/components/fpspreadsheet/examples/other/demo_formula_func.lpi
+++ b/components/fpspreadsheet/examples/other/demo_formula_func.lpi
@@ -59,7 +59,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
index cb3eee288..100aa9695 100644
--- a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
+++ b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
@@ -53,7 +53,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
index e3620db2c..5792ed089 100644
--- a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
+++ b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
@@ -52,7 +52,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
index 78aa8f512..fd30185e0 100644
--- a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
+++ b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
@@ -52,7 +52,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
index ca37245d7..74f98840c 100644
--- a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
@@ -54,7 +54,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/other/demo_write_formula.lpi b/components/fpspreadsheet/examples/other/demo_write_formula.lpi
index d22c820d0..9ad69bc80 100644
--- a/components/fpspreadsheet/examples/other/demo_write_formula.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_formula.lpi
@@ -77,7 +77,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <OtherUnitFiles Value="../.."/>
-      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="../lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi b/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
index f129d363c..b9a7adc1d 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
+++ b/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
@@ -31,7 +31,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="laz_fpspreadsheet"/>
+        <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
     <Units Count="1">
@@ -44,8 +44,13 @@
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="wikitableread"/>
+    </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
+      <OtherUnitFiles Value="..\.."/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr b/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr
index b05cd02d0..69fa13407 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr
+++ b/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr
@@ -11,7 +11,7 @@ program wikitableread;
 
 uses
   Classes, SysUtils, fpspreadsheet, wikitable,
-  laz_fpspreadsheet, fpsutils;
+  fpsutils;
 
 var
   MyWorkbook: TsWorkbook;
@@ -54,8 +54,8 @@ begin
      UTF8ToAnsi(MyWorkSheet.ReadAsUTF8Text(CurCell^.Row,
        CurCell^.Col))
      );
-    if Length(CurCell^.RPNFormulaValue) > 0 then
-      WriteLn(' Formula: ', MyWorkSheet.ReadRPNFormulaAsString(CurCell))
+    if HasFormula(CurCell) then
+      WriteLn(' Formula: ', CurCell^.FormulaValue)
     else
       WriteLn;
     CurCell := MyWorkSheet.GetNextCell();
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi b/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
index 815f73380..03fb9593d 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
+++ b/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
@@ -32,7 +32,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="laz_fpspreadsheet"/>
+        <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
     <Units Count="1">
@@ -45,9 +45,12 @@
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="wikitablewrite"/>
+    </Target>
     <SearchPaths>
-      <OtherUnitFiles Value=".."/>
-      <SrcPath Value=".."/>
+      <OtherUnitFiles Value="..\.."/>
+      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr b/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr
index 567a6d7fc..e4eb7aac0 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr
+++ b/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr
@@ -10,8 +10,7 @@ program wikitablewrite;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, fpspreadsheet, wikitable,
-  laz_fpspreadsheet;
+  Classes, SysUtils, fpspreadsheet, wikitable;
 
 const
   Str_First = 'First';