diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:56 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:56 +0200 |
| commit | 209a875b72d5e311b1149ec9d028001994c4ae4f (patch) | |
| tree | 3d75eb1e522261d985ef7862d58fca94cb29bd78 /sd/source/ui/unoidl/unomodel.cxx | |
| parent | 6d421b526ac2250b28f650736c684e572434ce4c (diff) | |
| parent | c8d090428ba2a9d710499baf62ddfe252c16aa1f (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
slideshow/source/engine/makefile.mk
Diffstat (limited to 'sd/source/ui/unoidl/unomodel.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e3ae80c22be8..f75f2811406e 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2067,7 +2067,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r { sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc ); if ( nPage != -1 ) - pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) ); + { + if ( aIBeg->nLinkId != -1 ) + pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) ); + else + pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle ); + } else pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark ); ++aIBeg; |