summaryrefslogtreecommitdiff
path: root/vcl
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-01-04 08:15:51 +0000
commit0e71075bb7379af318482bb3abbb630c58db9ec9 (patch)
tree343cf80d2233c726bab0766ed7951ade175aebab /vcl
parentd3c1a84d4c0bc24defcc497587fa6f258aa8ebdd (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 'vcl')
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index f85c981010a1..0649b450bde5 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -695,12 +695,12 @@ sal_Int32 PDFExtOutDevData::CreateLink( const Rectangle& rRect, sal_Int32 nPageN
return mpGlobalSyncData->mCurId++;
}
-sal_Int32 PDFExtOutDevData::CreateScreen(const Rectangle& rRect)
+sal_Int32 PDFExtOutDevData::CreateScreen(const Rectangle& rRect, sal_Int32 nPageNr)
{
mpGlobalSyncData->mActions.push_back(PDFExtOutDevDataSync::CreateScreen);
mpGlobalSyncData->mParaRects.push_back(rRect);
mpGlobalSyncData->mParaMapModes.push_back(mrOutDev.GetMapMode());
- mpGlobalSyncData->mParaInts.push_back(mnPage);
+ mpGlobalSyncData->mParaInts.push_back(nPageNr);
return mpGlobalSyncData->mCurId++;
}