diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-17 16:39:01 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-22 09:41:44 +0000 |
| commit | fb93cf7e3f70cf711742c5b492d520d9d49c3c5e (patch) | |
| tree | 73d1024c8bcbbbc5072b831b27c62cceed52f329 /sd | |
| parent | ce47be6e5408835fdaeac184f05cc832c12186cd (diff) | |
sd: PDF export: produce annotations for shapes before painting shapes
This is the same order as sw SwEnhancedPDFExportHelper and required to
connect media shape Annot to its StructElem.
Change-Id: I1d421e5d353261e32b28a0429cd73f156c692260
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149060
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 61189ca9deaa..3a89e7728e89 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1944,8 +1944,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // hint value if screen display. Only then the AutoColor mechanisms shall be applied rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor( pPV, bScreenDisplay ) ); } - aView.SdrPaintView::CompleteRedraw( pOut, aRegion, &aImplRenderPaintProc ); + // produce link annots for media shapes before painting them if ( pPDFExtOutDevData && pPage ) { try @@ -2092,7 +2092,18 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } } } + } + catch (const uno::Exception&) + { + } + } + aView.SdrPaintView::CompleteRedraw(pOut, aRegion, &aImplRenderPaintProc); + + if (pPDFExtOutDevData && pPage) + { + try + { Size aPageSize( mpDoc->GetSdPage( 0, PageKind::Standard )->GetSize() ); Point aPoint( 0, 0 ); ::tools::Rectangle aPageRect( aPoint, aPageSize ); |