ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/nongui/IBCustomDataSet.pas
(Generate patch)

Comparing ibx/trunk/runtime/nongui/IBCustomDataSet.pas (file contents):
Revision 221 by tony, Mon Mar 19 09:48:37 2018 UTC vs.
Revision 241 by tony, Thu Oct 25 13:57:12 2018 UTC

# Line 1158 | Line 1158 | begin
1158         3, {Assume UNICODE_FSS is really UTF8}
1159         4: {Include GB18030 - assuming UTF8 routines work for this codeset}
1160           if DisplayWidth = 0 then
1161 +           {$if not defined(ValidUTF8String)}
1162 +           Result := Utf8EscapeControlChars(TextToSingleLine(Result))
1163 +           {$else}
1164             Result := ValidUTF8String(TextToSingleLine(Result))
1165 +           {$endif}
1166           else
1167           if UTF8Length(Result) > DisplayWidth then {Show truncation with elipses}
1168 +           {$if not defined(ValidUTF8String)}
1169 +           Result := Utf8EscapeControlChars(TextToSingleLine(UTF8Copy(Result,1,DisplayWidth-3))) + '...';
1170 +           {$else}
1171             Result := ValidUTF8String(TextToSingleLine(UTF8Copy(Result,1,DisplayWidth-3))) + '...';
1172 +           {$endif}
1173         end;
1174     end
1175   end;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines