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

fpspreadsheet: Clean up

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3933 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-02-07 22:24:08 +00:00
parent ee5cddb23f
commit d8a3204045
6 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/fpspreadsheet.pas
View File

@@ -6426,14 +6426,12 @@ end;
constructor TsWorkbook.Create; constructor TsWorkbook.Create;
var var
fmt: TsCellFormat; fmt: TsCellFormat;
cp: String;
begin begin
inherited Create; inherited Create;
FWorksheets := TFPList.Create; FWorksheets := TFPList.Create;
FLog := TStringList.Create; FLog := TStringList.Create;
FFormat := sfExcel8; FFormat := sfExcel8;
FCodePage := GetDefaultTextEncoding; FCodePage := GetDefaultTextEncoding;
// FEncoding := seLatin1;
FormatSettings := UTF8FormatSettings; FormatSettings := UTF8FormatSettings;
FormatSettings.ShortDateFormat := MakeShortDateFormat(FormatSettings.ShortDateFormat); FormatSettings.ShortDateFormat := MakeShortDateFormat(FormatSettings.ShortDateFormat);

2
components/fpspreadsheet/laz_fpspreadsheet.lpk
View File

@@ -18,7 +18,7 @@
</Parsing> </Parsing>
<Other> <Other>
<CompilerMessages> <CompilerMessages>
<IgnoredMessages idx4055="True"/> <IgnoredMessages idx5028="True" idx4055="True"/>
</CompilerMessages> </CompilerMessages>
<CustomOptions Value="$(IDEBuildOptions)"/> <CustomOptions Value="$(IDEBuildOptions)"/>
</Other> </Other>

2
components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
View File

@@ -52,6 +52,8 @@ It provides graphical components like a grid and chart."/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="laz_fpspreadsheet"/> <PackageName Value="laz_fpspreadsheet"/>
<MaxVersion Major="1" Minor="5"/>
<MinVersion Major="1" Minor="5"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>

2
components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
View File

@@ -42,6 +42,8 @@ It provides a graphical export component on the Data Export tab."/>
</Item1> </Item1>
<Item2> <Item2>
<PackageName Value="laz_fpspreadsheet"/> <PackageName Value="laz_fpspreadsheet"/>
<MaxVersion Major="1" Minor="5"/>
<MinVersion Major="1" Minor="5"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="LCL"/> <PackageName Value="LCL"/>

35
components/fpspreadsheet/xlsbiff8.pas
View File

@@ -239,23 +239,23 @@ const
{ Excel OBJ subrecord IDs } { Excel OBJ subrecord IDs }
INT_EXCEL_OBJID_FTEND = $0000; INT_EXCEL_OBJID_FTEND = $0000;
INT_EXCEL_OBJID_FTMACRO = $0004; {%H-}INT_EXCEL_OBJID_FTMACRO = $0004;
INT_EXCEL_OBJID_FTBUTTON = $0005; {%H-}INT_EXCEL_OBJID_FTBUTTON = $0005;
INT_EXCEL_OBJID_FTGMO = $0006; // Group marker {%H-}INT_EXCEL_OBJID_FTGMO = $0006; // Group marker
INT_EXCEL_OBJID_CF = $0007; // Clipboard format {%H-}INT_EXCEL_OBJID_CF = $0007; // Clipboard format
INT_EXCEL_OBJID_PIOGRBIT = $0008; // Picture option flags {%H-}INT_EXCEL_OBJID_PIOGRBIT = $0008; // Picture option flags
INT_EXCEL_OBJID_PICTFMLA = $0009; // Picture fmla-style macro {%H-}INT_EXCEL_OBJID_PICTFMLA = $0009; // Picture fmla-style macro
INT_EXCEL_OBJID_FTCBLS = $000A; // Checkbox link {%H-}INT_EXCEL_OBJID_FTCBLS = $000A; // Checkbox link
INT_EXCEL_OBJID_FTRBO = $000B; // Radio button {%H-}INT_EXCEL_OBJID_FTRBO = $000B; // Radio button
INT_EXCEL_OBJID_FTSBS = $000C; // Scrollbar {%H-}INT_EXCEL_OBJID_FTSBS = $000C; // Scrollbar
INT_EXCEL_OBJID_FTNTS = $000D; // Notes structure (= Comment) {%H-}INT_EXCEL_OBJID_FTNTS = $000D; // Notes structure (= Comment)
INT_EXCEL_OBJID_FTSBSFMLA = $000E; // Scroll bar fmla-style macro {%H-}INT_EXCEL_OBJID_FTSBSFMLA = $000E; // Scroll bar fmla-style macro
INT_EXCEL_OBJID_FTGBODATA = $000F; // Group box data {%H-}INT_EXCEL_OBJID_FTGBODATA = $000F; // Group box data
INT_EXCEL_OBJID_FTEDODATA = $0010; // Edit control data {%H-}INT_EXCEL_OBJID_FTEDODATA = $0010; // Edit control data
INT_EXCEL_OBJID_FTRBODATA = $0011; // Radio button data {%H-}INT_EXCEL_OBJID_FTRBODATA = $0011; // Radio button data
INT_EXCEL_OBJID_FTCBLSDATA = $0012; // Check box data {%H-}INT_EXCEL_OBJID_FTCBLSDATA = $0012; // Check box data
INT_EXCEL_OBJID_FTLBSDATA = $0013; // List box data {%H-}INT_EXCEL_OBJID_FTLBSDATA = $0013; // List box data
INT_EXCEL_OBJID_FTCBLSFMLA = $0014; // Check box link fmla-style macro {%H-}INT_EXCEL_OBJID_FTCBLSFMLA = $0014; // Check box link fmla-style macro
INT_EXCEL_OBJID_FTCMO = $0015; // Common object data INT_EXCEL_OBJID_FTCMO = $0015; // Common object data
{ Cell Addresses constants } { Cell Addresses constants }
@@ -401,7 +401,6 @@ var
r, c: Word; r, c: Word;
commentID: Word; commentID: Word;
commentText: String; commentText: String;
comment: TBIFF8Comment;
i: Integer; i: Integer;
begin begin
{ Row of the comment } { Row of the comment }

2
components/fpspreadsheet/xlsxooxml.pas
View File

@@ -455,12 +455,10 @@ end;
function TsSpreadOOXMLReader.FindCommentsFileName(ANode: TDOMNode): String; function TsSpreadOOXMLReader.FindCommentsFileName(ANode: TDOMNode): String;
var var
nodeName: String;
s: String; s: String;
begin begin
while ANode <> nil do while ANode <> nil do
begin begin
nodeName := ANode.NodeName;
s := GetAttrValue(ANode, 'Type'); s := GetAttrValue(ANode, 'Type');
if s = SCHEMAS_COMMENTS then if s = SCHEMAS_COMMENTS then
begin begin