diff options
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 2 | ||||
| -rwxr-xr-x | sd/source/ui/unoidl/unomodel.cxx | 5 | ||||
| -rw-r--r-- | vcl/inc/vcl/pdfextoutdevdata.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 9 |
4 files changed, 16 insertions, 4 deletions
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index a82f52217079..0ea2cf5ab06c 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -196,7 +196,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com: vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST( vcl::PDFExtOutDevData, pOut->GetExtOutDevData() ); if ( nPageCount ) { - pPDFExtOutDevData->SetIsExportNotes( bExportNotesPages ); + pPDFExtOutDevData->SetIsExportNotesPages( bExportNotesPages ); sal_Int32 nSel = aMultiSelection.FirstSelected(); while ( nSel != sal_Int32(SFX_ENDOFSELECTION) ) 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 ); diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index bf2a09c1dd42..3862ef74b9b3 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -85,6 +85,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; @@ -116,6 +117,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 c47b034e1011..0094de39b8ff 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -510,6 +510,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 ), @@ -568,6 +569,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; |