paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 23:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazreport: fix draw of empty lines. Issue #22305

Browse Source 
git-svn-id: trunk@37750 -
This commit is contained in:
blikblum 2012-06-23 18:04:36 +00:00
parent 7f01c28850
commit 65afb65cf7
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/lazreport/source/lr_class.pas
View File

@ -2835,7 +2835,7 @@ var
procedure WrapLine(const s: String);
var
i, cur, beg, last, len: Integer;
WasBreak, CRLF: Boolean;
WasBreak, CRLF, IsCR: Boolean;
ch: TUTF8char;
begin
@ -2864,21 +2864,25 @@ var
Ch := UTF8Char(s, cur, Desc);
// check for items with soft-breaks
if (Ch=#10) or (Ch=#13) then
IsCR := Ch=#13;
if IsCR then
begin
//handle composite newline
ch := UTF8Char(s, cur+1, desc);
//dont increase char index if next char is LF (#10)
if ch<>#10 then
Inc(Cur);
end;
if Ch=#10 then
begin
OutLine(UTF8Range(s, beg, cur - beg, Desc) + #1);
while (cur<Len) and UTF8CharIn(ch, [#10,#13]) do
begin
inc(cur);
if cur<=len then
ch := UTF8Char(s, cur, desc);
end;
beg := cur; last := beg;
if UTF8CharIn(Ch,[#13, #10]) then
exit
else
continue;
//increase the char index since it's pointing to CR (#13)
if IsCR then
Inc(cur);
Inc(cur);
beg := cur;
last := beg;
Continue;
end;
if ch <> ' ' then