diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-04-15 20:32:52 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-06-01 08:59:19 +0200 |
| commit | ddbc8879ea28bfcd0cd120b7817a25f74b06e8c9 (patch) | |
| tree | 53dcfec3ad9d64fcd86e3abb66a4084395fde004 /svx | |
| parent | 6e2b51b91e6714efb2e9595d6be5c80cf3b1216f (diff) | |
sd: support breaking any PDF page
Change-Id: Ifa5f58163bef209a988fc0f88e2b609b1973e0d4
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdpdf.cxx | 13 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpdf.hxx | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 642f562d6a1b..62e4ee03a782 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -207,16 +207,17 @@ ImpSdrPdfImport::~ImpSdrPdfImport() FPDF_DestroyLibrary(); } -void ImpSdrPdfImport::DoLoopActions(SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport) +void ImpSdrPdfImport::DoLoopActions(SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport, + int nPageIndex) { const int nPageCount = FPDF_GetPageCount(mpPdfDocument); - SAL_WARN("sd.filter", "Pages: " << nPageCount); - for (size_t nPageIndex = 0; nPageIndex <= 0; ++nPageIndex) + SAL_WARN("sd.filter", "Importing page " << nPageIndex << " of " << nPageCount); + if (nPageCount > 0 && nPageIndex >= 0 && nPageIndex < nPageCount) { // Render next page. FPDF_PAGE pPdfPage = FPDF_LoadPage(mpPdfDocument, nPageIndex); if (pPdfPage == nullptr) - break; + return; const double dPageWidth = FPDF_GetPageWidth(pPdfPage); const double dPageHeight = FPDF_GetPageHeight(pPdfPage); @@ -482,7 +483,7 @@ void ImpSdrPdfImport::SetupPageScale(const double dPageWidth, const double dPage // << "(" << mfScaleY << ")"); } -size_t ImpSdrPdfImport::DoImport(SdrObjList& rOL, size_t nInsPos, size_t nPageNumber, +size_t ImpSdrPdfImport::DoImport(SdrObjList& rOL, size_t nInsPos, int nPageNumber, SvdProgressInfo* pProgrInfo) { if (pProgrInfo) @@ -493,7 +494,7 @@ size_t ImpSdrPdfImport::DoImport(SdrObjList& rOL, size_t nInsPos, size_t nPageNu sal_uInt32 nActionsToReport(0); // execute - DoLoopActions(pProgrInfo, &nActionsToReport); + DoLoopActions(pProgrInfo, &nActionsToReport, nPageNumber); if (pProgrInfo) { diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx index dc62b234a688..2063788290d9 100644 --- a/svx/source/svdraw/svdpdf.hxx +++ b/svx/source/svdraw/svdpdf.hxx @@ -115,7 +115,7 @@ class ImpSdrPdfImport final bool CheckLastLineMerge(const basegfx::B2DPolygon& rSrcPoly); bool CheckLastPolyLineAndFillMerge(const basegfx::B2DPolyPolygon& rPolyPolygon); - void DoLoopActions(SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport); + void DoLoopActions(SvdProgressInfo* pProgrInfo, sal_uInt32* pActionsToReport, int nPageIndex); // Copy assignment is forbidden and not implemented. ImpSdrPdfImport(const ImpSdrPdfImport&) = delete; @@ -128,7 +128,7 @@ public: int GetPageCount() const { return mnPageCount; } - size_t DoImport(SdrObjList& rDestList, size_t nInsPos, size_t nPageNumber, + size_t DoImport(SdrObjList& rDestList, size_t nInsPos, int nPageNumber, SvdProgressInfo* pProgrInfo = nullptr); }; |