diff options
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/pdfextoutdevdata.hxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 9 |
4 files changed, 16 insertions, 3 deletions
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index fbbb52bb712b..6bb561cab561 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -200,7 +200,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOut->GetExtOutDevData() ); if ( nPageCount ) { - pPDFExtOutDevData->SetIsExportNotes( bExportNotesPages ); + pPDFExtOutDevData->SetIsExportNotesPages( bExportNotesPages ); sal_Int32 nCurrentPage(0); StringRangeEnumerator::Iterator aIter = rRangeEnum.begin(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e21033e1b877..146b93dba41e 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1916,7 +1916,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ); if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sIsBackgroundObjectsVisible ) ) xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible; - if ( mbImpressDoc && bIsBackgroundObjectsVisible ) + if ( mbImpressDoc && bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() ) { uno::Reference< drawing::XMasterPageTarget > xMasterPageTarget( xPage, uno::UNO_QUERY ); if ( xMasterPageTarget.is() ) @@ -1949,7 +1949,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r } // exporting transition effects to pdf - if ( mbImpressDoc && pPDFExtOutDevData->GetIsExportTransitionEffects() ) // #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" ) ); diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 37dadb9a63db..ab9f44e1bb82 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -86,6 +86,7 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData sal_Bool mbTaggedPDF; sal_Bool mbExportNotes; + sal_Bool mbExportNotesPages; sal_Bool mbTransitionEffects; sal_Bool mbUseLosslessCompression; sal_Bool mbReduceImageResolution; @@ -117,6 +118,9 @@ public : sal_Bool GetIsExportNotes() const; void SetIsExportNotes( const sal_Bool bExportNotes ); + sal_Bool GetIsExportNotesPages() const; + void SetIsExportNotesPages( const sal_Bool bExportNotesPages ); + sal_Bool GetIsExportTaggedPDF() const; void SetIsExportTaggedPDF( const sal_Bool bTaggedPDF ); diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 99326c213840..bcbd9a58fa5f 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -509,6 +509,7 @@ PDFExtOutDevData::PDFExtOutDevData( const OutputDevice& rOutDev ) : mrOutDev ( rOutDev ), mbTaggedPDF ( sal_False ), mbExportNotes ( sal_True ), + mbExportNotesPages ( sal_False ), mbTransitionEffects ( sal_True ), mbUseLosslessCompression( sal_True ), mbReduceImageResolution ( sal_False ), @@ -567,6 +568,14 @@ void PDFExtOutDevData::SetIsExportNotes( const sal_Bool bExportNotes ) { mbExportNotes = bExportNotes; } +sal_Bool PDFExtOutDevData::GetIsExportNotesPages() const +{ + return mbExportNotesPages; +} +void PDFExtOutDevData::SetIsExportNotesPages( const sal_Bool bExportNotesPages ) +{ + mbExportNotesPages = bExportNotesPages; +} sal_Bool PDFExtOutDevData::GetIsExportTaggedPDF() const { return mbTaggedPDF; |