diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-06-28 10:12:17 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-06-29 22:34:23 +0200 |
commit | 64b7feb7f0e0d3f29625c73e9790b2f152e34c09 (patch) | |
tree | 07195408409f4da400211bb2f7c91d6a65bad3bc /svx | |
parent | 9cc54e9bc1219fcaea87ca35eb93b0e79325a7ac (diff) |
pdf: add PDFiumTextPage and PDFiumPageObject + test
Also use it in ImpSdrPdfImport.
Change-Id: I6d353ef60d036c3516448e64a50b25a9befd5db8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97364
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 440cb3fb80d9fd356871eac410b9797f23433722)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97449
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdpdf.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index ca8226b68ce5..50e94a6f983b 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -176,17 +176,16 @@ void ImpSdrPdfImport::DoObjects(SvdProgressInfo* pProgrInfo, sal_uInt32* pAction SetupPageScale(dPageWidth, dPageHeight); // Load the page text to extract it when we get text elements. - FPDF_TEXTPAGE pTextPage = FPDFText_LoadPage(pPdfPage->getPointer()); + auto pTextPage = pPdfPage->getTextPage(); - const int nPageObjectCount = FPDFPage_CountObjects(pPdfPage->getPointer()); + const int nPageObjectCount = pPdfPage->getObjectCount(); if (pProgrInfo) pProgrInfo->SetActionCount(nPageObjectCount); for (int nPageObjectIndex = 0; nPageObjectIndex < nPageObjectCount; ++nPageObjectIndex) { - FPDF_PAGEOBJECT pPageObject - = FPDFPage_GetObject(pPdfPage->getPointer(), nPageObjectIndex); - ImportPdfObject(pPageObject, pTextPage, nPageObjectIndex); + auto pPageObject = pPdfPage->getObject(nPageObjectIndex); + ImportPdfObject(pPageObject->getPointer(), pTextPage->getPointer(), nPageObjectIndex); if (pProgrInfo && pActionsToReport) { (*pActionsToReport)++; @@ -200,8 +199,6 @@ void ImpSdrPdfImport::DoObjects(SvdProgressInfo* pProgrInfo, sal_uInt32* pAction } } } - - FPDFText_ClosePage(pTextPage); } } |