summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-01-03 15:41:58 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-14 10:06:56 +0100
commit7ec4d95702ecf94b47ef3c48e0059280eb7f100c (patch)
tree270d820b9dd2715bc15974a39de254cd3d173ca7 /sw
parent23bdcd6247675da0bb1f455177441a28f8200c83 (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> (cherry picked from commit 0e71075bb7379af318482bb3abbb630c58db9ec9)
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 8a0b2ac9a939..ce971f3c7781 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);
+ }
}
}
}