diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 15:13:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 15:13:28 +0000 |
| commit | 6ba7357d5c2ae4fca77485d30ac68843f83f2cb0 (patch) | |
| tree | 98bccd88a01dcb3b7e4163598d4c41856dfd6f67 /sd/source/ui | |
| parent | d090c0a66587e0110137ae59f2c65c8775f617f9 (diff) | |
INTEGRATION: CWS sj14 (1.84.40); FILE MERGED
2005/01/11 16:55:28 sj 1.84.40.1: #i39428# now exporting hyperlinks also for draw by avoiding exceptions
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 2575d0afa10d..6e5c88f1876d 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unomodel.cxx,v $ * - * $Revision: 1.84 $ + * $Revision: 1.85 $ * - * last change: $Author: rt $ $Date: 2004-11-26 20:28:25 $ + * last change: $Author: rt $ $Date: 2005-01-27 16:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1980,10 +1980,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // exporting object interactions to pdf // if necessary, the master page interactions will be exported first + sal_Bool bIsBackgroundObjectsVisible; // SJ: #i39428# IsBackgroundObjectsVisible not available for Draw const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ); - sal_Bool bIsBackgroundObjectsVisible; - aAny = xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ); - if ( ( aAny >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible ) + if ( mbImpressDoc && ( xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible ) { uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY ); if ( xMasterPageTarget.is() ) @@ -2016,7 +2015,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } // exporting transition effects to pdf - if ( pPDFExtOutDevData->GetIsExportTransitionEffects() ) + if ( mbImpressDoc && pPDFExtOutDevData->GetIsExportTransitionEffects() ) // SJ: #i39428# TransitionEffects not available for Draw { const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ); const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ); |