diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
| commit | c8d090428ba2a9d710499baf62ddfe252c16aa1f (patch) | |
| tree | bcfd816b53c19e6925f5ae0f450e466fc34e3742 /sd/source/ui/unoidl | |
| parent | 48fa46fd02b8d1633a7b078e34afe4acc18a0d74 (diff) | |
| parent | a095da08d2f018c9354767543239d0d0962fe590 (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sd/source/ui/app/res_bmp.src
Diffstat (limited to 'sd/source/ui/unoidl')
| -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 9d3cc6f343f7..f222b349b4fd 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2073,7 +2073,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; |