From 247e418485c276bb9e8dcb84a6e11b90191482a3 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Fri, 13 May 2016 16:26:42 +0200 Subject: tdf#64748: added placeholder option to pdf export dialog in Writer This patch introduces a setting 'Export placeholders' to File/Export as PDF. It works like the related printer setting. Change-Id: I3a11a4601b1244b57e55c9b73b58116d355e105c Reviewed-on: https://gerrit.libreoffice.org/24976 Reviewed-by: Oliver Specht Tested-by: Oliver Specht Reviewed-on: https://gerrit.libreoffice.org/25053 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Miklos Vajna --- filter/source/pdf/impdialog.cxx | 14 +++++++++++++- filter/source/pdf/impdialog.hxx | 2 ++ filter/source/pdf/pdfexport.cxx | 6 +++++- filter/source/pdf/pdfexport.hxx | 1 + filter/source/pdf/pdffilter.cxx | 1 + filter/uiconfig/ui/pdfgeneralpage.ui | 25 ++++++++++++++++++++----- 6 files changed, 42 insertions(+), 7 deletions(-) (limited to 'filter') diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 1fe1474e9ca7..f1c86a8a5ec0 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -86,6 +86,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue > mbExportNotesPages( false ), mbUseTransitionEffects( false ), mbIsSkipEmptyPages( true ), + mbIsExportPlaceholders( false ), mbAddStream( false ), mnFormsType( 0 ), mbExportFormFields( true ), @@ -201,6 +202,7 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue > mnOpenBookmarkLevels = maConfigItem.ReadInt32( "OpenBookmarkLevels", -1 ); mbUseTransitionEffects = maConfigItem.ReadBool( "UseTransitionEffects", true ); mbIsSkipEmptyPages = maConfigItem.ReadBool( "IsSkipEmptyPages", false ); + mbIsExportPlaceholders = maConfigItem.ReadBool( "ExportPlaceholders", false ); mbAddStream = maConfigItem.ReadBool( "IsAddStream", false ); mnFormsType = maConfigItem.ReadInt32( "FormsType", 0 ); @@ -401,6 +403,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() maConfigItem.WriteBool( "ExportHiddenSlides", mbExportHiddenSlides ); maConfigItem.WriteBool( "UseTransitionEffects", mbUseTransitionEffects ); maConfigItem.WriteBool( "IsSkipEmptyPages", mbIsSkipEmptyPages ); + maConfigItem.WriteBool( "ExportPlaceholders", mbIsExportPlaceholders ); maConfigItem.WriteBool( "IsAddStream", mbAddStream ); /* @@ -541,6 +544,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSe get(mpCbExportNotes, "comments"); get(mpCbExportNotesPages, "notes"); get(mpCbExportEmptyPages, "emptypages"); + get(mpCbExportPlaceholders, "exportplaceholders" ); get(mpCbViewPDF, "viewpdf"); get(mpCbWatermark, "watermark"); @@ -578,6 +582,7 @@ void ImpPDFTabGeneralPage::dispose() mpCbViewPDF.clear(); mpCbExportNotesPages.clear(); mpCbExportEmptyPages.clear(); + mpCbExportPlaceholders.clear(); mpCbAddStream.clear(); mpCbWatermark.clear(); mpFtWatermark.clear(); @@ -601,6 +606,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) mbIsWriter = paParent->mbIsWriter; mpCbExportEmptyPages->Enable( mbIsWriter ); + mpCbExportPlaceholders->Enable( mbIsWriter ); mpRbLosslessCompression->SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleCompressionHdl ) ); const bool bUseLosslessCompression = paParent->mbUseLosslessCompression; @@ -668,8 +674,13 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) mpCbExportHiddenSlides->Show(false); mpCbExportHiddenSlides->Check(false); } - + mpCbExportPlaceholders->Show(mbIsWriter); + if( !mbIsWriter ) + { + mpCbExportPlaceholders->Check(false); + } mpCbExportEmptyPages->Check(!paParent->mbIsSkipEmptyPages); + mpCbExportPlaceholders->Check(paParent->mbIsExportPlaceholders); mpCbAddStream->Show(); mpCbAddStream->Check(paParent->mbAddStream); @@ -696,6 +707,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->mbExportHiddenSlides = mpCbExportHiddenSlides->IsChecked(); paParent->mbIsSkipEmptyPages = !mpCbExportEmptyPages->IsChecked(); + paParent->mbIsExportPlaceholders = mpCbExportPlaceholders->IsChecked(); paParent->mbAddStream = mpCbAddStream->IsVisible() && mpCbAddStream->IsChecked(); paParent->mbIsRangeChecked = false; diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index f4d916ec92de..72938b0718ee 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -106,6 +106,7 @@ protected: bool mbExportNotesPages; bool mbUseTransitionEffects; bool mbIsSkipEmptyPages; + bool mbIsExportPlaceholders; bool mbAddStream; sal_Int32 mnFormsType; bool mbExportFormFields; @@ -220,6 +221,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage VclPtr mpCbExportNotesPages; VclPtr mpCbExportEmptyPages; + VclPtr mpCbExportPlaceholders; VclPtr mpCbAddStream; VclPtr mpCbWatermark; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 5a6704165d2a..a55bdc943b78 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -553,6 +553,8 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& rFilterData[ nData ].Value >>= maSignCertificate; else if ( rFilterData[ nData ].Name == "SignatureTSA" ) rFilterData[ nData ].Value >>= msSignTSA; + else if ( rFilterData[ nData ].Name == "ExportPlaceholders" ) + rFilterData[ nData ].Value >>= mbExportPlaceholders; } aContext.URL = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); @@ -820,7 +822,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& pPDFExtOutDevData->SetIsReduceImageResolution( mbReduceImageResolution ); pPDFExtOutDevData->SetIsExportNamedDestinations( mbExportBmkToDest ); - Sequence< PropertyValue > aRenderOptions( 6 ); + Sequence< PropertyValue > aRenderOptions( 7 ); aRenderOptions[ 0 ].Name = "RenderDevice"; aRenderOptions[ 0 ].Value <<= Reference< awt::XDevice >( pXDevice ); aRenderOptions[ 1 ].Name = "ExportNotesPages"; @@ -834,6 +836,8 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aRenderOptions[ 4 ].Value <<= mbSkipEmptyPages; aRenderOptions[ 5 ].Name = "PageRange"; aRenderOptions[ 5 ].Value <<= aPageRange; + aRenderOptions[ 6 ].Name = "ExportPlaceholders"; + aRenderOptions[ 6 ].Value <<= mbExportPlaceholders; if( !aPageRange.isEmpty() || !aSelection.hasValue() ) { diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index 75ac0aa4e776..7e8528f34c60 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -47,6 +47,7 @@ private: bool mbUseTaggedPDF; sal_Int32 mnPDFTypeSelection; bool mbExportNotes; + bool mbExportPlaceholders; bool mbViewPDF; bool mbExportNotesPages; bool mbUseTransitionEffects; diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 6d24356ff934..7104ad9cfde4 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -70,6 +70,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) aCfgItem.ReadBool( "UseTaggedPDF", false ); aCfgItem.ReadInt32( "SelectPdfVersion", 0 ); aCfgItem.ReadBool( "ExportNotes", false ); + aCfgItem.ReadBool( "ExportPlaceholders", false ); aCfgItem.ReadBool( "ExportNotesPages", false ); aCfgItem.ReadBool( "UseTransitionEffects", true ); aCfgItem.ReadBool( "IsSkipEmptyPages", false ); diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 7ba4a250dd4a..8a46e0fcb5e7 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -578,8 +578,8 @@ - - _Export comments + + Expo_rt placeholders True True False @@ -593,6 +593,21 @@ + + _Export comments + True + True + False + True + 0 + True + + + 0 + 7 + + + Exp_ort automatically inserted blank pages True @@ -604,7 +619,7 @@ 0 - 9 + 10 @@ -619,7 +634,7 @@ 0 - 10 + 11 @@ -649,7 +664,7 @@ 0 - 7 + 8 -- cgit v1.2.3