diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-03 15:41:58 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-04 08:15:51 +0000 |
commit | 0e71075bb7379af318482bb3abbb630c58db9ec9 (patch) | |
tree | 343cf80d2233c726bab0766ed7951ade175aebab /sw | |
parent | d3c1a84d4c0bc24defcc497587fa6f258aa8ebdd (diff) |
Related: tdf#104841 sw PDF export: handle linked videos on non-first pages
Be explicit about the page number, this way a video on the second page
doesn't end up as an annotation for the first page. (In the Impress case
each slide is exported separately, so there this wasn't a problem.)
Change-Id: I83ba9cb4a3b2a6734bd88a138654e391199651c6
Reviewed-on: https://gerrit.libreoffice.org/32696
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/EnhancedPDFExportHelper.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index b9d218195d6f..85cc511f7741 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1831,8 +1831,11 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() { const SwPageFrame* pCurrPage = mrSh.GetLayout()->GetPageAtPos(aSnapRect.Center()); Rectangle aPDFRect(SwRectToPDFRect(pCurrPage, aSnapRect.SVRect())); - sal_Int32 nScreenId = pPDFExtOutDevData->CreateScreen(aPDFRect); - pPDFExtOutDevData->SetScreenURL(nScreenId, aMediaURL); + for (sal_Int32 nScreenPageNum : aScreenPageNums) + { + sal_Int32 nScreenId = pPDFExtOutDevData->CreateScreen(aPDFRect, nScreenPageNum); + pPDFExtOutDevData->SetScreenURL(nScreenId, aMediaURL); + } } } } |