From 843ec68778edf11ea4fd78cefbd8cde8479ddfae Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 6 Nov 2001 12:18:51 +0000 Subject: [PATCH] Initial check in for print preview work it is complied in for Windows and linix only The bulk of print preview can be turned on/off with NS_PRINT_PREVIEW define Bug 107562 r=kmcclusk sr=attinasi git-svn-id: svn://10.0.0.236/trunk@107448 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsStyleUtil.cpp | 3 ++- mozilla/content/shared/src/nsStyleUtil.cpp | 3 ++- mozilla/layout/style/nsStyleUtil.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp index f6b56d2e860..fb0ca01200f 100644 --- a/mozilla/content/html/style/src/nsStyleUtil.cpp +++ b/mozilla/content/html/style/src/nsStyleUtil.cpp @@ -411,8 +411,9 @@ static nscoord NewCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize, case eFontSize_CSS: column = sCSSColumns; break; } + // Make special call specifically for fonts (needed PrintPreview) float t2p; - aPresContext->GetTwipsToPixels(&t2p); + aPresContext->GetTwipsToPixelsForFonts(&t2p); PRInt32 fontSize = NSTwipsToIntPixels(aBasePointSize, t2p); if ((fontSize >= sFontSizeTableMin) && (fontSize <= sFontSizeTableMax)) diff --git a/mozilla/content/shared/src/nsStyleUtil.cpp b/mozilla/content/shared/src/nsStyleUtil.cpp index f6b56d2e860..fb0ca01200f 100644 --- a/mozilla/content/shared/src/nsStyleUtil.cpp +++ b/mozilla/content/shared/src/nsStyleUtil.cpp @@ -411,8 +411,9 @@ static nscoord NewCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize, case eFontSize_CSS: column = sCSSColumns; break; } + // Make special call specifically for fonts (needed PrintPreview) float t2p; - aPresContext->GetTwipsToPixels(&t2p); + aPresContext->GetTwipsToPixelsForFonts(&t2p); PRInt32 fontSize = NSTwipsToIntPixels(aBasePointSize, t2p); if ((fontSize >= sFontSizeTableMin) && (fontSize <= sFontSizeTableMax)) diff --git a/mozilla/layout/style/nsStyleUtil.cpp b/mozilla/layout/style/nsStyleUtil.cpp index f6b56d2e860..fb0ca01200f 100644 --- a/mozilla/layout/style/nsStyleUtil.cpp +++ b/mozilla/layout/style/nsStyleUtil.cpp @@ -411,8 +411,9 @@ static nscoord NewCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize, case eFontSize_CSS: column = sCSSColumns; break; } + // Make special call specifically for fonts (needed PrintPreview) float t2p; - aPresContext->GetTwipsToPixels(&t2p); + aPresContext->GetTwipsToPixelsForFonts(&t2p); PRInt32 fontSize = NSTwipsToIntPixels(aBasePointSize, t2p); if ((fontSize >= sFontSizeTableMin) && (fontSize <= sFontSizeTableMax))