From 380ac8247cac71bbac5c8ed1758ac5b0b336e806 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 13 Mar 2015 00:08:44 +0000
Subject: [PATCH] fpspreadsheet: Rearrange most of the demos into folders
 "read_write" and "visual"

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4019 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/opendocdemo/oocreated.ods        | Bin 7246 -> 0 bytes
 .../examples/opendocdemo/unzipoocreated.sh    |   5 ---
 .../examples/opendocdemo/unziptest.sh         |   5 ---
 .../examples/opendocdemo/ziptest.sh           |   3 --
 .../{ => read_write}/csvdemo/csvread.lpi      |   4 +-
 .../{ => read_write}/csvdemo/csvread.lpr      |   0
 .../{ => read_write}/csvdemo/csvwrite.lpi     |   6 +--
 .../{ => read_write}/csvdemo/csvwrite.lpr     |   0
 .../examples/read_write/csvdemo/readme.txt    |   5 +++
 .../excel2demo/excel2read.lpi                 |   4 +-
 .../excel2demo/excel2read.lpr                 |   0
 .../excel2demo/excel2write.lpi                |   4 +-
 .../excel2demo/excel2write.lpr                |   2 +-
 .../{ => read_write}/excel2demo/readme.txt    |   0
 .../excel2demo/run_excel2read.bat             |   0
 .../excel2demo/run_excel2write.bat            |   0
 .../excel5demo/excel5read.lpi                 |   4 +-
 .../excel5demo/excel5read.lpr                 |   0
 .../excel5demo/excel5write.lpi                |   4 +-
 .../excel5demo/excel5write.lpr                |   0
 .../{ => read_write}/excel5demo/readme.txt    |   0
 .../excel5demo/run_excel5read.bat             |   0
 .../excel5demo/run_excel5write.bat            |   0
 .../excel8demo/excel8read.lpi                 |   4 +-
 .../excel8demo/excel8read.lpr                 |   0
 .../excel8demo/excel8write.lpi                |   5 +--
 .../excel8demo/excel8write.lpr                |   0
 .../{ => read_write}/excel8demo/readme.txt    |   0
 .../excel8demo/run_excel8read.bat             |   0
 .../excel8demo/run_excel8write.bat            |   0
 .../{ => read_write}/ooxmldemo/ooxmlread.lpi  |   4 +-
 .../{ => read_write}/ooxmldemo/ooxmlread.lpr  |   3 --
 .../{ => read_write}/ooxmldemo/ooxmlwrite.lpi |   4 +-
 .../{ => read_write}/ooxmldemo/ooxmlwrite.lpr |   0
 .../{ => read_write}/ooxmldemo/readme.txt     |   0
 .../opendocdemo/opendocread.lpi               |   2 +-
 .../opendocdemo/opendocread.lpr               |   0
 .../opendocdemo/opendocwrite.lpi              |   4 +-
 .../opendocdemo/opendocwrite.lpr              |   0
 .../{ => read_write}/opendocdemo/readme.txt   |   0
 .../{ => read_write}/wikitabledemo/readme.txt |   0
 .../wikitabledemo/test.wikitable_pipes        |   0
 .../wikitabledemo/wikitableread.lpi           |   4 +-
 .../wikitabledemo/wikitableread.lpr           |   0
 .../wikitabledemo/wikitablewrite.lpi          |   4 +-
 .../wikitabledemo/wikitablewrite.lpr          |   0
 .../examples/spready/spready.lpr              |  21 ----------
 .../examples/visual/fpschart/readme.txt       |   2 +
 .../fpschartsource.ico                        | Bin
 .../fpschartsource.lpi                        |   2 +-
 .../fpschartsource.lpr                        |   0
 .../mainform.lfm                              |   0
 .../mainform.pas                              |   0
 .../readme.txt                                |   0
 .../test-data.xlsx                            | Bin
 .../worksheetchartsource/fpschart.ico         | Bin
 .../worksheetchartsource/fpschart.lpi         |   2 +-
 .../worksheetchartsource/fpschart.lpr         |   0
 .../worksheetchartsource/mainform.lfm         |   0
 .../worksheetchartsource/mainform.pas         |   0
 .../fpschart/worksheetchartsource/readme.txt  |   0
 .../fpschart/worksheetchartsource/t1.xls      | Bin
 .../fpschart/worksheetchartsource/t2.ods      | Bin
 .../{ => visual}/fpsctrls/demo_ctrls.ico      | Bin
 .../{ => visual}/fpsctrls/demo_ctrls.lpi      |   5 +--
 .../{ => visual}/fpsctrls/demo_ctrls.lpr      |   0
 .../examples/{ => visual}/fpsctrls/main.lfm   |   0
 .../examples/{ => visual}/fpsctrls/main.pas   |   0
 .../examples/{ => visual}/fpsctrls/readme.txt |   0
 .../fpsctrls_no_install/demo_ctrls.ico        | Bin
 .../fpsctrls_no_install/demo_ctrls.lpi        |   4 +-
 .../fpsctrls_no_install/demo_ctrls.lpr        |   0
 .../{ => visual}/fpsctrls_no_install/main.lfm |   0
 .../{ => visual}/fpsctrls_no_install/main.pas |   0
 .../fpsctrls_no_install/readme.txt            |   0
 .../examples/{ => visual}/fpsgrid/fpsgrid.ico | Bin
 .../examples/{ => visual}/fpsgrid/fpsgrid.lpi |   2 +-
 .../examples/{ => visual}/fpsgrid/fpsgrid.lpr |   0
 .../{ => visual}/fpsgrid/mainform.lfm         |   4 +-
 .../{ => visual}/fpsgrid/mainform.pas         |   0
 .../examples/{ => visual}/fpsgrid/readme.txt  |   0
 .../fpsgrid_no_install/fpsgrid.ico            | Bin
 .../fpsgrid_no_install/fpsgrid.lpi            |   4 +-
 .../fpsgrid_no_install/fpsgrid.lpr            |   0
 .../fpsgrid_no_install/mainfrm.lfm            |   0
 .../fpsgrid_no_install/mainfrm.pas            |   0
 .../fpsgrid_no_install/readme.txt             |   0
 .../shared}/scsvparamsform.lfm                |   0
 .../shared}/scsvparamsform.pas                |   0
 .../shared}/sfcurrencyform.lfm                |   0
 .../shared}/sfcurrencyform.pas                |   0
 .../shared}/sformatsettingsform.lfm           |   0
 .../shared}/sformatsettingsform.pas           |   0
 .../shared}/ssortparamsform.lfm               |   0
 .../shared}/ssortparamsform.pas               |   0
 .../{ => visual}/spready/mainform.lfm         |   0
 .../{ => visual}/spready/mainform.pas         |   6 +--
 .../examples/{ => visual}/spready/readme.txt  |   0
 .../examples/{ => visual}/spready/sctrls.pas  |   0
 .../examples/{ => visual}/spready/spready.ico | Bin
 .../examples/{ => visual}/spready/spready.lpi |  36 ++++++++----------
 .../examples/visual/spready/spready.lpr       |  18 +++++++++
 .../{ => visual}/wikitablemaker/readme.txt    |   0
 .../synhighlighterwikitable.pas               |   0
 .../wikitablemaker/wikitablemaker.lpi         |  15 ++------
 .../wikitablemaker/wikitablemaker.lpr         |   0
 .../{ => visual}/wikitablemaker/wtmain.lfm    |   0
 .../{ => visual}/wikitablemaker/wtmain.pas    |   0
 108 files changed, 82 insertions(+), 119 deletions(-)
 delete mode 100644 components/fpspreadsheet/examples/opendocdemo/oocreated.ods
 delete mode 100755 components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh
 delete mode 100755 components/fpspreadsheet/examples/opendocdemo/unziptest.sh
 delete mode 100755 components/fpspreadsheet/examples/opendocdemo/ziptest.sh
 rename components/fpspreadsheet/examples/{ => read_write}/csvdemo/csvread.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/csvdemo/csvread.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/csvdemo/csvwrite.lpi (91%)
 rename components/fpspreadsheet/examples/{ => read_write}/csvdemo/csvwrite.lpr (100%)
 create mode 100644 components/fpspreadsheet/examples/read_write/csvdemo/readme.txt
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/excel2read.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/excel2read.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/excel2write.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/excel2write.lpr (99%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/run_excel2read.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel2demo/run_excel2write.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/excel5read.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/excel5read.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/excel5write.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/excel5write.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/run_excel5read.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel5demo/run_excel5write.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/excel8read.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/excel8read.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/excel8write.lpi (92%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/excel8write.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/run_excel8read.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/excel8demo/run_excel8write.bat (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/ooxmldemo/ooxmlread.lpi (94%)
 rename components/fpspreadsheet/examples/{ => read_write}/ooxmldemo/ooxmlread.lpr (95%)
 rename components/fpspreadsheet/examples/{ => read_write}/ooxmldemo/ooxmlwrite.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/ooxmldemo/ooxmlwrite.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/ooxmldemo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/opendocdemo/opendocread.lpi (97%)
 rename components/fpspreadsheet/examples/{ => read_write}/opendocdemo/opendocread.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/opendocdemo/opendocwrite.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/opendocdemo/opendocwrite.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/opendocdemo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/test.wikitable_pipes (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/wikitableread.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/wikitableread.lpr (100%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/wikitablewrite.lpi (93%)
 rename components/fpspreadsheet/examples/{ => read_write}/wikitabledemo/wikitablewrite.lpr (100%)
 delete mode 100644 components/fpspreadsheet/examples/spready/spready.lpr
 create mode 100644 components/fpspreadsheet/examples/visual/fpschart/readme.txt
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/fpschartsource.ico (100%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/fpschartsource.lpi (97%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/fpschartsource.lpr (100%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/mainform.lfm (100%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/mainform.pas (100%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/readme.txt (100%)
 rename components/fpspreadsheet/examples/{fpschart/workbookchartsource => visual/fpschart/workbookchartsource-deprecated}/test-data.xlsx (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/fpschart.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/fpschart.lpi (97%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/fpschart.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/mainform.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/mainform.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/t1.xls (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpschart/worksheetchartsource/t2.ods (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/demo_ctrls.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/demo_ctrls.lpi (94%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/demo_ctrls.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/main.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/main.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/demo_ctrls.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/demo_ctrls.lpi (94%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/demo_ctrls.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/main.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/main.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsctrls_no_install/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/fpsgrid.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/fpsgrid.lpi (97%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/fpsgrid.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/mainform.lfm (99%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/mainform.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/fpsgrid.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/fpsgrid.lpi (96%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/fpsgrid.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/mainfrm.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/mainfrm.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/fpsgrid_no_install/readme.txt (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/scsvparamsform.lfm (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/scsvparamsform.pas (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/sfcurrencyform.lfm (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/sfcurrencyform.pas (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/sformatsettingsform.lfm (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/sformatsettingsform.pas (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/ssortparamsform.lfm (100%)
 rename components/fpspreadsheet/examples/{spready => visual/shared}/ssortparamsform.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/mainform.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/mainform.pas (99%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/sctrls.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/spready.ico (100%)
 rename components/fpspreadsheet/examples/{ => visual}/spready/spready.lpi (84%)
 create mode 100644 components/fpspreadsheet/examples/visual/spready/spready.lpr
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/readme.txt (100%)
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/synhighlighterwikitable.pas (100%)
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/wikitablemaker.lpi (92%)
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/wikitablemaker.lpr (100%)
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/wtmain.lfm (100%)
 rename components/fpspreadsheet/examples/{ => visual}/wikitablemaker/wtmain.pas (100%)

diff --git a/components/fpspreadsheet/examples/opendocdemo/oocreated.ods b/components/fpspreadsheet/examples/opendocdemo/oocreated.ods
deleted file mode 100644
index 9208462700a3b84e818af17d2f9e2cbd70a6cbef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7246
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

diff --git a/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh b/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh
deleted file mode 100755
index 50f329926..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir oocreated
-cp -f oocreated.ods oocreated/
-cd oocreated
-unzip oocreated.ods
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/opendocdemo/unziptest.sh b/components/fpspreadsheet/examples/opendocdemo/unziptest.sh
deleted file mode 100755
index 3245ac222..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/unziptest.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir test
-cp -f test.ods test/
-cd test
-unzip test.ods
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/opendocdemo/ziptest.sh b/components/fpspreadsheet/examples/opendocdemo/ziptest.sh
deleted file mode 100755
index f9d11806a..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/ziptest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cd test
-zip -r test.ods *
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/csvdemo/csvread.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/csvdemo/csvread.lpi
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
index 5d808975b..64de7ee91 100644
--- a/components/fpspreadsheet/examples/csvdemo/csvread.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
@@ -49,8 +49,8 @@
       <Filename Value="csvread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/csvdemo/csvread.lpr b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/csvdemo/csvread.lpr
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
diff --git a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
similarity index 91%
rename from components/fpspreadsheet/examples/csvdemo/csvwrite.lpi
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
index 1967c5dff..a9fc17a53 100644
--- a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
@@ -43,7 +43,6 @@
       <Unit1>
         <Filename Value="..\..\fpscsv.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpscsv"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -54,9 +53,8 @@
       <Filename Value="csvwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
-      <SrcPath Value=".."/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Debugging>
diff --git a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpr b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/csvdemo/csvwrite.lpr
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpr
diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt b/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt
new file mode 100644
index 000000000..7f4e46891
--- /dev/null
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt
@@ -0,0 +1,5 @@
+This demo demonstrates how to use fpspreadsheet to read and write comma-separated
+files (csv).
+
+Please run the write demo before the read demo so the required spreadsheet file
+is generated.
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel2demo/excel2read.lpi
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
index f485c578e..ef7bc8b86 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel2read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpr b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/excel2read.lpr
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel2demo/excel2write.lpi
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
index 885343b55..2daaaa4c7 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel2write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
similarity index 99%
rename from components/fpspreadsheet/examples/excel2demo/excel2write.lpr
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
index 8a5de4fe4..cd639eca9 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
@@ -108,7 +108,7 @@ begin
   MyWorksheet.WriteHorAlignment(5, 1, haCenter);
   MyWorksheet.WriteHorAlignment(5, 2, haRight);
 
-  // Red font, italic
+  // Various font settings
   MyWorksheet.WriteNumber(6, 0, 2014);
   MyWorksheet.WriteFont(6, 0, 'Calibri', 15, [fssItalic], scRed);
   MyWorksheet.WriteNumber(6, 1, 2015);
diff --git a/components/fpspreadsheet/examples/excel2demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel2demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel2demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel2demo/run_excel2read.bat b/components/fpspreadsheet/examples/read_write/excel2demo/run_excel2read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/run_excel2read.bat
rename to components/fpspreadsheet/examples/read_write/excel2demo/run_excel2read.bat
diff --git a/components/fpspreadsheet/examples/excel2demo/run_excel2write.bat b/components/fpspreadsheet/examples/read_write/excel2demo/run_excel2write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/run_excel2write.bat
rename to components/fpspreadsheet/examples/read_write/excel2demo/run_excel2write.bat
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel5demo/excel5read.lpi
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
index 66434812e..3d67c97c6 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel5read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpr b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/excel5read.lpr
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel5demo/excel5write.lpi
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
index 3bcb12a40..fab06a9ec 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel5write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpr b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/excel5write.lpr
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpr
diff --git a/components/fpspreadsheet/examples/excel5demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel5demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel5demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel5demo/run_excel5read.bat b/components/fpspreadsheet/examples/read_write/excel5demo/run_excel5read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/run_excel5read.bat
rename to components/fpspreadsheet/examples/read_write/excel5demo/run_excel5read.bat
diff --git a/components/fpspreadsheet/examples/excel5demo/run_excel5write.bat b/components/fpspreadsheet/examples/read_write/excel5demo/run_excel5write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/run_excel5write.bat
rename to components/fpspreadsheet/examples/read_write/excel5demo/run_excel5write.bat
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel8demo/excel8read.lpi
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
index efc9f3ca5..b601d2fed 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/excel8read.lpr
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
similarity index 92%
rename from components/fpspreadsheet/examples/excel8demo/excel8write.lpi
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
index c075bc9da..3548256b0 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
@@ -43,7 +43,6 @@
       <Unit1>
         <Filename Value="..\..\fpstypes.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpsTypes"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -54,8 +53,8 @@
       <Filename Value="excel8write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Debugging>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/excel8write.lpr
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
diff --git a/components/fpspreadsheet/examples/excel8demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel8demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel8demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel8demo/run_excel8read.bat b/components/fpspreadsheet/examples/read_write/excel8demo/run_excel8read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/run_excel8read.bat
rename to components/fpspreadsheet/examples/read_write/excel8demo/run_excel8read.bat
diff --git a/components/fpspreadsheet/examples/excel8demo/run_excel8write.bat b/components/fpspreadsheet/examples/read_write/excel8demo/run_excel8write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/run_excel8write.bat
rename to components/fpspreadsheet/examples/read_write/excel8demo/run_excel8write.bat
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
index 2d04e1b08..aa935037c 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
@@ -49,8 +49,8 @@
       <Filename Value="ooxmlread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
similarity index 95%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
index a69d6c0af..4865fe2d2 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
@@ -54,8 +54,5 @@ begin
 
   // Finalization
   MyWorkbook.Free;
-
-  WriteLn('Finished. Press [ENTER] to close...');
-  ReadLn;
 end.
 
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
index 807bd6713..f716b9b04 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="ooxmlwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
diff --git a/components/fpspreadsheet/examples/ooxmldemo/readme.txt b/components/fpspreadsheet/examples/read_write/ooxmldemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/ooxmldemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/readme.txt
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
index 85a6f863c..53df4946b 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
@@ -49,7 +49,7 @@
       <Filename Value="opendocread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
index 8bd769207..160804dec 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="opendocwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpr
diff --git a/components/fpspreadsheet/examples/opendocdemo/readme.txt b/components/fpspreadsheet/examples/read_write/opendocdemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/opendocdemo/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitabledemo/readme.txt b/components/fpspreadsheet/examples/read_write/wikitabledemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitabledemo/test.wikitable_pipes b/components/fpspreadsheet/examples/read_write/wikitabledemo/test.wikitable_pipes
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/test.wikitable_pipes
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/test.wikitable_pipes
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
index b9a7adc1d..17e05b373 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
index 03fb9593d..d9b14373a 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="wikitablewrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
diff --git a/components/fpspreadsheet/examples/spready/spready.lpr b/components/fpspreadsheet/examples/spready/spready.lpr
deleted file mode 100644
index 777fb9e95..000000000
--- a/components/fpspreadsheet/examples/spready/spready.lpr
+++ /dev/null
@@ -1,21 +0,0 @@
-program spready;
-
-{$mode objfpc}{$H+}
-
-uses
-  Interfaces, // this includes the LCL widgetset
-  Forms, mainform, laz_fpspreadsheet_visual, sCSVParamsForm, sCtrls,
-  sFormatSettingsForm, sSortParamsForm, sfCurrencyForm, fpsCurrency;
-
-{$R *.res}
-
-begin
-  Application.Initialize;
-  Application.CreateForm(TMainFrm, MainFrm);
-  MainFrm.BeforeRun;
-  Application.CreateForm(TFormatSettingsForm, FormatSettingsForm);
-  Application.CreateForm(TSortParamsForm, SortParamsForm);
-  Application.CreateForm(TCurrencyForm, CurrencyForm);
-  Application.Run;
-end.
-
diff --git a/components/fpspreadsheet/examples/visual/fpschart/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/readme.txt
new file mode 100644
index 000000000..43e14a347
--- /dev/null
+++ b/components/fpspreadsheet/examples/visual/fpschart/readme.txt
@@ -0,0 +1,2 @@
+The fpschart demo shows usage of the TsWorksheetChartSource component for
+creating charts from spreadsheet data. 
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.ico b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.ico
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
index 5c914b64d..c88fc3366 100644
--- a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
@@ -85,7 +85,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpr b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/test-data.xlsx b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/test-data.xlsx
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.ico b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.ico
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
index 647c7aaef..2cd47aa05 100644
--- a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
@@ -66,7 +66,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="../../lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="../../../lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpr b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/t1.xls b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/t1.xls
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/t2.ods b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/t2.ods
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.ico b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.ico
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.ico
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
index 082126cb5..531d79d6c 100644
--- a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
@@ -81,15 +81,12 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
     </CodeGeneration>
     <Linking>
-      <Debugging>
-        <DebugInfoType Value="dsDwarf2Set"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr
diff --git a/components/fpspreadsheet/examples/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/main.lfm
rename to components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
diff --git a/components/fpspreadsheet/examples/fpsctrls/main.pas b/components/fpspreadsheet/examples/visual/fpsctrls/main.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/main.pas
rename to components/fpspreadsheet/examples/visual/fpsctrls/main.pas
diff --git a/components/fpspreadsheet/examples/fpsctrls/readme.txt b/components/fpspreadsheet/examples/visual/fpsctrls/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsctrls/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.ico b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.ico
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.ico
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
index 4b4670c60..8f6cb9564 100644
--- a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
@@ -56,8 +56,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpr b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpr
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpr
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/main.lfm
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.lfm
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/main.pas b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/main.pas
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.pas
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/readme.txt b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.ico
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
index 0943006f2..2acfb6fa5 100644
--- a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
@@ -60,7 +60,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
diff --git a/components/fpspreadsheet/examples/fpsgrid/mainform.lfm b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
similarity index 99%
rename from components/fpspreadsheet/examples/fpsgrid/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
index ceaa87d9e..72cb06366 100644
--- a/components/fpspreadsheet/examples/fpsgrid/mainform.lfm
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 344
+  Left = 375
   Height = 649
-  Top = 127
+  Top = 185
   Width = 894
   Caption = 'fpsGrid'
   ClientHeight = 649
diff --git a/components/fpspreadsheet/examples/fpsgrid/mainform.pas b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpsgrid/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpsgrid/readme.txt b/components/fpspreadsheet/examples/visual/fpsgrid/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsgrid/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.ico b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.ico
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.ico
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
similarity index 96%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
index 7b39170e9..c74c17e41 100644
--- a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
@@ -83,8 +83,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpr b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpr
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpr
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.lfm b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.lfm
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.lfm
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.pas b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.pas
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.pas
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/readme.txt b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/readme.txt
diff --git a/components/fpspreadsheet/examples/spready/scsvparamsform.lfm b/components/fpspreadsheet/examples/visual/shared/scsvparamsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/scsvparamsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/scsvparamsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/scsvparamsform.pas b/components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/scsvparamsform.pas
rename to components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas
diff --git a/components/fpspreadsheet/examples/spready/sfcurrencyform.lfm b/components/fpspreadsheet/examples/visual/shared/sfcurrencyform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sfcurrencyform.lfm
rename to components/fpspreadsheet/examples/visual/shared/sfcurrencyform.lfm
diff --git a/components/fpspreadsheet/examples/spready/sfcurrencyform.pas b/components/fpspreadsheet/examples/visual/shared/sfcurrencyform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sfcurrencyform.pas
rename to components/fpspreadsheet/examples/visual/shared/sfcurrencyform.pas
diff --git a/components/fpspreadsheet/examples/spready/sformatsettingsform.lfm b/components/fpspreadsheet/examples/visual/shared/sformatsettingsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sformatsettingsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/sformatsettingsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/sformatsettingsform.pas b/components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sformatsettingsform.pas
rename to components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas
diff --git a/components/fpspreadsheet/examples/spready/ssortparamsform.lfm b/components/fpspreadsheet/examples/visual/shared/ssortparamsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/ssortparamsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/ssortparamsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/ssortparamsform.pas b/components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/ssortparamsform.pas
rename to components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
diff --git a/components/fpspreadsheet/examples/spready/mainform.lfm b/components/fpspreadsheet/examples/visual/spready/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/mainform.lfm
rename to components/fpspreadsheet/examples/visual/spready/mainform.lfm
diff --git a/components/fpspreadsheet/examples/spready/mainform.pas b/components/fpspreadsheet/examples/visual/spready/mainform.pas
similarity index 99%
rename from components/fpspreadsheet/examples/spready/mainform.pas
rename to components/fpspreadsheet/examples/visual/spready/mainform.pas
index f0c53551e..6473e6fe2 100644
--- a/components/fpspreadsheet/examples/spready/mainform.pas
+++ b/components/fpspreadsheet/examples/visual/spready/mainform.pas
@@ -1250,10 +1250,6 @@ begin
       if (ACell=nil) or (Length(ACell^.FormulaValue)=0)
         then Strings.Add('FormulaValue=')
         else Strings.Add(Format('FormulaValue="%s"', [ACell^.FormulaValue]));
-      if (ACell=nil) or (ACell^.SharedFormulaBase=nil)
-        then Strings.Add('SharedFormulaBase=')
-        else Strings.Add(Format('SharedFormulaBase=%s', [GetCellString(
-               ACell^.SharedFormulaBase^.Row, ACell^.SharedFormulaBase^.Col)]));
     end
     else
     if InspectorPageControl.ActivePage = PgSheet then
@@ -1349,7 +1345,7 @@ begin
   begin
     r := GetWorksheetRow(Row);
     c := GetWorksheetCol(Col);
-    cell := Worksheet.FindCell(row, col);
+    cell := Worksheet.FindCell(r, c);
     hasCmnt := Worksheet.HasComment(cell);
   end;
   AcCommentAdd.Enabled := not hasCmnt;
diff --git a/components/fpspreadsheet/examples/spready/readme.txt b/components/fpspreadsheet/examples/visual/spready/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/spready/readme.txt
rename to components/fpspreadsheet/examples/visual/spready/readme.txt
diff --git a/components/fpspreadsheet/examples/spready/sctrls.pas b/components/fpspreadsheet/examples/visual/spready/sctrls.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sctrls.pas
rename to components/fpspreadsheet/examples/visual/spready/sctrls.pas
diff --git a/components/fpspreadsheet/examples/spready/spready.ico b/components/fpspreadsheet/examples/visual/spready/spready.ico
similarity index 100%
rename from components/fpspreadsheet/examples/spready/spready.ico
rename to components/fpspreadsheet/examples/visual/spready/spready.ico
diff --git a/components/fpspreadsheet/examples/spready/spready.lpi b/components/fpspreadsheet/examples/visual/spready/spready.lpi
similarity index 84%
rename from components/fpspreadsheet/examples/spready/spready.lpi
rename to components/fpspreadsheet/examples/visual/spready/spready.lpi
index c9db6da0b..b5f9a81b2 100644
--- a/components/fpspreadsheet/examples/spready/spready.lpi
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpi
@@ -24,7 +24,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="../.."/>
+            <OtherUnitFiles Value="../..;../shared"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Linking>
@@ -45,6 +45,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
+            <OtherUnitFiles Value="..\shared"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -105,43 +106,36 @@
         <UnitName Value="mainform"/>
       </Unit1>
       <Unit2>
-        <Filename Value="scsvparamsform.pas"/>
+        <Filename Value="sctrls.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="CSVParamsForm"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sCSVParamsForm"/>
       </Unit2>
       <Unit3>
-        <Filename Value="sctrls.pas"/>
+        <Filename Value="..\..\fpscurrency.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="sformatsettingsform.pas"/>
+        <Filename Value="..\shared\scsvparamsform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormatSettingsForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sFormatsettingsForm"/>
+        <UnitName Value="scsvparamsform"/>
       </Unit4>
       <Unit5>
-        <Filename Value="ssortparamsform.pas"/>
+        <Filename Value="..\shared\sfcurrencyform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="SortParamsForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sSortParamsForm"/>
+        <UnitName Value="sfcurrencyform"/>
       </Unit5>
       <Unit6>
-        <Filename Value="sfcurrencyform.pas"/>
+        <Filename Value="..\shared\sformatsettingsform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="CurrencyForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="sformatsettingsform"/>
       </Unit6>
       <Unit7>
-        <Filename Value="..\..\fpscurrency.pas"/>
+        <Filename Value="..\shared\ssortparamsform.pas"/>
         <IsPartOfProject Value="True"/>
+        <HasResources Value="True"/>
+        <UnitName Value="ssortparamsform"/>
       </Unit7>
     </Units>
   </ProjectOptions>
@@ -153,8 +147,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\shared"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/visual/spready/spready.lpr b/components/fpspreadsheet/examples/visual/spready/spready.lpr
new file mode 100644
index 000000000..7b98d34c1
--- /dev/null
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpr
@@ -0,0 +1,18 @@
+program spready;
+
+{$mode objfpc}{$H+}
+
+uses
+  Interfaces, // this includes the LCL widgetset
+  Forms, mainform, laz_fpspreadsheet_visual, sCtrls, fpsCurrency,
+  scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform;
+
+{$R *.res}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TMainFrm, MainFrm);
+  MainFrm.BeforeRun;
+  Application.Run;
+end.
+
diff --git a/components/fpspreadsheet/examples/wikitablemaker/readme.txt b/components/fpspreadsheet/examples/visual/wikitablemaker/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/readme.txt
rename to components/fpspreadsheet/examples/visual/wikitablemaker/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitablemaker/synhighlighterwikitable.pas b/components/fpspreadsheet/examples/visual/wikitablemaker/synhighlighterwikitable.pas
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/synhighlighterwikitable.pas
rename to components/fpspreadsheet/examples/visual/wikitablemaker/synhighlighterwikitable.pas
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
similarity index 92%
rename from components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
index 7b1042ab4..fea474878 100644
--- a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi
+++ b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -39,9 +39,6 @@
               </Win32>
             </Options>
           </Linking>
-          <Other>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item2>
       <Item3 Name="Release">
@@ -77,9 +74,6 @@
               </Win32>
             </Options>
           </Linking>
-          <Other>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item3>
     </BuildModes>
@@ -132,8 +126,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -150,9 +144,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="5">
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpr b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpr
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpr
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wtmain.lfm b/components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wtmain.lfm
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.lfm
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wtmain.pas b/components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.pas
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wtmain.pas
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.pas