paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Fix AutoColWidth calculation if cell content is wider than column

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5735 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2017-01-30 18:04:36 +00:00
parent d1a789115f
commit c1adce9a43
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -222,7 +222,7 @@ type
function GetCellHeight(ACol, ARow: Integer): Integer; function GetCellHeight(ACol, ARow: Integer): Integer;
function GetCellHintText(ACol, ARow: Integer): String; override; function GetCellHintText(ACol, ARow: Integer): String; override;
function GetCells(ACol, ARow: Integer): String; override; function GetCells(ACol, ARow: Integer): String; override;
function GetCellText(ACol, ARow: Integer): String; function GetCellText(ACol, ARow: Integer; ATrim: Boolean = true): String;
function GetEditText(ACol, ARow: Integer): String; override; function GetEditText(ACol, ARow: Integer): String; override;
function GetDefaultHeaderColWidth: Integer; function GetDefaultHeaderColWidth: Integer;
function HasBorder(ACell: PCell; ABorder: TsCellBorder): Boolean; function HasBorder(ACell: PCell; ABorder: TsCellBorder): Boolean;
@ -1118,7 +1118,7 @@ begin
for cell in Worksheet.Cells.GetColEnumerator(GetWorkSheetCol(ACol)) do for cell in Worksheet.Cells.GetColEnumerator(GetWorkSheetCol(ACol)) do
begin begin
gRow := GetGridRow(cell^.Row); gRow := GetGridRow(cell^.Row);
txt := GetCellText(ACol, gRow); txt := GetCellText(ACol, gRow, false);
if txt = '' then if txt = '' then
Continue; Continue;
case Worksheet.ReadBiDiMode(cell) of case Worksheet.ReadBiDiMode(cell) of
@ -3030,9 +3030,12 @@ end;
@param ACol Grid column index of the cell @param ACol Grid column index of the cell
@param ARow Grid row index of the cell @param ARow Grid row index of the cell
@param ATrim If true show replacement characters if numerical data
are wider than cell.
@return Text to be displayed in the cell. @return Text to be displayed in the cell.
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------}
function TsCustomWorksheetGrid.GetCellText(ACol, ARow: Integer): String; function TsCustomWorksheetGrid.GetCellText(ACol, ARow: Integer;
ATrim: Boolean = true): String;
var var
cell: PCell; cell: PCell;
r, c: Integer; r, c: Integer;
@ -3064,7 +3067,10 @@ begin
cell := Worksheet.FindCell(r, c); cell := Worksheet.FindCell(r, c);
if cell <> nil then if cell <> nil then
begin begin
Result := TrimToCell(cell); if ATrim then
Result := TrimToCell(cell)
else
Result := Worksheet.ReadAsText(cell);
{ {
if Worksheet.ReadTextRotation(cell) = rtStacked then if Worksheet.ReadTextRotation(cell) = rtStacked then
begin begin