mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-31 04:12:34 +02:00
reverted 36399 #9e6f83df53
git-svn-id: trunk@36413 -
This commit is contained in:
mattias
parent
3793272e33
commit
30bf55eb5a
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1685,9 +1685,9 @@ components/lazreport/source/lr_dopt.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_dset.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_dsopt.lfm svneol=native#text/plain
|
||||
components/lazreport/source/lr_dsopt.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_csv.pas -text svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_csv.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_gen.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_htm.pas -text svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_htm.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_e_txt.pas svneol=native#text/pascal
|
||||
components/lazreport/source/lr_edit.lfm svneol=native#text/plain
|
||||
components/lazreport/source/lr_edit.pas svneol=native#text/pascal
|
||||
|
||||
@ -16,7 +16,7 @@ interface
|
||||
|
||||
uses
|
||||
SysUtils, {$IFDEF UNIX}CLocale,{$ENDIF} Classes, MaskUtils, Controls, FileUtil,
|
||||
Forms, {ComCtrls,} Dialogs, Menus, Variants, DB, Graphics, Printers, osPrinters,
|
||||
Forms, ComCtrls, Dialogs, Menus, Variants, DB, Graphics, Printers, osPrinters,
|
||||
DOM, XMLRead, XMLConf, LCLType, LCLIntf, TypInfo, LCLProc, LR_View, LR_Pars,
|
||||
LR_Intrp, LR_DSet, LR_DBSet, LR_DBRel, LR_Const;
|
||||
|
||||
@ -357,7 +357,7 @@ type
|
||||
function MinHeight: Integer; override;
|
||||
function RemainHeight: Integer; override;
|
||||
procedure GetBlob(b: TfrTField); override;
|
||||
procedure FontChange(Sender: TObject);
|
||||
procedure FontChange(sender: TObject);
|
||||
procedure ResetLastValue; override;
|
||||
|
||||
property IsLastValueSet: boolean read GetIsLastValueSet write SetIsLastValueSet;
|
||||
@ -459,7 +459,7 @@ type
|
||||
procedure LoadFromXML(XML: TLrXMLConfig; const Path: String); override;
|
||||
procedure SaveToStream(Stream: TStream); override;
|
||||
procedure SaveToXML(XML: TLrXMLConfig; const Path: String); override;
|
||||
procedure DefinePopupMenu({%H-}Popup: TPopupMenu); override;
|
||||
procedure DefinePopupMenu(Popup: TPopupMenu); override;
|
||||
end;
|
||||
|
||||
{ TfrPictureView }
|
||||
@ -511,7 +511,7 @@ type
|
||||
constructor Create; override;
|
||||
|
||||
procedure Draw(aCanvas: TCanvas); override;
|
||||
procedure DefinePopupMenu({%H-}Popup: TPopupMenu); override;
|
||||
procedure DefinePopupMenu(Popup: TPopupMenu); override;
|
||||
function GetClipRgn(rt: TfrRgnType): HRGN; override;
|
||||
function PointInView(aX,aY: Integer): Boolean; override;
|
||||
|
||||
@ -568,7 +568,7 @@ type
|
||||
procedure DrawCrossCell(Parnt: TfrBand; CurX: Integer);
|
||||
procedure DrawCross;
|
||||
function CheckPageBreak(ay, ady: Integer; PBreak: Boolean): Boolean;
|
||||
procedure CheckNextColumn;
|
||||
function CheckNextColumn: boolean;
|
||||
procedure DrawPageBreak;
|
||||
function HasCross: Boolean;
|
||||
function DoCalcHeight: Integer;
|
||||
@ -703,7 +703,7 @@ type
|
||||
procedure ShowBandByType(bt: TfrBandType);
|
||||
procedure NewPage;
|
||||
procedure NewColumn(Band: TfrBand);
|
||||
procedure NextColumn({%H-}Band: TFrBand);
|
||||
procedure NextColumn(Band: TFrBand);
|
||||
function RowsLayout: boolean;
|
||||
procedure StartColumn;
|
||||
procedure StartRowsLayoutNonDataBand(Band: TfrBand);
|
||||
@ -836,7 +836,7 @@ type
|
||||
Lines: TFpList;
|
||||
procedure ClearLines;
|
||||
procedure Setup; virtual;
|
||||
function AddData({x, y: Integer;} view: TfrView): pointer; virtual;
|
||||
function AddData(x, y: Integer; view: TfrView): pointer; virtual;
|
||||
procedure NewRec(View: TfrView; const AText:string; var P:Pointer); virtual;
|
||||
procedure AddRec(ALineIndex: Integer; ARec: Pointer); virtual;
|
||||
function GetviewText(View:TfrView): string; virtual;
|
||||
@ -848,8 +848,8 @@ type
|
||||
procedure OnEndDoc; virtual;
|
||||
procedure OnBeginPage; virtual;
|
||||
procedure OnEndPage; virtual;
|
||||
procedure OnData({%H-}x, {%H-}y: Integer; {%H-}View: TfrView); virtual;
|
||||
procedure OnText({%H-}x, {%H-}y: Integer; const {%H-}text: String; {%H-}View: TfrView); virtual;
|
||||
procedure OnData(x, y: Integer; View: TfrView); virtual;
|
||||
procedure OnText(x, y: Integer; const text: String; View: TfrView); virtual;
|
||||
|
||||
property BandTypes: TfrBandTypes read FBandTypes write FBandTypes;
|
||||
property UseProgressbar: boolean read FUseProgressBar write FUseProgressBar;
|
||||
@ -1079,7 +1079,7 @@ type
|
||||
|
||||
TfrObjEditorForm = class(TForm)
|
||||
public
|
||||
procedure ShowEditor({%H-}t: TfrView); virtual;
|
||||
procedure ShowEditor(t: TfrView); virtual;
|
||||
end;
|
||||
|
||||
TfrFunctionDescription = class(TObject)
|
||||
@ -1112,8 +1112,8 @@ type
|
||||
TfrCompressor = class(TObject)
|
||||
public
|
||||
Enabled: Boolean;
|
||||
procedure Compress({%H-}StreamIn, {%H-}StreamOut: TStream); virtual;
|
||||
procedure DeCompress({%H-}StreamIn, {%H-}StreamOut: TStream); virtual;
|
||||
procedure Compress(StreamIn, StreamOut: TStream); virtual;
|
||||
procedure DeCompress(StreamIn, StreamOut: TStream); virtual;
|
||||
end;
|
||||
|
||||
|
||||
@ -1588,7 +1588,7 @@ begin
|
||||
fFrameWidth := 1;
|
||||
fFrameColor := clBlack;
|
||||
fFillColor := clNone;
|
||||
fFormat := 2*256 + Ord(DefaultFormatSettings.DecimalSeparator);
|
||||
fFormat := 2*256 + Ord(DecimalSeparator);
|
||||
BaseName := 'View';
|
||||
Visible := True;
|
||||
StreamMode := smDesigning;
|
||||
@ -1880,7 +1880,7 @@ begin
|
||||
Read(dy, 4);
|
||||
Read(Flags, 2);
|
||||
|
||||
Read(S{%H-}, SizeOf(S)); fFrameWidth := S;
|
||||
Read(S, SizeOf(S)); fFrameWidth := S;
|
||||
Read(fFrameColor, SizeOf(fFrameColor));
|
||||
Read(fFrames,SizeOf(fFrames));
|
||||
Read(fFrameStyle, SizeOf(fFrameStyle));
|
||||
@ -1897,12 +1897,12 @@ begin
|
||||
if (frVersion >= 23) and (StreamMode = smDesigning) then
|
||||
begin
|
||||
ReadMemo(Stream, Script);
|
||||
Read(wb{%H-},2);
|
||||
Read(wb,2);
|
||||
Visible:=(Wb<>0);
|
||||
end;
|
||||
|
||||
if (frVersion >= 25) then begin
|
||||
Read(I{%H-}, 4);
|
||||
Read(I, 4);
|
||||
ParentBandType := TfrBandType(I);
|
||||
end;
|
||||
|
||||
@ -2444,7 +2444,7 @@ var
|
||||
i := 1;
|
||||
repeat
|
||||
while (i < Length(s)) and (s[i] <> '[') do Inc(i);
|
||||
s1 := GetBrackedVariable(s, i, j{%H-});
|
||||
s1 := GetBrackedVariable(s, i, j);
|
||||
if i <> j then
|
||||
begin
|
||||
Delete(s, i, j - i + 1);
|
||||
@ -2767,7 +2767,7 @@ var
|
||||
aw: Integer;
|
||||
{$ENDIF}
|
||||
n, nw, w, curx: Integer;
|
||||
//ParaEnd: Boolean;
|
||||
ParaEnd: Boolean;
|
||||
Ts: TTextStyle;
|
||||
begin
|
||||
if not Streaming and (cury + th < DR.Bottom) then
|
||||
@ -2775,13 +2775,13 @@ var
|
||||
n := Length(St);
|
||||
w := Ord(St[n - 1]) * 256 + Ord(St[n]);
|
||||
SetLength(St, n - 2);
|
||||
//ParaEnd := True;
|
||||
ParaEnd := True;
|
||||
if Length(St) > 0 then
|
||||
begin
|
||||
if St[Length(St)] = #1 then
|
||||
SetLength(St, Length(St) - 1)
|
||||
else
|
||||
//ParaEnd := False;
|
||||
ParaEnd := False;
|
||||
end;
|
||||
|
||||
// handle any alignment with same code
|
||||
@ -2860,11 +2860,17 @@ var
|
||||
|
||||
procedure OutLine(str: String);
|
||||
var
|
||||
cury: Integer;
|
||||
i, n, cury: Integer;
|
||||
ParaEnd: Boolean;
|
||||
begin
|
||||
SetLength(str, Length(str) - 2);
|
||||
if str[Length(str)] = #1 then
|
||||
begin
|
||||
ParaEnd := True;
|
||||
SetLength(str, Length(str) - 1);
|
||||
end
|
||||
else
|
||||
ParaEnd := False;
|
||||
cury := 0;
|
||||
case Alignment of
|
||||
Classes.taLeftJustify : CurY :=y + dy-gapy;
|
||||
@ -3248,9 +3254,9 @@ begin
|
||||
Font.Name := ReadString(Stream);
|
||||
with Stream do
|
||||
begin
|
||||
Read({%H-}i, 4);
|
||||
Read(i, 4);
|
||||
Font.Size := i;
|
||||
Read({%H-}w, 2);
|
||||
Read(w, 2);
|
||||
Font.Style := frSetFontStyle(w);
|
||||
Read(i, 4);
|
||||
Font.Color := i;
|
||||
@ -3265,9 +3271,9 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
Read({%H-}TmpAlign,SizeOf(TmpAlign));
|
||||
Read({%H-}TmpLayout,SizeOf(TmpLayout));
|
||||
Read({%H-}tmpAngle,SizeOf(tmpAngle));
|
||||
Read(TmpAlign,SizeOf(TmpAlign));
|
||||
Read(TmpLayout,SizeOf(TmpLayout));
|
||||
Read(tmpAngle,SizeOf(tmpAngle));
|
||||
|
||||
BeginUpdate;
|
||||
Alignment := tmpAlign;
|
||||
@ -3381,7 +3387,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrMemoView.FontChange(Sender: TObject);
|
||||
procedure TfrMemoView.FontChange(sender: TObject);
|
||||
begin
|
||||
AfterChange;
|
||||
end;
|
||||
@ -3688,7 +3694,7 @@ end;
|
||||
|
||||
procedure TfrBandView.Draw(aCanvas: TCanvas);
|
||||
var
|
||||
//St : String;
|
||||
St : String;
|
||||
R : TRect;
|
||||
begin
|
||||
fFrameWidth := 1;
|
||||
@ -3747,7 +3753,7 @@ begin
|
||||
Pen.Color := clBlack;
|
||||
MoveTo(r.Right-1, r.Top);
|
||||
LineTo(r.Right-1, r.Bottom);
|
||||
//st:=frBandNames[BandType];
|
||||
st:=frBandNames[BandType];
|
||||
Font.Orientation := 0;
|
||||
Brush.Color:=clBtnFace;
|
||||
TextOut(r.left+5, r.top+1, frBandNames[BandType]);
|
||||
@ -3775,7 +3781,7 @@ end;
|
||||
function TfrBandView.GetClipRgn(rt: TfrRgnType): HRGN;
|
||||
var
|
||||
R,R1,R2: HRGN;
|
||||
// RR : LongInt;
|
||||
RR : LongInt;
|
||||
begin
|
||||
if not ShowBandTitles then
|
||||
begin
|
||||
@ -3793,7 +3799,7 @@ begin
|
||||
|
||||
R2:=CreateRectRgn(0,0,0,0);
|
||||
|
||||
{RR:=}CombineRgn(R2, R, R1, RGN_OR);
|
||||
RR:=CombineRgn(R2, R, R1, RGN_OR);
|
||||
Result:=R2;
|
||||
|
||||
|
||||
@ -4102,13 +4108,11 @@ var
|
||||
w, h, w1, h1: Integer;
|
||||
|
||||
procedure PrintBitmap(DestRect: TRect; Bitmap: TBitmap);
|
||||
{
|
||||
var
|
||||
BitmapHeader: pBitmapInfo;
|
||||
BitmapImage: Pointer;
|
||||
HeaderSize: DWord;
|
||||
ImageSize: DWord;
|
||||
}
|
||||
begin
|
||||
aCanvas.StretchDraw(DestRect, Bitmap);
|
||||
//**
|
||||
@ -4231,7 +4235,7 @@ begin
|
||||
SetLength(S, Stream.Size*2);
|
||||
c := 1;
|
||||
for i:=1 to Stream.Size div SizeOf(Buf) do begin
|
||||
Stream.Read(Buf{%H-}, SizeOf(buf));
|
||||
Stream.Read(Buf, SizeOf(buf));
|
||||
WriteBuf(SizeOf(Buf));
|
||||
end;
|
||||
i := Stream.Size mod SizeOf(Buf);
|
||||
@ -4263,12 +4267,12 @@ procedure TfrPictureView.LoadFromStream(Stream: TStream);
|
||||
var
|
||||
b: Byte;
|
||||
n: Integer;
|
||||
//AGraphicClass: TGraphicClass;
|
||||
AGraphicClass: TGraphicClass;
|
||||
Graphic: TGraphic;
|
||||
//Ext: string;
|
||||
Ext: string;
|
||||
begin
|
||||
inherited LoadFromStream(Stream);
|
||||
Stream.Read({%H-}b, 1);
|
||||
Stream.Read(b, 1);
|
||||
|
||||
if b=pkAny then
|
||||
Graphic := ExtensionToGraphic(Stream.ReadAnsiString)
|
||||
@ -4277,7 +4281,7 @@ begin
|
||||
|
||||
FSharedName := Stream.ReadAnsiString;
|
||||
|
||||
Stream.Read({%H-}n, 4);
|
||||
Stream.Read(n, 4);
|
||||
|
||||
Picture.Graphic := Graphic;
|
||||
if Graphic <> nil then
|
||||
@ -4372,7 +4376,7 @@ end;
|
||||
procedure TfrPictureView.SaveToXML(XML: TLrXMLConfig; const Path: String);
|
||||
var
|
||||
b: Byte;
|
||||
//n, o: Integer;
|
||||
n, o: Integer;
|
||||
m: TMemoryStream;
|
||||
begin
|
||||
inherited SaveToXML(XML, Path);
|
||||
@ -4656,7 +4660,7 @@ end;
|
||||
|
||||
function TfrLineView.PointInView(aX, aY: Integer): Boolean;
|
||||
var
|
||||
bx, by, bx1, by1, w1: Integer;
|
||||
bx, by, bx1, by1, w1, w2: Integer;
|
||||
begin
|
||||
if FrameStyle=frsDouble then
|
||||
w1 := Round(FrameWidth * 1.5)
|
||||
@ -5170,7 +5174,7 @@ begin
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
procedure TfrBand.CheckNextColumn;
|
||||
function TfrBand.CheckNextColumn: boolean;
|
||||
var
|
||||
BandHeight: Integer;
|
||||
begin
|
||||
@ -6577,6 +6581,7 @@ var
|
||||
var
|
||||
WasPrinted: Boolean;
|
||||
b, b1, b2: TfrBand;
|
||||
BM : Pointer;
|
||||
|
||||
procedure InitGroups(b: TfrBand);
|
||||
begin
|
||||
@ -6856,13 +6861,13 @@ begin
|
||||
Read(pgSize, 4);
|
||||
Read(dx, 4); //Width
|
||||
Read(dy, 4); //Height
|
||||
Read({%H-}Rc, Sizeof(Rc));
|
||||
Read(Rc, Sizeof(Rc));
|
||||
Margins.AsRect:=Rc;
|
||||
Read({%H-}b, 1);
|
||||
Read(b, 1);
|
||||
Orientation:=TPrinterOrientation(b);
|
||||
if frVersion < 23 then
|
||||
Read({%H-}s[1], 6);
|
||||
Read({%H-}Bool, 2);
|
||||
Read(s[1], 6);
|
||||
Read(Bool, 2);
|
||||
PrintToPrevPage:=Bool;
|
||||
Read(Bool, 2);
|
||||
UseMargins:=Bool;
|
||||
@ -7050,14 +7055,16 @@ begin
|
||||
AddObject(b, '');
|
||||
t.LoadFromStream(Stream);
|
||||
if AnsiUpperCase(s) = 'TFRFRAMEDMEMOVIEW' then
|
||||
Stream.Read({%H-}buf[1], 8);
|
||||
Stream.Read(buf[1], 8);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrPages.LoadFromXML(XML: TLrXMLConfig; const Path: String);
|
||||
var
|
||||
b: Byte;
|
||||
t: TfrView;
|
||||
s: string;
|
||||
procedure AddObject(aPage: TFrPage; ot: Byte; clname: String);
|
||||
begin
|
||||
aPage.Objects.Add(frCreateObject(ot, clname));
|
||||
@ -7114,6 +7121,7 @@ var
|
||||
b: Byte;
|
||||
i, j: Integer;
|
||||
t: TfrView;
|
||||
S:string;
|
||||
begin
|
||||
Stream.Write(Parent.PrintToDefault, 2);
|
||||
Stream.Write(Parent.DoublePass, 2);
|
||||
@ -7153,6 +7161,7 @@ end;
|
||||
|
||||
procedure TfrPages.SavetoXML(XML: TLrXMLConfig; const Path: String);
|
||||
var
|
||||
b: Byte;
|
||||
i, j: Integer;
|
||||
t: TfrView;
|
||||
aPath,aSubPath: String;
|
||||
@ -7290,7 +7299,7 @@ begin
|
||||
Stream.Read(frVersion, 1);
|
||||
while Stream.Position < Stream.Size do
|
||||
begin
|
||||
Stream.Read({%H-}b, 1);
|
||||
Stream.Read(b, 1);
|
||||
if b = gtAddIn then
|
||||
s := ReadString(Stream) else
|
||||
s := '';
|
||||
@ -7320,7 +7329,7 @@ begin
|
||||
Stream.Read(frVersion, 1);
|
||||
while Stream.Position < Stream.Size do
|
||||
begin
|
||||
Stream.Read({%H-}b, 1);
|
||||
Stream.Read(b, 1);
|
||||
if b = gtAddIn then
|
||||
s := ReadString(Stream)
|
||||
else
|
||||
@ -7407,6 +7416,7 @@ var
|
||||
i, o, c: Integer;
|
||||
b, compr: Byte;
|
||||
p: PfrPageInfo;
|
||||
s: TMemoryStream;
|
||||
|
||||
procedure ReadVersion22;
|
||||
var
|
||||
@ -7453,7 +7463,7 @@ var
|
||||
|
||||
begin
|
||||
Clear;
|
||||
AStream.Read({%H-}compr, 1);
|
||||
AStream.Read(compr, 1);
|
||||
if not (compr in [0, 1, 255]) then
|
||||
begin
|
||||
AStream.Seek(0, soFromBeginning);
|
||||
@ -7473,17 +7483,17 @@ var
|
||||
|
||||
begin
|
||||
if AReadHeader then begin
|
||||
AStream.Read({%H-}compr, 1);
|
||||
AStream.Read(compr, 1);
|
||||
if not (compr in [0, 1, 255]) then
|
||||
begin
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
Parent.SetPrinterTo(frReadString(AStream));
|
||||
AStream.Read({%H-}c, 4);
|
||||
AStream.Read(c, 4);
|
||||
i := 0;
|
||||
repeat
|
||||
AStream.Read({%H-}o, 4);
|
||||
AStream.Read(o, 4);
|
||||
GetMem(p, SizeOf(TfrPageInfo));
|
||||
FillChar(p^, SizeOf(TfrPageInfo), #0);
|
||||
FPages.Add(p);
|
||||
@ -7492,7 +7502,7 @@ begin
|
||||
AStream.Read(pgSize, 2);
|
||||
AStream.Read(pgWidth, 4);
|
||||
AStream.Read(pgHeight, 4);
|
||||
AStream.Read({%H-}b, 1);
|
||||
AStream.Read(b, 1);
|
||||
pgOr := TPrinterOrientation(b);
|
||||
AStream.Read(b, 1);
|
||||
pgMargins := Boolean(b);
|
||||
@ -7640,7 +7650,7 @@ var
|
||||
var
|
||||
n: Byte;
|
||||
begin
|
||||
Stream.Read({%H-}n, 1);
|
||||
Stream.Read(n, 1);
|
||||
SetLength(Result, n);
|
||||
Stream.Read(Result[1], n);
|
||||
end;
|
||||
@ -7650,7 +7660,7 @@ begin
|
||||
FItems.Sorted := False;
|
||||
with Stream do
|
||||
begin
|
||||
ReadBuffer({%H-}n, SizeOf(n));
|
||||
ReadBuffer(n, SizeOf(n));
|
||||
for i := 0 to n - 1 do
|
||||
begin
|
||||
j := AddValue;
|
||||
@ -7811,7 +7821,7 @@ procedure TfrReport.ReadBinaryData(Stream: TStream);
|
||||
var
|
||||
n: Integer;
|
||||
begin
|
||||
Stream.Read({%H-}n, 4); // version
|
||||
Stream.Read(n, 4); // version
|
||||
if FStoreInDFM then
|
||||
begin
|
||||
Stream.Read(n, 4);
|
||||
@ -7860,6 +7870,8 @@ procedure TfrReport.InternalOnGetValue(ParName: String; var ParValue: String);
|
||||
var
|
||||
i, j, AFormat: Integer;
|
||||
AFormatStr: String;
|
||||
V : Variant;
|
||||
ValStr: String;
|
||||
begin
|
||||
SubValue := '';
|
||||
AFormat := CurView.Format;
|
||||
@ -8431,8 +8443,8 @@ begin
|
||||
if Load then
|
||||
begin
|
||||
ReadMemo(Stream, fm);
|
||||
Stream.Read(pos{%H-}, 4);
|
||||
Stream.Read({%H-}b, 1);
|
||||
Stream.Read(pos, 4);
|
||||
Stream.Read(b, 1);
|
||||
if b <> 0 then
|
||||
fb.LoadFromStream(Stream);
|
||||
Stream.Position := pos;
|
||||
@ -9420,23 +9432,23 @@ begin
|
||||
FOnSetup(Self);
|
||||
end;
|
||||
|
||||
function TfrExportFilter.AddData({x, y: Integer;} view: TfrView):pointer;
|
||||
function TfrExportFilter.AddData(x, y: Integer; view: TfrView):pointer;
|
||||
var
|
||||
p: PfrTextRec;
|
||||
s: string;
|
||||
begin
|
||||
result := nil;
|
||||
|
||||
if (view = nil) or not (view.ParentBandType in BandTypes) then
|
||||
if (View = nil) or not (View.ParentBandType in BandTypes) then
|
||||
exit;
|
||||
|
||||
if view.Flags and flStartRecord<>0 then
|
||||
if View.Flags and flStartRecord<>0 then
|
||||
Inc(FLineIndex);
|
||||
|
||||
if CheckView(view) then
|
||||
if CheckView(View) then
|
||||
begin
|
||||
s := GetViewText(view);
|
||||
NewRec(view, s, {%H-}p);
|
||||
s := GetViewText(View);
|
||||
NewRec(View, s, p);
|
||||
AddRec(FLineIndex, p);
|
||||
result := p;
|
||||
end;
|
||||
|
||||
@ -134,7 +134,7 @@ end;
|
||||
|
||||
procedure TfrCSVExportFilter.OnData(x, y: Integer; View: TfrView);
|
||||
begin
|
||||
AddData({x, y,} View);
|
||||
AddData(x, y, View);
|
||||
end;
|
||||
|
||||
procedure TfrCSVExportFilter.OnText(X, Y: Integer; const Text: String;
|
||||
|
||||
@ -399,7 +399,7 @@ end;
|
||||
|
||||
procedure TfrHTMExportFilter.OnData(x, y: Integer; View: TfrView);
|
||||
begin
|
||||
FLastField := AddData({x, y,} View);
|
||||
FLastField := AddData(x, y, View);
|
||||
end;
|
||||
|
||||
procedure TfrHTMExportFilter.OnText(X, Y: Integer; const Text: String;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user