summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2011-03-04 07:53:39 +0100
committerOcke Janssen <oj@openoffice.org>2011-03-04 07:53:39 +0100
commitfbebb4750c8cc975b24e53a96ad34566b0fa1b3f (patch)
tree2a76eb3c02b25998309ab40b316d73665c69a8d9 /sw
parent20529755b301c7af2c5ab461329b2d979b2cdbff (diff)
parentf53c535303d83bc4d16651415c405c7a39c49467 (diff)
Automated merge with file:///d:\tools\master\ooo
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7d777089fb7f..c646187eb8f4 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -2106,12 +2106,18 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
if ( -1 != nDestPageNum )
{
- // Destination Export
- const sal_Int32 nDestId =
- pPDFExtOutDevData->CreateDest( rDestRect.SVRect(), nDestPageNum );
+ if ( aIBeg->nLinkId != -1 )
+ {
+ // Destination Export
+ const sal_Int32 nDestId = pPDFExtOutDevData->CreateDest( rDestRect.SVRect(), nDestPageNum );
- // Connect Link and Destination:
- pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, nDestId );
+ // Connect Link and Destination:
+ pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, nDestId );
+ }
+ else
+ {
+ pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, rDestRect.SVRect(), nDestPageNum );
+ }
}
}
else