diff options
| author | Eike Rathke <erack@apache.org> | 2011-09-10 21:49:17 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@apache.org> | 2011-09-10 21:49:17 +0000 |
| commit | 554dc217175cb00f75339a0d29fa24c4d300d032 (patch) | |
| tree | 4c4b961ea3de8b14435b38c6c6b84d9f52aabb26 /sd | |
| parent | 24bb455ba248546cb468996bc4a07a608c383a16 (diff) | |
impress212: #i114615# fixed hyperlink export (pdf) if exporting also notes pages
# User sj <sj@openoffice.org>
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/source/ui/unoidl/unomodel.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index f04c3df51b7f..7f8766e4ce84 100755 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1980,7 +1980,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // if necessary, the master page interactions will be exported first sal_Bool bIsBackgroundObjectsVisible = sal_False; // SJ: #i39428# IsBackgroundObjectsVisible not available for Draw const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ); - if ( mbImpressDoc && ( xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible ) + if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && ( xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible ) { uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY ); if ( xMasterPageTarget.is() ) @@ -2013,7 +2013,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } // exporting transition effects to pdf - if ( mbImpressDoc && pPDFExtOutDevData->GetIsExportTransitionEffects() ) // SJ: #i39428# TransitionEffects not available for Draw + if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() ) { const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ); const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ); @@ -2098,7 +2098,6 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } } } - Size aPageSize( mpDoc->GetSdPage( 0, PK_STANDARD )->GetSize() ); Point aPoint( 0, 0 ); Rectangle aPageRect( aPoint, aPageSize ); |