ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Avoid multiple divisions when looking for paper

Browse Source 
Also use o3tl::convert to convert from mm100 to mm

Change-Id: If42cd5854c01a1609084c5e816c7ece5da76e7f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199127
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2026-02-11 17:12:36 +01:00
parent 0ba13f449f
commit 6de0be9005
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i18nutil/source/utility/paper.cxx
+8 -8
View File
@@ -319,8 +319,8 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
freelocale(loc);
//glibc stores sizes as integer mm units
w.word *= 100;
h.word *= 100;
tools::Long nPaperWidth = w.word * 100;
tools::Long nPaperHeight = h.word * 100;
for ( size_t i = 0; i < nTabSize; ++i )
{
@@ -329,18 +329,18 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
//glibc stores sizes as integer mm units, and so is inaccurate.
//To find a standard paper size we calculate the standard paper
//sizes into equally inaccurate mm and compare
tools::Long width = (aDinTab[i].m_nWidth + 50) / 100;
tools::Long height = (aDinTab[i].m_nHeight + 50) / 100;
tools::Long width = o3tl::convert(aDinTab[i].m_nWidth, o3tl::Length::mm100, o3tl::Length::mm);
tools::Long height = o3tl::convert(aDinTab[i].m_nHeight, o3tl::Length::mm100, o3tl::Length::mm);
if (width == w.word/100 && height == h.word/100)
if (width == w.word && height == h.word)
{
w.word = aDinTab[i].m_nWidth;
h.word = aDinTab[i].m_nHeight;
nPaperWidth = aDinTab[i].m_nWidth;
nPaperHeight = aDinTab[i].m_nHeight;
break;
}
}
aInstance = PaperInfo(w.word, h.word);
aInstance = PaperInfo(nPaperWidth, nPaperHeight);
bInitialized = true;
return aInstance;
}