diff --git a/package/FrameViewer09.pas b/package/FrameViewer09.pas index 71826225..59211999 100644 --- a/package/FrameViewer09.pas +++ b/package/FrameViewer09.pas @@ -9,12 +9,13 @@ interface uses DitherUnit, FramBrwz, FrameViewerReg, FramView, HtmlBuffer, HtmlGif1, - HTMLGif2, HtmlGlobals, HtmlMisc, Htmlsbs1, HTMLSubs, HtmlView, ReadHTML, - StylePars, StyleUn, URLSubs, msimg32, AlphaBlendUn, HSLUtils, BuffConv, - BuffConvArrays, HtmlSymb, BegaHtmlPrintPreviewForm, BegaMetaFilePrinter, - BegaPreview, BegaPreviewForm, BegaPreviewPanel, BegaScrollBox, BegaZoom, - GDIPL2A, HtmlCaches, HtmlFonts, HtmlImages, MetaFilePrinter, StyleTypes, - vwPrint, UrlConn, HtmlPrinter, HTMLUn2, LazarusPackageIntf; + HTMLGif2, HtmlGlobals, HtmlMisc, Htmlsbs1, HTMLSubs, HTMLUn2, HtmlView, + ReadHTML, StylePars, StyleUn, URLSubs, msimg32, AlphaBlendUn, HSLUtils, + BuffConv, BuffConvArrays, HtmlSymb, BegaHtmlPrintPreviewForm, + BegaMetaFilePrinter, BegaPreview, BegaPreviewForm, BegaPreviewPanel, + BegaScrollBox, BegaZoom, GDIPL2A, HtmlCaches, HtmlFonts, HtmlImages, + MetaFilePrinter, StyleTypes, vwPrint, UrlConn, HtmlPrinter, + LazarusPackageIntf; implementation diff --git a/source/HTMLSubs.pas b/source/HTMLSubs.pas index 8f3c4915..0cbee2e6 100644 --- a/source/HTMLSubs.pas +++ b/source/HTMLSubs.pas @@ -4515,7 +4515,7 @@ function TCellBasic.CheckLastBottomMargin: Boolean; while I < Count do begin TB := Items[I]; - if TB is TSection and (Length(Trim(TSection(TB).BuffS)) = 0) then + if (TB is TSection) and (Length(Trim(TSection(TB).BuffS)) = 0) then else if not (TB is TBlock) or (TBlock(TB).Positioning <> PosAbsolute) then break; @@ -4539,7 +4539,7 @@ function TCellBasic.CheckLastBottomMargin: Boolean; while J >= I do begin TB := Items[J]; - if TB is TSection and (Length(Trim(TSection(TB).BuffS)) = 0) then + if (TB is TSection) and (Length(Trim(TSection(TB).BuffS)) = 0) then else if not (TB is TBlock) or (TBlock(TB).Positioning <> PosAbsolute) then break; @@ -5977,7 +5977,7 @@ function TBlock.Draw1(Canvas: TCanvas; const ARect: TRect; IMgr: TIndentManager; if Result < Document.PageBottom then Document.PageBottom := Result; end - else if Self is TTableBlock and not TTableBlock(Self).Table.HeadOrFoot then {ordinary tables} + else if (Self is TTableBlock) and not TTableBlock(Self).Table.HeadOrFoot then {ordinary tables} {if we're printing and we're 2/3 down page and table won't fit on this page and table will fit on next page, then don't do table now} diff --git a/source/htmlview.pas b/source/htmlview.pas index 2fd870e9..c8c6a59c 100644 --- a/source/htmlview.pas +++ b/source/htmlview.pas @@ -4870,7 +4870,7 @@ procedure THtmlViewer.FormControlEnterEvent(Sender: TObject); Invalidate; end; end - else if Sender is TFontObj and not NoJump then + else if (Sender is TFontObj) and not NoJump then begin Y := TFontObj(Sender).DrawYY; Pos := VScrollBarPosition;