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

fpspreadsheet: Avoid quoted text when copying a single cell with linebreaks to clipboard.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6070 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-11-14 11:40:04 +00:00
parent bc83057bd8
commit b2ed81ee6e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
View File

@ -1410,6 +1410,7 @@ var
sel: TsCellRangeArray; sel: TsCellRangeArray;
stream: TStream; stream: TStream;
savedCSVParams: TsCSVParams; savedCSVParams: TsCSVParams;
s: String;
procedure CopyToClipboard(AStream: TStream; AFileFormat: TsSpreadsheetFormat; procedure CopyToClipboard(AStream: TStream; AFileFormat: TsSpreadsheetFormat;
AClipboardFormat: Integer; AParams: TsStreamParams = []); AClipboardFormat: Integer; AParams: TsStreamParams = []);
@ -1466,9 +1467,21 @@ begin
CopyToClipboard(stream, sfCSV, cfCSVFormat); CopyToClipboard(stream, sfCSV, cfCSVFormat);
// Finally write TEXT format // Finally write TEXT format
CsvParams.Delimiter := #9; if FWorksheet.GetSelectionCount = 1 then begin
CopyToClipboard(stream, sfCSV, CF_TEXT); s := FWorksheet.ReadAsText(FWorksheet.ActiveCellRow, FWorksheet.ActiveCellCol);
CSVParams := savedCSVParams; if s <> '' then begin
stream.Write(s[1], Length(s));
stream.WriteByte(0);
stream.Position := 0;
Clipboard.AddFormat(CF_TEXT, stream);
(stream as TMemoryStream).Clear;
end;
end else
begin
CsvParams.Delimiter := #9;
CopyToClipboard(stream, sfCSV, CF_TEXT);
CSVParams := savedCSVParams;
end;
// To do: XML format, ods format // To do: XML format, ods format
finally finally