From bc94843c24e31fcb7a7af093467d92ada794a5b3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sun, 21 Jul 2019 17:16:55 +0000 Subject: [PATCH] fpspreadsheet: Minor update of ooxml demo files. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7066 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../examples/read_write/ooxmldemo/ooxmlread.lpi | 11 ++++------- .../examples/read_write/ooxmldemo/ooxmlwrite.lpi | 11 ++++------- .../examples/read_write/ooxmldemo/ooxmlwrite.lpr | 7 +++++++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi index 0b3839f5b..0369a5958 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi @@ -1,14 +1,14 @@ - + + - <UseAppBundle Value="False"/> </General> @@ -17,19 +17,16 @@ </BuildModes> <PublishOptions> <Version Value="2"/> - <IgnoreBinaries Value="False"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> </PublishOptions> <RunParams> <local> - <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> <FormatVersion Value="2"/> <Modes Count="1"> <Mode0 Name="default"> <local> - <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> </Mode0> </Modes> diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi index cfc43f33b..89f200930 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> <Flags> <LRSInOutputDirectory Value="False"/> + <CompatibilityMode Value="True"/> </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="ooxmlwrite"/> <UseAppBundle Value="False"/> </General> @@ -17,19 +17,16 @@ </BuildModes> <PublishOptions> <Version Value="2"/> - <IgnoreBinaries Value="False"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> </PublishOptions> <RunParams> <local> - <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> <FormatVersion Value="2"/> <Modes Count="1"> <Mode0 Name="default"> <local> - <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> </local> </Mode0> </Modes> diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr index a0618e5b9..0b9e7c70e 100644 --- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr +++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr @@ -110,5 +110,12 @@ begin // Save the spreadsheet to a file MyWorkbook.WriteToFile(MyDir + 'test.xlsx', sfOOXML, true); MyWorkbook.Free; + + WriteLn('Workbook written to "' + Mydir + 'test.xlsx' + '".'); + + {$IFDEF MSWINDOWS} + WriteLn('Press ENTER to quit...'); + ReadLn; + {$ENDIF} end.