summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/objserv.cxx
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@collabora.com>2019-05-01 18:46:47 +0300
committerMuhammet Kara <muhammet.kara@collabora.com>2019-05-02 19:28:27 +0200
commitb743d446d8cccabcf3d002da652da0a8854ad883 (patch)
tree12d1cae6dccfa63154a171031dcad7d731547aea /sfx2/source/doc/objserv.cxx
parente6532f75e1901a783c50907fd5e94f1bb6a01f6b (diff)
tdf#125063: Don't depend on content size for Page sizing
During redaction of Calc sheets Change-Id: If2a4f71c77a687a74b8f823152b76d2a7e2e21da Reviewed-on: https://gerrit.libreoffice.org/71627 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'sfx2/source/doc/objserv.cxx')
-rw-r--r--sfx2/source/doc/objserv.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index cd8bdd0ced85..7d5fa32738e6 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -561,9 +561,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
sal_Int32 nPages = aRenderer.getPageCount();
std::vector< GDIMetaFile > aMetaFiles;
+ std::vector< ::Size > aPageSizes;
// Convert the pages of the document to gdimetafiles
- SfxRedactionHelper::getPageMetaFilesFromDoc(aMetaFiles, nPages, aRenderer, bIsWriter, bIsCalc);
+ SfxRedactionHelper::getPageMetaFilesFromDoc(aMetaFiles, aPageSizes, nPages, aRenderer, bIsWriter, bIsCalc);
// Create an empty Draw component.
uno::Reference<frame::XDesktop2> xDesktop = css::frame::Desktop::create(comphelper::getProcessComponentContext());
@@ -571,7 +572,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
uno::Reference<lang::XComponent> xComponent = xComponentLoader->loadComponentFromURL("private:factory/sdraw", "_default", 0, {});
// Add the doc pages to the new draw document
- SfxRedactionHelper::addPagesToDraw(xComponent, nPages, aMetaFiles, bIsCalc);
+ SfxRedactionHelper::addPagesToDraw(xComponent, nPages, aMetaFiles, aPageSizes, bIsCalc);
// Show the Redaction toolbar
SfxViewFrame* pViewFrame = SfxViewFrame::Current();