diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-05-24 06:59:39 -0400 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2018-06-01 08:59:26 +0200 |
commit | f303db85f6b1fa06a61b0f709efce97ab9615bf8 (patch) | |
tree | 5ccdf17ebc43359dd91968556bc6eb2aa8e71492 /sd | |
parent | 6a104fb42e4d0e5e394c3b4dd78b71cd756304d7 (diff) |
sd: make the imported PDF page exactly as original
i.e. no borders or larger page than rendered PDF
Change-Id: I1f356cceeec1d5d9f1728f0e29160fdd9241a221
Reviewed-on: https://gerrit.libreoffice.org/54764
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/pdf/sdpdffilter.cxx | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index 25f0370a81bf..c7aba7d18ca2 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -129,37 +129,12 @@ bool SdPdfFilter::Import() // Create the page and insert the Graphic. SdPage* pPage = mrDocument.GetSdPage(nPageNumber++, PageKind::Standard); - Size aGrfSize(OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), - MapMode(MapUnit::Map100thMM))); - - Size aPagSize(pPage->GetSize()); - aPagSize.AdjustWidth(-(pPage->GetLftBorder() + pPage->GetRgtBorder())); - aPagSize.AdjustHeight(-(pPage->GetUppBorder() + pPage->GetLwrBorder())); - - // scale to fit page - if (((aGrfSize.Height() > aPagSize.Height()) || (aGrfSize.Width() > aPagSize.Width())) - && aGrfSize.Height() && aPagSize.Height()) - { - const double fGrfWH = static_cast<double>(aGrfSize.Width()) / aGrfSize.Height(); - const double fWinWH = static_cast<double>(aPagSize.Width()) / aPagSize.Height(); - - // adjust graphic to page size (scales) - if (fGrfWH < fWinWH) - { - aGrfSize.setWidth(static_cast<long>(aPagSize.Height() * fGrfWH)); - aGrfSize.setHeight(aPagSize.Height()); - } - else if (fGrfWH > 0.F) - { - aGrfSize.setWidth(aPagSize.Width()); - aGrfSize.setHeight(static_cast<long>(aPagSize.Width() / fGrfWH)); - } - } - - // Set the output rectangle of the Graphic. - Point aPos; - aPos.setX(((aPagSize.Width() - aGrfSize.Width()) >> 1) + pPage->GetLftBorder()); - aPos.setY(((aPagSize.Height() - aGrfSize.Height()) >> 1) + pPage->GetUppBorder()); + const Size aGrfSize(OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), + MapMode(MapUnit::Map100thMM))); + + // Make the page size match the rendered image. + pPage->SetSize(aGrfSize); + Point aPos(0, 0); pPage->InsertObject(new SdrGrafObj(aGraphic, tools::Rectangle(aPos, aGrfSize))); } |