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

fpspreadsheet: Clean-up

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4317 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-09-09 13:20:09 +00:00
parent a5cbacff27
commit f9c7e354c5
12 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/fpsvisualutils.pas
View File

@@ -201,7 +201,6 @@ var
out AFontPos: TsFontPosition);
var
fnt: TsFont;
rtParam: TsRichTextParam;
begin
if (Length(ARichTextParams) > 0) and (charPos >= ARichTextParams[0].FirstIndex) then
begin
@@ -613,7 +612,8 @@ procedure DrawRichText(ACanvas: TCanvas; AWorkbook: TsWorkbook; const ARect: TRe
AWordwrap: Boolean; AHorAlignment: TsHorAlignment; AVertAlignment: TsVertAlignment;
ARotation: TsTextRotation; AOverrideTextColor: TColor);
var
w,h: Integer;
w: Integer = 0;
h: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, ARect, AText, AFontIndex,
ARichTextParams, AWordWrap, AHorAlignment, AVertAlignment, ARotation,
@@ -624,7 +624,8 @@ function RichTextWidth(ACanvas: TCanvas; AWorkbook: TsWorkbook; AMaxRect: TRect;
const AText: String; AFontIndex: Integer; ARichTextParams: TsRichTextParams;
ATextRotation: TsTextRotation; AWordWrap: Boolean): Integer;
var
h, w: Integer;
h: Integer = 0;
w: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, AMaxRect, AText, AFontIndex,
ARichTextParams, AWordWrap, haLeft, vaTop, ATextRotation, clNone, true,
@@ -641,7 +642,8 @@ function RichTextHeight(ACanvas: TCanvas; AWorkbook: TsWorkbook; AMaxRect: TRect
const AText: String; AFontIndex: Integer; ARichTextParams: TsRichTextParams;
ATextRotation: TsTextRotation; AWordWrap: Boolean): Integer;
var
h, w: Integer;
h: Integer = 0;
w: Integer = 0;
begin
InternalDrawRichText(ACanvas, AWorkbook, AMaxRect, AText, AFontIndex,
ARichTextParams, AWordWrap, haLeft, vaTop, ATextRotation, clNone, true,