From 3288c72057f545aef7d30158ad09c9ae5576571d Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Fri, 16 Jan 2009 12:08:18 +0000 Subject: [PATCH] comdlg32: Add an is_metric() helper function. --- dlls/comdlg32/printdlg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c9988a67924..47c3b348f14 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2393,6 +2393,11 @@ static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd) return hDlgTmpl; } +static inline BOOL is_metric(const PageSetupDataA *pda) +{ + return pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS; +} + static DWORD _c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) @@ -2414,7 +2419,7 @@ static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout) static const WCHAR metric_format[] = {'%','d',0}; static const WCHAR imperial_format[] = {'%','d','i','n',0}; - if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) + if (is_metric(pda)) wsprintfW(strout, metric_format, size / 100); else wsprintfW(strout, imperial_format, size / 1000);