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

RxFPC:fix error on export MAX and MIN to spreadsheet

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6956 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2019-05-27 06:27:29 +00:00
parent b12dffeafa
commit ff899abd44
3 changed files with 27 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
components/rx/trunk/demos/rxdbgrid/RxDBGrid_ExportSpreadsheet/project1.lps
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectSession> <ProjectSession>
<Version Value="10"/> <Version Value="12"/>
<BuildModes Active="Default"/> <BuildModes Active="Default"/>
<Units Count="11"> <Units Count="12">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -42,16 +42,14 @@
<Unit4> <Unit4>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/> <Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<UnitName Value="RxDBGridExportSpreadSheet"/> <UnitName Value="RxDBGridExportSpreadSheet"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="-1"/>
<EditorIndex Value="1"/>
<TopLine Value="197"/> <TopLine Value="197"/>
<CursorPos X="37" Y="210"/> <CursorPos X="37" Y="210"/>
<UsageCount Value="16"/> <UsageCount Value="16"/>
<Loaded Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="../../rxdbgrid.pas"/> <Filename Value="../../rxdbgrid.pas"/>
<EditorIndex Value="4"/> <EditorIndex Value="-1"/>
<TopLine Value="4700"/> <TopLine Value="4700"/>
<CursorPos Y="4718"/> <CursorPos Y="4718"/>
<UsageCount Value="16"/> <UsageCount Value="16"/>
@ -59,7 +57,6 @@
<Item0 X="14" Y="822" ID="1"/> <Item0 X="14" Y="822" ID="1"/>
<Item1 X="48" Y="622" ID="2"/> <Item1 X="48" Y="622" ID="2"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/>
</Unit5> </Unit5>
<Unit6> <Unit6>
<Filename Value="../../../fpspreadsheet/fpsstrings.pas"/> <Filename Value="../../../fpspreadsheet/fpsstrings.pas"/>
@ -74,20 +71,18 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="RxDBGridExportSpreadSheet_ParamsUnit"/> <UnitName Value="RxDBGridExportSpreadSheet_ParamsUnit"/>
<EditorIndex Value="2"/> <EditorIndex Value="-1"/>
<TopLine Value="51"/> <TopLine Value="51"/>
<CursorPos X="33" Y="85"/> <CursorPos X="33" Y="85"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="../../rxdconst.pas"/> <Filename Value="../../rxdconst.pas"/>
<EditorIndex Value="3"/> <EditorIndex Value="-1"/>
<TopLine Value="173"/> <TopLine Value="173"/>
<CursorPos X="21" Y="185"/> <CursorPos X="21" Y="185"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="../../../../lcl/include/control.inc"/> <Filename Value="../../../../lcl/include/control.inc"/>
@ -104,128 +99,34 @@
<CursorPos X="5" Y="330"/> <CursorPos X="5" Y="330"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit10> </Unit10>
<Unit11>
<Filename Value="../../../rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/>
<UnitName Value="RxDBGridExportSpreadSheet"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="526"/>
<CursorPos X="26" Y="537"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit11>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="3" HistoryIndex="2">
<Position1> <Position1>
<Filename Value="unit1.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="22" Column="5" TopLine="3"/> <Caret Line="22" Column="5" TopLine="3"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="443" Column="3" TopLine="439"/> <Caret Line="24" Column="105" TopLine="3"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/> <Filename Value="../../../rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas"/>
<Caret Line="63" Column="30" TopLine="54"/> <Caret Line="82" Column="31" TopLine="63"/>
</Position3> </Position3>
<Position4>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="504" Column="3" TopLine="500"/>
</Position4>
<Position5>
<Filename Value="../../rxdbgridexportspreadsheet_paramsunit.pas"/>
<Caret Line="46" Column="3" TopLine="27"/>
</Position5>
<Position6>
<Filename Value="../../rxdbgridexportspreadsheet_paramsunit.pas"/>
<Caret Line="85" Column="33" TopLine="51"/>
</Position6>
<Position7>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="504" Column="3" TopLine="500"/>
</Position7>
<Position8>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="47" Column="7" TopLine="23"/>
</Position8>
<Position9>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="273" TopLine="250"/>
</Position9>
<Position10>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="329" TopLine="323"/>
</Position10>
<Position11>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="204" Column="3" TopLine="173"/>
</Position11>
<Position12>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="129" Column="3" TopLine="108"/>
</Position12>
<Position13>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="135" Column="9" TopLine="115"/>
</Position13>
<Position14>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="138" Column="7" TopLine="118"/>
</Position14>
<Position15>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="140" Column="7" TopLine="120"/>
</Position15>
<Position16>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="146" Column="11" TopLine="127"/>
</Position16>
<Position17>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="149" Column="13" TopLine="131"/>
</Position17>
<Position18>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="173" Column="11" TopLine="154"/>
</Position18>
<Position19>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="224" Column="11" TopLine="194"/>
</Position19>
<Position20>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="227" Column="13" TopLine="209"/>
</Position20>
<Position21>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="63" Column="24" TopLine="45"/>
</Position21>
<Position22>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="134" TopLine="116"/>
</Position22>
<Position23>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="168" Column="9" TopLine="147"/>
</Position23>
<Position24>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="174" TopLine="164"/>
</Position24>
<Position25>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="126" Column="38" TopLine="107"/>
</Position25>
<Position26>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="63" Column="15" TopLine="44"/>
</Position26>
<Position27>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="171" Column="59" TopLine="152"/>
</Position27>
<Position28>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="134" TopLine="126"/>
</Position28>
<Position29>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="203" Column="16" TopLine="184"/>
</Position29>
<Position30>
<Filename Value="../../rxdbgridexportspreadsheet.pas"/>
<Caret Line="193" TopLine="193"/>
</Position30>
</JumpHistory> </JumpHistory>
<RunParams>
<FormatVersion Value="2"/>
<Modes Count="0" ActiveMode="default"/>
</RunParams>
</ProjectSession> </ProjectSession>
</CONFIG> </CONFIG>

BIN
components/rx/trunk/demos/rxdbgrid/RxDBGrid_ExportSpreadsheet/project1.res
View File

Binary file not shown.

4
components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet.pas
View File

@ -533,8 +533,8 @@ begin
begin begin
case Footer.ValueType of case Footer.ValueType of
fvtSum:SF:='SUM'; fvtSum:SF:='SUM';
fvtMax:SF:='MIN'; fvtMax:SF:='MAX';
fvtMin:SF:='MAX'; fvtMin:SF:='MIN';
else else
SF:='Error!('; SF:='Error!(';
end; end;