pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix duplicate unit issues for examples requiring installed visual package

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4022 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-13 17:49:33 +00:00
parent 31bd092955
commit f94692451c
9 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
View File

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

2
components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
View File

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

2
components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
View File

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

2
components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
View File

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

29
components/fpspreadsheet/examples/visual/spready/spready.lpi
View File

@ -92,7 +92,7 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="8">
<Units Count="7">
<Unit0>
<Filename Value="spready.lpr"/>
<IsPartOfProject Value="True"/>
@ -110,33 +110,28 @@
<IsPartOfProject Value="True"/>
</Unit2>
<Unit3>
<Filename Value="..\..\fpscurrency.pas"/>
<IsPartOfProject Value="True"/>
</Unit3>
<Unit4>
<Filename Value="..\shared\scsvparamsform.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
<UnitName Value="scsvparamsform"/>
</Unit4>
<Unit5>
</Unit3>
<Unit4>
<Filename Value="..\shared\sfcurrencyform.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
<UnitName Value="sfcurrencyform"/>
</Unit5>
<Unit6>
</Unit4>
<Unit5>
<Filename Value="..\shared\sformatsettingsform.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
<UnitName Value="sformatsettingsform"/>
</Unit6>
<Unit7>
</Unit5>
<Unit6>
<Filename Value="..\shared\ssortparamsform.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="SortParamsForm"/>
<HasResources Value="True"/>
<UnitName Value="ssortparamsform"/>
</Unit7>
<ResourceBaseClass Value="Form"/>
<UnitName Value="sSortParamsForm"/>
</Unit6>
</Units>
</ProjectOptions>
<CompilerOptions>
@ -148,7 +143,7 @@
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="..\shared"/>
<UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Options>

2
components/fpspreadsheet/examples/visual/spready/spready.lpr
View File

@ -4,7 +4,7 @@ program spready;
uses
Interfaces, // this includes the LCL widgetset
Forms, mainform, sCtrls, fpsCurrency,
Forms, mainform, sCtrls,
scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform;
{$R *.res}

2
components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
View File

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

2
components/fpspreadsheet/fpsopendocument.pas
View File

@ -1470,7 +1470,6 @@ var
childnode: TDOMNode;
subnode: TDOMNode;
nodeName: String;
s: String;
cell: PCell;
hyperlink: string;
@ -4182,7 +4181,6 @@ var
fmt: TsCellFormat;
hyperlink: PsHyperlink;
u: TUri;
i: Integer;
begin
Unused(ARow, ACol);

10
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -1274,6 +1274,11 @@ begin
for cell in FCells do
begin
if HasFormula(cell) then begin
if (cell^.Row = ARow) and (cell^.Col = ACol) then
begin
Result := true;
exit;
end;
rpnFormula := BuildRPNFormula(cell);
for i := 0 to Length(rpnFormula)-1 do
begin
@ -1601,13 +1606,10 @@ end;
@param ACol Column index of the cell which has been changed
-------------------------------------------------------------------------------}
procedure TsWorksheet.ChangedCell(ARow, ACol: Cardinal);
var
cell: PCell;
begin
if (FWorkbook.FCalculationLock = 0) and (boAutoCalc in FWorkbook.Options) then
begin
cell := FindCell(ARow, ACol);
if HasFormula(cell) or CellUsedInFormula(ARow, ACol) then
if CellUsedInFormula(ARow, ACol) then
CalcFormulas;
end;
if Assigned(FOnChangeCell) then