diff options
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/paper.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index 4e94f9b36a14..74c9fd35e9f4 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -164,7 +164,7 @@ const size_t nTabSize = SAL_N_ELEMENTS(aDinTab); #define MAXSLOPPY 21 -void PaperInfo::doSloppyFit() +void PaperInfo::doSloppyFit(bool bAlsoTryRotated) { if (m_eType != PAPER_USER) return; @@ -175,11 +175,8 @@ void PaperInfo::doSloppyFit() tools::Long lDiffW = std::abs(aDinTab[i].m_nWidth - m_nPaperWidth); tools::Long lDiffH = std::abs(aDinTab[i].m_nHeight - m_nPaperHeight); - tools::Long lFlipDiffW = std::abs(aDinTab[i].m_nHeight - m_nPaperWidth); - tools::Long lFlipDiffH = std::abs(aDinTab[i].m_nWidth - m_nPaperHeight); - if ( (lDiffW < MAXSLOPPY && lDiffH < MAXSLOPPY) || - (lFlipDiffW < MAXSLOPPY && lFlipDiffH < MAXSLOPPY) ) + if (lDiffW < MAXSLOPPY && lDiffH < MAXSLOPPY) { m_nPaperWidth = aDinTab[i].m_nWidth; m_nPaperHeight = aDinTab[i].m_nHeight; @@ -187,6 +184,13 @@ void PaperInfo::doSloppyFit() return; } } + + if (bAlsoTryRotated) + { + std::swap(m_nPaperWidth, m_nPaperHeight); + doSloppyFit(); + std::swap(m_nPaperWidth, m_nPaperHeight); + } } bool PaperInfo::sloppyEqual(const PaperInfo &rOther) const |