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

components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh

@@ -1,5 +0,0 @@
-mkdir oocreated
-cp -f oocreated.ods oocreated/
-cd oocreated
-unzip oocreated.ods
-cd ..

components/fpspreadsheet/examples/opendocdemo/unziptest.sh

@@ -1,5 +0,0 @@
-mkdir test
-cp -f test.ods test/
-cd test
-unzip test.ods
-cd ..

components/fpspreadsheet/examples/opendocdemo/ziptest.sh

@@ -1,3 +0,0 @@
-cd test
-zip -r test.ods *
-cd ..

components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi

@@ -49,8 +49,8 @@
       <Filename Value="csvread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

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="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
-      <SrcPath Value=".."/>
     </SearchPaths>
     <Linking>
       <Debugging>

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.

components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi

@@ -49,8 +49,8 @@
       <Filename Value="excel2read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi

@@ -49,8 +49,8 @@
       <Filename Value="excel2write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

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);

components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi

@@ -49,8 +49,8 @@
       <Filename Value="excel5read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi

@@ -49,8 +49,8 @@
       <Filename Value="excel5write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi

@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

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="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Debugging>

components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi

@@ -49,8 +49,8 @@
       <Filename Value="ooxmlread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr

@@ -54,8 +54,5 @@ begin
 
   // Finalization
   MyWorkbook.Free;
-
-  WriteLn('Finished. Press [ENTER] to close...');
-  ReadLn;
 end.
 

components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi

@@ -49,8 +49,8 @@
       <Filename Value="ooxmlwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

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>

components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi

@@ -49,8 +49,8 @@
       <Filename Value="opendocwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi

@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi

@@ -49,8 +49,8 @@
       <Filename Value="wikitablewrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

components/fpspreadsheet/examples/spready/spready.lpr

@@ -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.
-

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. 

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"/>

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>

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"/>

components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi

@@ -56,8 +56,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>

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>

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

components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi

@@ -83,8 +83,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>

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;